diff -ur input/flac/FlacPlugin.cpp input/flac/FlacPlugin.cpp
--- input/flac/FlacPlugin.cpp	2007-10-29 23:00:16.000000000 +0200
+++ input/flac/FlacPlugin.cpp	2009-07-20 00:19:07.000000000 +0300
@@ -239,7 +239,7 @@
     else
     {
 	// use stream name
-	char * fname = strrchr (f->name ().c_str (), '/');
+	const char * fname = strrchr (f->name ().c_str (), '/');
 	if (fname)
 	{
 	    fname++;
@@ -270,7 +270,7 @@
 	if (strncmp(name, "http://", 7) == 0) {
 		return 0.0;
 	}
-	char *ext = strrchr(name, '.');
+	const char *ext = strrchr(name, '.');
 	if (!ext)
 		return 0.0;
 	ext++;
--- configure.ac	2007-11-04 06:15:35.000000000 +1000
+++ configure.ac	2009-03-01 17:25:22.344483528 +1000
@@ -292,6 +292,16 @@
 
 AC_CHECK_LIB(id3tag, id3_file_open,
      FLC_LDADD="$FLC_LDADD -lid3tag -lz"; use_libid3tag=yes; AC_DEFINE(HAVE_LIBID3TAG, 1, [Define if you have libid3tag library (-lid3tag)]), use_libid3tag=no)
+AC_ARG_ENABLE(id3tag,
+[  --enable-id3tag         Enable libid3tag support (default=yes)],
+[if test "$enableval" = "no"
+then
+	if test "$use_libid3tag" = "yes"
+	then
+		use_libid3tag=no
+	fi
+fi])
+
 
 CFLAGS=$oldcflags

--- app/ControlSocket.cpp.orig	2008-07-04 22:34:38.000000000 +0200
+++ app/ControlSocket.cpp	2008-07-04 22:35:53.000000000 +0200
@@ -28,6 +28,7 @@
 #include <sys/un.h>
 #include <csignal>
 #include <pwd.h>
+#include <limits.h>
 #include "control.h"
 #include "message.h"
 #include "Playlist.h"

diff -ur app/Makefile.am /app/Makefile.am
--- app/Makefile.am	2007-06-23 18:27:28.000000000 +0300
+++ /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 configure.ac /configure.ac
--- configure.ac	2007-09-05 22:55:29.000000000 +0300
+++ /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 input/mad/Makefile.am /input/mad/Makefile.am
--- input/mad/Makefile.am	2007-07-18 00:07:37.000000000 +0300
+++ /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 interface/daemon/Makefile.am /interface/daemon/Makefile.am
--- interface/daemon/Makefile.am	2007-06-13 22:33:45.000000000 +0300
+++ /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 interface/gtk2/Makefile.am /interface/gtk2/Makefile.am
--- interface/gtk2/Makefile.am	2007-06-20 22:16:41.000000000 +0300
+++ /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 interface/text/Makefile.am /interface/text/Makefile.am
--- interface/text/Makefile.am	2007-06-13 22:33:46.000000000 +0300
+++ /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 interface/xosd/Makefile.am /interface/xosd/Makefile.am
--- interface/xosd/Makefile.am	2007-06-13 22:33:51.000000000 +0300
+++ /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)