Use config.h rather than passing all defs in CFLAGS
diff --git a/src/flac/Makefile.am b/src/flac/Makefile.am
index 8f05db4..cd0ce7d 100644
--- a/src/flac/Makefile.am
+++ b/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 @@
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
diff --git a/src/flac/decode.c b/src/flac/decode.c
index 25f9b96..3032e90 100644
--- a/src/flac/decode.c
+++ b/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
diff --git a/src/flac/encode.c b/src/flac/encode.c
index 48bfa51..cd71c16 100644
--- a/src/flac/encode.c
+++ b/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
diff --git a/src/flac/encode.h b/src/flac/encode.h
index 4cc17c2..0ed37cf 100644
--- a/src/flac/encode.h
+++ b/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;
diff --git a/src/flac/main.c b/src/flac/main.c
index 89ea3b4..b8bff52 100644
--- a/src/flac/main.c
+++ b/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() */
diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am
index ef2610f..22a323c 100644
--- a/src/libFLAC/Makefile.am
+++ b/src/libFLAC/Makefile.am
@@ -20,7 +20,7 @@
if DEBUG
DEBUGCFLAGS = -DFLAC__OVERFLOW_DETECT
endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
+CFLAGS = @ CFLAGS@ $(DEBUGCFLAGS)
if FLaC__NO_ASM
else
diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c
index 5a61f4c..ae719ba 100644
--- a/src/libFLAC/format.c
+++ b/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
diff --git a/src/libOggFLAC/Makefile.am b/src/libOggFLAC/Makefile.am
index 4888e64..14dc968 100644
--- a/src/libOggFLAC/Makefile.am
+++ b/src/libOggFLAC/Makefile.am
@@ -20,7 +20,7 @@
if DEBUG
DEBUGCFLAGS =
endif
-CFLAGS = @CFLAGS@ $(DEBUGCFLAGS)
+CFLAGS = @ CFLAGS@ $(DEBUGCFLAGS)
SUBDIRS = include .
diff --git a/src/metaflac/Makefile.am b/src/metaflac/Makefile.am
index 3cf2854..041c05e 100644
--- a/src/metaflac/Makefile.am
+++ b/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 @@
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
diff --git a/src/plugin_common/charset.c b/src/plugin_common/charset.c
index d981279..ccd540e 100644
--- a/src/plugin_common/charset.c
+++ b/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
diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am
index 45abb83..e34394d 100644
--- a/src/plugin_xmms/Makefile.am
+++ b/src/plugin_xmms/Makefile.am
@@ -27,9 +27,9 @@
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 @@
# 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
diff --git a/src/plugin_xmms/plugin.c b/src/plugin_xmms/plugin.c
index 8d1001d..59b7a3e 100644
--- a/src/plugin_xmms/plugin.c
+++ b/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
diff --git a/src/share/iconvert.c b/src/share/iconvert.c
index 8ed9571..cb6ea5a 100644
--- a/src/share/iconvert.c
+++ b/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>
diff --git a/src/share/utf8.c b/src/share/utf8.c
index f1e5708..174d51f 100644
--- a/src/share/utf8.c
+++ b/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"
diff --git a/src/test_libFLAC++/Makefile.am b/src/test_libFLAC++/Makefile.am
index 4067e28..7c9a662 100644
--- a/src/test_libFLAC++/Makefile.am
+++ b/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 \
diff --git a/src/test_libFLAC/Makefile.am b/src/test_libFLAC/Makefile.am
index 861867a..1f74fa6 100644
--- a/src/test_libFLAC/Makefile.am
+++ b/src/test_libFLAC/Makefile.am
@@ -19,7 +19,7 @@
Makefile.lite \
Makefile.vc
-CFLAGS = @CFLAGS@
+CFLAGS = @ CFLAGS@
INCLUDES = -I$(top_srcdir)/src/libFLAC/include
noinst_PROGRAMS = test_libFLAC
diff --git a/src/test_libOggFLAC++/Makefile.am b/src/test_libOggFLAC++/Makefile.am
index ad3b6b2..d7a7190 100644
--- a/src/test_libOggFLAC++/Makefile.am
+++ b/src/test_libOggFLAC++/Makefile.am
@@ -20,10 +20,10 @@
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 \
diff --git a/src/test_libOggFLAC/Makefile.am b/src/test_libOggFLAC/Makefile.am
index 4fd5f95..de0b721 100644
--- a/src/test_libOggFLAC/Makefile.am
+++ b/src/test_libOggFLAC/Makefile.am
@@ -19,11 +19,11 @@
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 \
diff --git a/src/test_streams/Makefile.am b/src/test_streams/Makefile.am
index bd58f8a..c573c3b 100644
--- a/src/test_streams/Makefile.am
+++ b/src/test_streams/Makefile.am
@@ -19,7 +19,7 @@
Makefile.lite \
Makefile.vc
-CFLAGS = @CFLAGS@
+CFLAGS = @ CFLAGS@
noinst_PROGRAMS = test_streams
test_streams_SOURCES = \