From: Maarten Bosmans <mkbosmans@gmail.com>
Date: Wed, 8 Jun 2011 15:24:16 +0000 (+0200)
Subject: build-sys: Reset CFLAGS after DBUS check
X-Git-Tag: v0.99.1~70^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c3f05574a586887b9f2186e7730bec5a760ae4a;p=platform%2Fupstream%2Fpulseaudio.git

build-sys: Reset CFLAGS after DBUS check
---

diff --git a/configure.ac b/configure.ac
index 4e03996..f5e2f5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -971,11 +971,11 @@ AS_IF([test "x$enable_dbus" = "xyes" && test "x$HAVE_DBUS" = "x0"],
 
 AS_IF([test "x$HAVE_DBUS" = "x1"],
     [
-        saved_LIBS="$LIBS"
-        LIBS="$LIBS $DBUS_LIBS"
-        CFLAGS="$CFLAGS $DBUS_CFLAGS"
+        save_CFLAGS="$CFLAGS"; CFLAGS="$CFLAGS $DBUS_CFLAGS"
+        save_LIBS="$LIBS"; LIBS="$LIBS $DBUS_LIBS"
         AC_CHECK_FUNCS(dbus_watch_get_unix_fd)
-        LIBS="$saved_LIBS"
+        CFLAGS="$save_CFLAGS"
+        LIBS="$save_LIBS"
     ])
 
 AC_SUBST(DBUS_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 4990ac3..b76cb40 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -998,8 +998,13 @@ libprotocol_http_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 libprotocol_http_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
 
 libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h
+libprotocol_native_la_CFLAGS = $(AM_CFLAGS)
 libprotocol_native_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
 libprotocol_native_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINOR@.la libpulsecommon-@PA_MAJORMINOR@.la libpulse.la
+if HAVE_DBUS
+libprotocol_native_la_CFLAGS += $(DBUS_CFLAGS)
+libprotocol_native_la_LIBADD += $(DBUS_LIBS)
+endif
 
 libprotocol_esound_la_SOURCES = pulsecore/protocol-esound.c pulsecore/protocol-esound.h pulsecore/esound.h
 libprotocol_esound_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version