configure.ac: use $LIBS instead of $MPD_LIBS

4 files changed, 24 insertions, 32 deletions

diff --git a/Makefile.am b/Makefile.am
index f02479881..c8c34941c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ bin_PROGRAMS = src/mpd
 
 noinst_LIBRARIES =
 
-src_mpd_CFLAGS = $(AM_CFLAGS) $(MPD_CFLAGS)
 src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(AVAHI_CFLAGS) \
 	$(LIBWRAP_CFLAGS) \
@@ -21,7 +20,7 @@ src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ENCODER_CFLAGS) \
 	$(FILTER_CFLAGS) \
 	$(OUTPUT_CFLAGS)
-src_mpd_LDADD = $(MPD_LIBS) \
+src_mpd_LDADD = \
 	$(AVAHI_LIBS) \
 	$(LIBWRAP_LDFLAGS) \
 	$(SQLITE_LIBS) \
@@ -944,18 +943,18 @@ endif
 
 test_read_conf_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(GLIB_CFLAGS)
-test_read_conf_LDADD = $(MPD_LIBS) \
+test_read_conf_LDADD = \
 	$(GLIB_LIBS)
 test_read_conf_SOURCES = test/read_conf.c \
 	src/conf.c src/tokenizer.c src/utils.c src/string_util.c
 
-test_run_resolver_LDADD = $(MPD_LIBS) \
+test_run_resolver_LDADD = \
 	$(GLIB_LIBS)
 test_run_resolver_SOURCES = test/run_resolver.c \
 	src/resolver.c
 
 test_run_tcp_connect_CPPFLAGS = $(AM_CPPFLAGS)
-test_run_tcp_connect_LDADD = $(MPD_LIBS) \
+test_run_tcp_connect_LDADD = \
 	$(GLIB_LIBS)
 test_run_tcp_connect_SOURCES = test/run_tcp_connect.c \
 	src/io_thread.c src/io_thread.h \
@@ -966,7 +965,7 @@ test_run_tcp_connect_SOURCES = test/run_tcp_connect.c \
 test_run_input_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ARCHIVE_CFLAGS) \
 	$(INPUT_CFLAGS)
-test_run_input_LDADD = $(MPD_LIBS) \
+test_run_input_LDADD = \
 	$(ARCHIVE_LIBS) \
 	$(INPUT_LIBS) \
 	$(GLIB_LIBS)
@@ -984,7 +983,7 @@ test_dump_playlist_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(patsubst -I%/FLAC,-I%,$(FLAC_CFLAGS)) \
 	$(ARCHIVE_CFLAGS) \
 	$(INPUT_CFLAGS)
-test_dump_playlist_LDADD = $(MPD_LIBS) \
+test_dump_playlist_LDADD = \
 	$(CUE_LIBS) \
 	$(FLAC_LIBS) \
 	$(ARCHIVE_LIBS) \
@@ -1015,7 +1014,7 @@ test_run_decoder_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(TAG_CFLAGS) \
 	$(ARCHIVE_CFLAGS) \
 	$(INPUT_CFLAGS) $(DECODER_CFLAGS)
-test_run_decoder_LDADD = $(MPD_LIBS) \
+test_run_decoder_LDADD = \
 	$(TAG_LIBS) \
 	$(ARCHIVE_LIBS) \
 	$(INPUT_LIBS) $(DECODER_LIBS) \
@@ -1040,7 +1039,7 @@ test_read_tags_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(TAG_CFLAGS) \
 	$(ARCHIVE_CFLAGS) \
 	$(INPUT_CFLAGS) $(DECODER_CFLAGS)
-test_read_tags_LDADD = $(MPD_LIBS) \
+test_read_tags_LDADD = \
 	$(TAG_LIBS) \
 	$(ARCHIVE_LIBS) \
 	$(INPUT_LIBS) $(DECODER_LIBS) \
@@ -1060,7 +1059,7 @@ test_read_tags_SOURCES = test/read_tags.c \
 	$(DECODER_SRC)
 
 test_run_ntp_server_CPPFLAGS = $(AM_CPPFLAGS)
-test_run_ntp_server_LDADD = $(MPD_LIBS) \
+test_run_ntp_server_LDADD = \
 	$(GLIB_LIBS)
 test_run_ntp_server_SOURCES = test/run_ntp_server.c \
 	test/signals.c test/signals.h \
@@ -1069,7 +1068,7 @@ test_run_ntp_server_SOURCES = test/run_ntp_server.c \
 	src/ntp_server.c src/ntp_server.h
 
 test_run_filter_CPPFLAGS = $(AM_CPPFLAGS)
-test_run_filter_LDADD = $(MPD_LIBS) \
+test_run_filter_LDADD = \
 	$(SAMPLERATE_LIBS) \
 	$(GLIB_LIBS)
 test_run_filter_SOURCES = test/run_filter.c \
@@ -1117,7 +1116,7 @@ test_run_encoder_SOURCES = test/run_encoder.c \
 	$(ENCODER_SRC)
 test_run_encoder_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ENCODER_CFLAGS)
-test_run_encoder_LDADD = $(MPD_LIBS) \
+test_run_encoder_LDADD = \
 	$(ENCODER_LIBS) \
 	$(GLIB_LIBS)
 endif
@@ -1160,11 +1159,10 @@ if HAVE_LIBSAMPLERATE
 test_run_convert_SOURCES += src/pcm_resample_libsamplerate.c
 endif
 
-test_run_output_CFLAGS = $(AM_CFLAGS) $(MPD_CFLAGS)
 test_run_output_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(ENCODER_CFLAGS) \
 	$(OUTPUT_CFLAGS)
