[network-manager-applet] build: split out GConf and gnome-keyring cflags and libs

[Dan Williams <dcbw src gnome org>]

commit 39d3a4591771ffe9b7afd3a02d7ad5dca33a8439
Author: Dan Williams <dcbw redhat com>
Date:   Wed Mar 9 13:38:44 2011 -0600

    build: split out GConf and gnome-keyring cflags and libs
    
    So that we only use them where needed.

 configure.ac                      |   11 ++++++++---
 src/Makefile.am                   |    4 ++++
 src/gconf-helpers/Makefile.am     |    4 ++++
 src/utils/Makefile.am             |    3 ++-
 src/utils/tests/Makefile.am       |    8 ++++++--
 src/wireless-security/Makefile.am |    2 ++
 6 files changed, 26 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4a99a1f..71f7416 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,10 +73,16 @@ PKG_CHECK_MODULES(NMA,
 		 libnm-util >= 0.8.995
 		 libnm-glib-vpn >= 0.8.995
 		 gmodule-export-2.0
-		 gconf-2.0
-		 gnome-keyring-1
 		 libnotify >= 0.4.3])
 
+PKG_CHECK_MODULES(GCONF, [gconf-2.0])
+AC_SUBST(GCONF_CFLAGS)
+AC_SUBST(GCONF_LIBS)
+
+PKG_CHECK_MODULES(GNOME_KEYRING, [gnome-keyring-1])
+AC_SUBST(GNOME_KEYRING_CFLAGS)
+AC_SUBST(GNOME_KEYRING_LIBS)
+
 AC_ARG_WITH([gtkver], AS_HELP_STRING([--with-gtkver], [The major version of GTK+ to build with]),
             with_gtkver="$withval",with_gtkver=3)
 case "${with_gtkver}" in
@@ -117,7 +123,6 @@ case "${with_bluetooth}" in
 	*)
 		AC_MSG_CHECKING(for gnome-bluetooth)
 		PKG_CHECK_MODULES(GNOME_BLUETOOTH,
-				  gconf-2.0
 				  gnome-bluetooth-1.0 >= 2.27.6
 				  libnm-util >= 0.8.995
 				  libnm-glib >= 0.8.995,
diff --git a/src/Makefile.am b/src/Makefile.am
index 9f72479..6c14241 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,6 +5,8 @@ bin_PROGRAMS = nm-applet
 nm_applet_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(GNOME_KEYRING_CFLAGS) \
 	$(NOTIFY_CFLAGS) \
 	-DICONDIR=\""$(datadir)/icons"\"						\
 	-DUIDIR=\""$(uidir)"\"							\
@@ -64,6 +66,8 @@ nm_applet_LDADD = \
 	-lm \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
+	$(GCONF_LIBS) \
+	$(GNOME_KEYRING_LIBS) \
 	$(NOTIFY_LIBS) \
 	${top_builddir}/src/marshallers/libmarshallers.la \
 	${top_builddir}/src/utils/libutils.la \
diff --git a/src/gconf-helpers/Makefile.am b/src/gconf-helpers/Makefile.am
index 9ee8904..321494c 100644
--- a/src/gconf-helpers/Makefile.am
+++ b/src/gconf-helpers/Makefile.am
@@ -9,6 +9,8 @@ libgconf_helpers_la_SOURCES = \
 libgconf_helpers_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \
+	$(GCONF_CFLAGS) \
+	$(GNOME_KEYRING_CFLAGS) \
 	$(DISABLE_DEPRECATED) \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/utils
@@ -16,5 +18,7 @@ libgconf_helpers_la_CPPFLAGS = \
 libgconf_helpers_la_LIBADD = \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
+	$(GCONF_LIBS) \
+	$(GNOME_KEYRING_LIBS) \
 	${top_builddir}/src/utils/libutils.la
 
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index b3db658..d161a8d 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -13,9 +13,10 @@ libutils_la_SOURCES = \
 libutils_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	$(NMA_CFLAGS) \
+	$(GNOME_KEYRING_CFLAGS) \
 	-DUIDIR=\""$(uidir)"\" \
 	-DDATADIR=\""$(datadir)"\" \
 	$(DISABLE_DEPRECATED) \
 	-I${top_srcdir}/src
 
-libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS)
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(GNOME_KEYRING_LIBS)
diff --git a/src/utils/tests/Makefile.am b/src/utils/tests/Makefile.am
index 213829f..47bcd8d 100644
--- a/src/utils/tests/Makefile.am
+++ b/src/utils/tests/Makefile.am
@@ -4,12 +4,16 @@ noinst_PROGRAMS = test-utils
 
 test_utils_SOURCES = test-utils.c
 
-test_utils_CPPFLAGS = $(GTK_CFLAGS) $(NMA_CFLAGS)
+test_utils_CPPFLAGS = \
+	$(GTK_CFLAGS) \
+	$(NMA_CFLAGS) \
+	$(GNOME_KEYRING_CFLAGS)
 
 test_utils_LDADD = \
 	${top_builddir}/src/utils/libutils.la \
 	$(GTK_LIBS) \
-	$(NMA_LIBS)
+	$(NMA_LIBS) \
+	$(GNOME_KEYRING_LIBS)
 
 check-local: test-utils
 	$(abs_builddir)/test-utils
diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
index 888aa2e..ed45e24 100644
--- a/src/wireless-security/Makefile.am
+++ b/src/wireless-security/Makefile.am
@@ -32,12 +32,14 @@ libwireless_security_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	-DUIDIR=\""$(uidir)"\" \
 	$(NMA_CFLAGS) \
+	$(GCONF_CFLAGS) \
 	$(DISABLE_DEPRECATED) \
 	-I${top_srcdir}/src/utils
 
 libwireless_security_la_LIBADD = \
 	$(GTK_LIBS) \
 	$(NMA_LIBS) \
+	$(GCONF_LIBS) \
 	${top_builddir}/src/utils/libutils.la
 
 uidir = $(datadir)/nm-applet