diff -ur alsaplayer-0.99.80-rc3.orig/app/Makefile.am alsaplayer-0.99.80-rc3/app/Makefile.am
--- alsaplayer-0.99.80-rc3.orig/app/Makefile.am	2007-06-23 18:27:28.000000000 +0300
+++ alsaplayer-0.99.80-rc3/app/Makefile.am	2007-10-07 07:47:55.000000000 +0300
@@ -29,8 +29,6 @@
 
 AM_CXXFLAGS = $(COMMON_FLAGS)
 
-AM_CFLAGS = $(CXXFLAGS)
-
 bin_PROGRAMS = alsaplayer
 
 localedir = $(datadir)/locale
diff -ur alsaplayer-0.99.80-rc3.orig/configure.ac alsaplayer-0.99.80-rc3/configure.ac
--- alsaplayer-0.99.80-rc3.orig/configure.ac	2007-09-05 22:55:29.000000000 +0300
+++ alsaplayer-0.99.80-rc3/configure.ac	2007-10-07 07:49:09.000000000 +0300
@@ -564,14 +564,14 @@
 
 AC_MSG_CHECKING(for gcc optimization flags)
 old_cflags=$CFLAGS
-CFLAGS="$CFLAGS -O2 -fexpensive-optimizations -funroll-loops -finline-functions -ffast-math -Wall"
+CFLAGS="$CFLAGS"
 AC_TRY_COMPILE([#include <stdio.h>],
 [ printf ("hello, world"); ],
-[ EXTRA_OPT_CFLAGS="-O2 -fexpensive-optimizations -funroll-loops -finline-functions -ffast-math -Wall"],[ EXTRA_OPT_CFLAGS=""])
+[ EXTRA_OPT_CFLAGS="$CFLAGS"],[ EXTRA_OPT_CFLAGS=""])
 CFLAGS=$old_cflags
 AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
 
-ARCH_CFLAGS="$EXTRA_OPT_CFLAGS $CFLAGS"
+ARCH_CFLAGS="$EXTRA_OPT_CFLAGS"
 
 if test "$ARCH_TYPE" = "i486" || test "$ARCH_TYPE" = "i586" || test "$ARCH_TYPE" = "i686"
 then
diff -ur alsaplayer-0.99.80-rc3.orig/input/mad/Makefile.am alsaplayer-0.99.80-rc3/input/mad/Makefile.am
--- alsaplayer-0.99.80-rc3.orig/input/mad/Makefile.am	2007-07-18 00:07:37.000000000 +0300
+++ alsaplayer-0.99.80-rc3/input/mad/Makefile.am	2007-10-07 07:49:28.000000000 +0300
@@ -23,8 +23,6 @@
 
 AM_CFLAGS = $(COMMON_CFLAGS)
 
-AM_CXXFLAGS = $(CFLAGS)
-
 INCLUDES = -I$(ROOT_DIR)/app $(extra_cflags)
 
 libmad_in_la_SOURCES = $(mad_insources)
diff -ur alsaplayer-0.99.80-rc3.orig/interface/daemon/Makefile.am alsaplayer-0.99.80-rc3/interface/daemon/Makefile.am
--- alsaplayer-0.99.80-rc3.orig/interface/daemon/Makefile.am	2007-06-13 22:33:45.000000000 +0300
+++ alsaplayer-0.99.80-rc3/interface/daemon/Makefile.am	2007-10-07 07:49:51.000000000 +0300
@@ -10,8 +10,6 @@
 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
 		-DADDON_DIR=\"$(ADDON_DIR)\"
 
-AM_CFLAGS = $(CXXFLAGS)
-
 libdir = $(ADDON_DIR)/interface
 
 libdaemon_interface_la_LDFLAGS = $(daemon_interfaceldflags)
diff -ur alsaplayer-0.99.80-rc3.orig/interface/gtk2/Makefile.am alsaplayer-0.99.80-rc3/interface/gtk2/Makefile.am
--- alsaplayer-0.99.80-rc3.orig/interface/gtk2/Makefile.am	2007-06-20 22:16:41.000000000 +0300
+++ alsaplayer-0.99.80-rc3/interface/gtk2/Makefile.am	2007-10-07 07:50:28.000000000 +0300
@@ -25,8 +25,6 @@
 		@GTK2_CFLAGS@ $(COMMON_FLAGS) \
 		-D_REENTRANT -DADDON_DIR=\"$(ADDON_DIR)\"
 
-AM_CFLAGS = $(CXXFLAGS)
-
 libdir = $(ADDON_DIR)/interface
 
 libgtk2_interface_la_LDFLAGS = $(gtk2_interfaceldflags)
diff -ur alsaplayer-0.99.80-rc3.orig/interface/text/Makefile.am alsaplayer-0.99.80-rc3/interface/text/Makefile.am
--- alsaplayer-0.99.80-rc3.orig/interface/text/Makefile.am	2007-06-13 22:33:46.000000000 +0300
+++ alsaplayer-0.99.80-rc3/interface/text/Makefile.am	2007-10-07 07:50:44.000000000 +0300
@@ -10,8 +10,6 @@
 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
 		-DADDON_DIR=\"$(ADDON_DIR)\"
 
-AM_CFLAGS = $(CXXFLAGS)
-
 libdir = $(ADDON_DIR)/interface
 
 libtext_interface_la_LDFLAGS = $(text_interfaceldflags)
diff -ur alsaplayer-0.99.80-rc3.orig/interface/xosd/Makefile.am alsaplayer-0.99.80-rc3/interface/xosd/Makefile.am
--- alsaplayer-0.99.80-rc3.orig/interface/xosd/Makefile.am	2007-06-13 22:33:51.000000000 +0300
+++ alsaplayer-0.99.80-rc3/interface/xosd/Makefile.am	2007-10-07 07:50:59.000000000 +0300
@@ -22,8 +22,6 @@
 		-D_REENTRANT -I$(top_builddir) -I$(top_srcdir)/alsaplayer \
 		-DADDON_DIR=\"$(ADDON_DIR)\"
 
-AM_CFLAGS = $(CXXFLAGS)
-
 libdir = $(ADDON_DIR)/interface
 
 libxosd_interface_la_LDFLAGS = $(xosd_interfaceldflags)