-test_run_output_LDADD = $(MPD_LIBS) \
+test_run_output_LDADD = \
 	$(ENCODER_LIBS) \
 	$(OUTPUT_LIBS) \
 	$(GLIB_LIBS)
@@ -1207,7 +1205,7 @@ test_run_output_SOURCES = test/run_output.c \
 
 test_read_mixer_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(OUTPUT_CFLAGS)
-test_read_mixer_LDADD = $(MPD_LIBS) \
+test_read_mixer_LDADD = \
 	$(OUTPUT_LIBS) \
 	$(GLIB_LIBS)
 test_read_mixer_SOURCES = test/read_mixer.c \
diff --git a/configure.ac b/configure.ac
index 9c66bcb03..adee0de0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,11 +57,6 @@ AC_SUBST(AM_CPPFLAGS,"")
 AC_SUBST(AM_CFLAGS,"")
 AC_SUBST(AM_CXXFLAGS,"")
 
-AC_SUBST(MPD_LIBS)
-AC_SUBST(MPD_CFLAGS)
-MPD_LIBS=""
-MPD_CFLAGS=""
-
 dnl ---------------------------------------------------------------------------
 dnl OS Specific Defaults
 dnl ---------------------------------------------------------------------------
@@ -69,7 +64,7 @@ AC_CANONICAL_HOST
 
 case "$host_os" in
 mingw32* | windows*)
-	MPD_LIBS="$MPD_LIBS -lws2_32"
+	LIBS="$LIBS -lws2_32"
 	;;
 esac
 
@@ -587,8 +582,7 @@ if test x$with_zeroconf != xno; then
 	if test x$with_zeroconf = xbonjour || test x$with_zeroconf = xauto; then
 		AC_CHECK_HEADER(dns_sd.h,
 			[enable_bonjour=yes;AC_DEFINE([HAVE_BONJOUR], 1, [Define to enable Bonjour Zeroconf support])])
-		AC_CHECK_LIB(dns_sd, DNSServiceRegister,
-			MPD_LIBS="$MPD_LIBS -ldns_sd")
+		AC_CHECK_LIB([dns_sd], [DNSServiceRegister])
 	fi
 
 	if test x$enable_bonjour = xyes; then
@@ -903,8 +897,8 @@ if test x$enable_mpc = xyes; then
 	oldcflags=$CFLAGS
 	oldlibs=$LIBS
 	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $MPD_CFLAGS $MPCDEC_CFLAGS -I."
-	LIBS="$LIBS $MPD_LIBS $MPCDEC_LIBS"
+	CFLAGS="$CFLAGS $MPCDEC_CFLAGS -I."
+	LIBS="$LIBS $MPCDEC_LIBS"
 	CPPFLAGS=$CFLAGS
 	AC_CHECK_HEADER(mpc/mpcdec.h,
 		old_mpcdec=no,
@@ -1335,7 +1329,7 @@ enable_osx=no
 case "$host_os" in
 	darwin*)
 		AC_DEFINE(HAVE_OSX, 1, [Define for compiling OS X support])
-		MPD_LIBS="$MPD_LIBS -framework AudioUnit -framework CoreAudio -framework CoreServices"
+		LIBS="$LIBS -framework AudioUnit -framework CoreAudio -framework CoreServices"
 		enable_osx=yes ;;
 esac
 
@@ -1429,7 +1423,7 @@ case "$host_os" in
 	mingw32* | windows*)
 		AC_DEFINE(ENABLE_WINMM_OUTPUT, 1, [Define to enable WinMM support])
 		enable_winmm_output=yes
-		MPD_LIBS="$MPD_LIBS -lwinmm"
+		LIBS="$LIBS -lwinmm"
 		;;
 
 	*)
diff --git a/m4/faad.m4 b/m4/faad.m4
index 8576b7d30..1048c566c 100644
--- a/m4/faad.m4
+++ b/m4/faad.m4
@@ -39,8 +39,8 @@ if test x$enable_aac = xyes; then
 	oldcflags=$CFLAGS
 	oldlibs=$LIBS
 	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -I."
-	LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
+	CFLAGS="$CFLAGS $FAAD_CFLAGS -I."
+	LIBS="$LIBS $FAAD_LIBS"
 	CPPFLAGS=$CFLAGS
 	AC_CHECK_HEADER(faad.h,,enable_aac=no)
 	if test x$enable_aac = xyes; then
@@ -131,8 +131,8 @@ if test x$enable_aac = xyes; then
 	oldcflags=$CFLAGS
 	oldlibs=$LIBS
 	oldcppflags=$CPPFLAGS
-	CFLAGS="$CFLAGS $MPD_CFLAGS $FAAD_CFLAGS -Werror"
-	LIBS="$LIBS $MPD_LIBS $FAAD_LIBS"
+	CFLAGS="$CFLAGS $FAAD_CFLAGS -Werror"
+	LIBS="$LIBS $FAAD_LIBS"
 	CPPFLAGS=$CFLAGS
 
 	AC_MSG_CHECKING(for broken libfaad headers)
diff --git a/m4/ucred.m4 b/m4/ucred.m4
index 3a8245245..cdc6ea3b3 100644
--- a/m4/ucred.m4
+++ b/m4/ucred.m4
@@ -20,7 +20,7 @@ AC_DEFUN([STRUCT_UCRED],[
 				mpd_cv_have_struct_ucred=no)
 			if test x$mpd_cv_have_struct_ucred = xyes; then
 				# :(
-				MPD_CFLAGS="$MPD_CFLAGS -D_GNU_SOURCE"
+				CFLAGS="$CFLAGS -D_GNU_SOURCE"
 			fi
 		fi
 		])