Use config.h rather than passing all defs in CFLAGS

configure.in

@@ -343,6 +343,22 @@ fi
 CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS $OUR_CFLAGS_TAIL"
 CXXFLAGS="$OUR_CFLAGS_HEAD $CXXFLAGS $OUR_CFLAGS_TAIL"
 
+AM_CONFIG_HEADER(config.h)
+AH_TEMPLATE(FLAC__ALIGN_MALLOC_DATA,  [define if XXX])
+AH_TEMPLATE(FLAC__CPU_IA32,  [define if building for ia32/i386])
+AH_TEMPLATE(FLAC__CPU_PPC,  [define if building for PowerPC])
+AH_TEMPLATE(FLAC__CPU_SPARC,  [define if building for SPARC])
+AH_TEMPLATE(FLAC__EXHAUSTIVE_TESTS,  [define to XXX])
+AH_TEMPLATE(FLAC__HAS_ID3LIB,  [define if you have the id3lib library])
+AH_TEMPLATE(FLAC__HAS_NASM,  [define if you have the NASM assembler])
+AH_TEMPLATE(FLAC__HAS_OGG,  [define if you have the ogg library])
+AH_TEMPLATE(FLAC__NO_ASM,  [define to disable use of assembly code])
+AH_TEMPLATE(FLAC__SSE_OS,  [define to enable use of SSE instructions])
+AH_TEMPLATE(FLAC__USE_3DNOW,  [define to enable use of 3Dnow! instructions])
+AH_TEMPLATE(ID3LIB_MAJOR,  [define to major version number of id3lib])
+AH_TEMPLATE(ID3LIB_MINOR,  [define to minor version number of id3lib])
+AH_TEMPLATE(ID3LIB_PATCH,  [define to patch level of id3lib])
+
 AC_OUTPUT( \
 	Makefile \
 	src/Makefile \

src/flac/Makefile.am

@@ -16,7 +16,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = flac
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+CFLAGS = @ CFLAGS@  @ OGG_CFLAGS@ 
 
 if FLaC__HAS_OGG
 NEED_OGGFLAC_LIB = $(top_builddir)/src/libOggFLAC/libOggFLAC.la
@@ -39,4 +39,4 @@ flac_SOURCES = \
 	file.h \
 	vorbiscomment.h
 
-flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ @SHARE_LIBS@ @LIBICONV@ -lm
+flac_LDADD = $(NEED_OGGFLAC_LIB) $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@  @ SHARE_LIBS@  @ LIBICONV@  -lm

src/flac/decode.c

@@ -16,6 +16,10 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #if defined _WIN32 && !defined __CYGWIN__
 /* where MSVC puts unlink() */
 # include <io.h>
@@ -28,6 +32,7 @@
 #include "FLAC/all.h"
 #include "decode.h"
 #include "file.h"
+
 #ifdef FLAC__HAS_OGG
 #include "OggFLAC/stream_decoder.h"
 #endif

src/flac/encode.c

@@ -31,6 +31,11 @@
 #include "FLAC/all.h"
 #include "encode.h"
 #include "file.h"
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef FLAC__HAS_OGG
 #include "OggFLAC/stream_encoder.h"
 #endif

src/flac/encode.h

@@ -21,6 +21,10 @@
 
 #include "FLAC/metadata.h"
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 typedef struct {
 	FLAC__bool verbose;
 	FLAC__uint64 skip;

src/flac/main.c

@@ -22,6 +22,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #if !defined _MSC_VER && !defined __MINGW32__
 /* unlink is in stdio.h in VC++ */
 #include <unistd.h> /* for unlink() */

src/libFLAC/Makefile.am

@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libFLAC.la
 if DEBUG
 DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
 endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
+CFLAGS = @ CFLAGS@  $(DEBUGCFLAGS)
 
 if FLaC__NO_ASM
 else

src/libFLAC/format.c

@@ -23,6 +23,10 @@
 #include "FLAC/format.h"
 #include "private/format.h"
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef min
 #undef min
 #endif

src/libOggFLAC/Makefile.am

@@ -20,7 +20,7 @@ lib_LTLIBRARIES = libOggFLAC.la
 if DEBUG
 DEBUGCFLAGS = 
 endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
+CFLAGS = @ CFLAGS@  $(DEBUGCFLAGS)
 
 SUBDIRS = include .
 

src/metaflac/Makefile.am

@@ -16,7 +16,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 bin_PROGRAMS = metaflac
-CFLAGS = @CFLAGS@
+CFLAGS = @ CFLAGS@ 
 
 EXTRA_DIST = \
 	Makefile.lite \
@@ -26,4 +26,4 @@ metaflac_SOURCES = \
 	main.c
 metaflac_LDFLAGS = 
 
-metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @SHARE_LIBS@ @LIBICONV@ -lm
+metaflac_LDADD = $(top_builddir)/src/libFLAC/libFLAC.la @ SHARE_LIBS@  @ LIBICONV@  -lm

src/plugin_common/charset.c

@@ -25,6 +25,10 @@
 #include <string.h>
 #include <errno.h>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef HAVE_ICONV
 #include <iconv.h>
 #endif

src/plugin_xmms/Makefile.am

@@ -27,9 +27,9 @@ noinst_HEADERS = \
 	configure.h \
 	wrap_id3.h
 
-CFLAGS = @CFLAGS@ @ID3LIB_CFLAGS@ @XMMS_CFLAGS@
+CFLAGS = @ CFLAGS@  @ ID3LIB_CFLAGS@  @ XMMS_CFLAGS@ 
 INCLUDES = -I$(top_srcdir)/src
-xmmsinputplugindir = @XMMS_INPUT_PLUGIN_DIR@
+xmmsinputplugindir = @ XMMS_INPUT_PLUGIN_DIR@ 
 
 # Don't build a static library
 LIBTOOL = $(top_builddir)/libtool-disable-static
@@ -52,5 +52,5 @@ endif
 # for fix info see:
 #   http://lists.freshrpms.net/pipermail/rpm-list/2002-April/000746.html
 # the workaround is the extra '-L$(top_builddir)/src/libFLAC/.libs'
-libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @XMMS_LIBS@ @ID3LIB_LIBS@
+libxmms_flac_la_LIBADD = $(top_builddir)/src/plugin_common/libplugin_common.a $(top_builddir)/src/libFLAC/libFLAC.la -L$(top_builddir)/src/libFLAC/.libs @ XMMS_LIBS@  @ ID3LIB_LIBS@ 
 libxmms_flac_la_LDFLAGS = -module -avoid-version

src/plugin_xmms/plugin.c

@@ -27,6 +27,10 @@
 #include <xmms/configfile.h>
 #include <xmms/titlestring.h>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef HAVE_LANGINFO_CODESET
 #include <langinfo.h>
 #endif

src/share/iconvert.c

@@ -16,6 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #ifdef HAVE_ICONV
 
 #include <assert.h>

src/share/utf8.c

@@ -24,6 +24,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "utf8.h"
 #include "charset.h"
 

src/test_libFLAC++/Makefile.am

@@ -15,7 +15,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-CFLAGS = @CFLAGS@
+CFLAGS = @ CFLAGS@ 
 
 EXTRA_DIST = \
 	Makefile.lite \

src/test_libFLAC/Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST = \
 	Makefile.lite \
 	Makefile.vc
 
-CFLAGS = @CFLAGS@
+CFLAGS = @ CFLAGS@ 
 INCLUDES = -I$(top_srcdir)/src/libFLAC/include
 
 noinst_PROGRAMS = test_libFLAC

src/test_libOggFLAC++/Makefile.am

@@ -20,10 +20,10 @@ EXTRA_DIST = \
 	Makefile.vc \
 	README
 
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+CFLAGS = @ CFLAGS@  @ OGG_CFLAGS@ 
 
 noinst_PROGRAMS = test_libOggFLAC++
-test_libOggFLAC___LDADD = $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
+test_libOggFLAC___LDADD = $(top_builddir)/src/libOggFLAC++/libOggFLAC++.la $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@  -lm
 test_libOggFLAC___SOURCES = \
 	decoders.cc \
 	encoders.cc \

src/test_libOggFLAC/Makefile.am

@@ -19,11 +19,11 @@ EXTRA_DIST = \
 	Makefile.lite \
 	Makefile.vc
 
-CFLAGS = @CFLAGS@ @OGG_CFLAGS@
+CFLAGS = @ CFLAGS@  @ OGG_CFLAGS@ 
 INCLUDES = 
 
 noinst_PROGRAMS = test_libOggFLAC
-test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @OGG_LIBS@ -lm
+test_libOggFLAC_LDADD = $(top_builddir)/src/libOggFLAC/libOggFLAC.la $(top_builddir)/src/libFLAC/libFLAC.la @ OGG_LIBS@  -lm
 test_libOggFLAC_SOURCES = \
 	decoders.c \
 	encoders.c \

src/test_streams/Makefile.am

@@ -19,7 +19,7 @@ EXTRA_DIST = \
 	Makefile.lite \
 	Makefile.vc
 
-CFLAGS = @CFLAGS@
+CFLAGS = @ CFLAGS@ 
 
 noinst_PROGRAMS = test_streams
 test_streams_SOURCES = \