[network-manager-applet/dcbw/libnm-bgo736911: 9/16] build: split dbus-glib CFLAGS/LIBS from NMA

[Dan Williams <dcbw src gnome org>]

commit 7902d81afc404220cdc318e371fadf5795c8c3ed
Author: Dan Williams <dcbw redhat com>
Date:   Wed Feb 18 14:47:06 2015 -0600

    build: split dbus-glib CFLAGS/LIBS from NMA
    
    It might get used where NMA_* won't be.

 configure.ac                      |    5 +++--
 src/Makefile.am                   |    4 +++-
 src/connection-editor/Makefile.am |    4 +++-
 src/libnm-gtk/Makefile.am         |    3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d209e2d..f950326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,9 +69,10 @@ else
     AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["$prefix"],[ISO codes prefix])
 fi
 
+PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.74])
+
 PKG_CHECK_MODULES(NMA,
-               [dbus-glib-1 >= 0.74
-                gio-2.0 >= 2.32
+               [gio-2.0 >= 2.32
                 NetworkManager >= 1.0
                 libnm-glib >= 1.0
                 libnm-util >= 1.0
diff --git a/src/Makefile.am b/src/Makefile.am
index c22756d..9989fd5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -21,7 +21,7 @@ nm_applet_CPPFLAGS = \
        -DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"     \
        -DNMALOCALEDIR=\"$(datadir)/locale\"                                    \
        -DG_LOG_DOMAIN=\""nm-applet"\" \
-       $(DBUS_CFLAGS)                                                                          \
+       $(DBUS_GLIB_CFLAGS) \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security \
        -I${top_srcdir}/src/libnm-gtk
@@ -79,6 +79,8 @@ nm_applet_LDADD = \
        -lm \
        $(GTK_LIBS) \
        $(NMA_LIBS) \
+       $(DBUS_GLIB_LIBS) \
+       $(LIBNM_LIBS) \
        $(LIBSECRET_LIBS) \
        $(NOTIFY_LIBS) \
        $(MM_GLIB_LIBS) \
diff --git a/src/connection-editor/Makefile.am b/src/connection-editor/Makefile.am
index cd5507b..6a1c084 100644
--- a/src/connection-editor/Makefile.am
+++ b/src/connection-editor/Makefile.am
@@ -13,7 +13,7 @@ nm_connection_editor_CPPFLAGS = \
        -DLIBDIR=\""$(libdir)"\" \
        -DDATADIR=\""$(datadir)"\" \
        -DNMALOCALEDIR=\"$(datadir)/locale\" \
-       $(DBUS_CFLAGS) \
+       $(DBUS_GLIB_CFLAGS) \
        -I${top_srcdir}/src/utils \
        -I${top_srcdir}/src/wireless-security \
        -I${top_srcdir}/src/libnm-gtk
@@ -92,6 +92,8 @@ nm_connection_editor_LDADD = \
        ${top_builddir}/src/libnm-gtk/libnm-gtk.la \
        $(GTK_LIBS) \
        $(NMA_LIBS) \
+       $(DBUS_GLIB_LIBS) \
+       $(LIBNM_LIBS) \
        -lm
 
 uidir = $(datadir)/nm-applet
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index f2f44c9..f919b79 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -27,7 +27,7 @@ libnm_gtk_la_SOURCES = \
 libnm_gtk_la_CFLAGS = \
        $(GTK_CFLAGS) \
        $(NMA_CFLAGS) \
-       $(DBUS_CFLAGS) \
+       $(DBUS_GLIB_CFLAGS) \
        $(GUDEV_CFLAGS) \
        -DLIBNM_GLIB_BUILD \
        -DICONDIR=\""$(datadir)/icons"\" \
@@ -45,6 +45,7 @@ libnm_gtk_la_CFLAGS = \
 libnm_gtk_la_LIBADD = \
        $(GTK_LIBS) \
        $(NMA_LIBS) \
+       $(DBUS_GLIB_LIBS) \
        $(GUDEV_LIBS) \
        $(top_builddir)/src/wireless-security/libwireless-security-libnm-glib.la