[network-manager-applet/danw/libnm-bgo736911: 14/17] build: rename NMA_* to LIBNM_GLIB_*

[Dan Williams <dcbw src gnome org>]

commit bd2c685e4f178efe3705a3ba4aff2a09d8cf6992
Author: Dan Williams <dcbw redhat com>
Date:   Tue Feb 24 13:22:05 2015 -0600

    build: rename NMA_* to LIBNM_GLIB_*

 configure.ac                                |    2 +-
 src/libnm-gtk/Makefile.am                   |    4 ++--
 src/libnm-gtk/tests/Makefile.am             |    4 ++--
 src/libnm-gtk/tests/test-mobile-providers.c |    2 ++
 src/utils/Makefile.am                       |    4 ++--
 src/wireless-security/Makefile.am           |    4 ++--
 6 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f950326..66f9891 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ fi
 
 PKG_CHECK_MODULES(DBUS_GLIB, [dbus-glib-1 >= 0.74])
 
-PKG_CHECK_MODULES(NMA,
+PKG_CHECK_MODULES(LIBNM_GLIB,
                [gio-2.0 >= 2.32
                 NetworkManager >= 1.0
                 libnm-glib >= 1.0
diff --git a/src/libnm-gtk/Makefile.am b/src/libnm-gtk/Makefile.am
index f919b79..0eb1169 100644
--- a/src/libnm-gtk/Makefile.am
+++ b/src/libnm-gtk/Makefile.am
@@ -26,7 +26,7 @@ libnm_gtk_la_SOURCES = \
 
 libnm_gtk_la_CFLAGS = \
        $(GTK_CFLAGS) \
-       $(NMA_CFLAGS) \
+       $(LIBNM_GLIB_CFLAGS) \
        $(DBUS_GLIB_CFLAGS) \
        $(GUDEV_CFLAGS) \
        -DLIBNM_GLIB_BUILD \
@@ -44,7 +44,7 @@ libnm_gtk_la_CFLAGS = \
 
 libnm_gtk_la_LIBADD = \
        $(GTK_LIBS) \
-       $(NMA_LIBS) \
+       $(LIBNM_GLIB_LIBS) \
        $(DBUS_GLIB_LIBS) \
        $(GUDEV_LIBS) \
        $(top_builddir)/src/wireless-security/libwireless-security-libnm-glib.la
diff --git a/src/libnm-gtk/tests/Makefile.am b/src/libnm-gtk/tests/Makefile.am
index 3203eeb..39b2489 100644
--- a/src/libnm-gtk/tests/Makefile.am
+++ b/src/libnm-gtk/tests/Makefile.am
@@ -6,14 +6,14 @@ test_mobile_providers_SOURCES = \
        test-mobile-providers.c
 
 test_mobile_providers_CPPFLAGS = \
-       $(NMA_CFLAGS) \
+       $(LIBNM_GLIB_CFLAGS) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/src/libnm-gtk \
        -DTEST_DATA_DIR=\""$(abs_top_srcdir)/src/libnm-gtk/tests"\"
 
 test_mobile_providers_LDADD = \
        $(top_builddir)/src/libnm-gtk/libnm-gtk.la \
-       $(NMA_LIBS)
+       $(LIBNM_GLIB_LIBS)
 
 check-local: test-mobile-providers
        $(abs_builddir)/test-mobile-providers
diff --git a/src/libnm-gtk/tests/test-mobile-providers.c b/src/libnm-gtk/tests/test-mobile-providers.c
index 49908ae..ea8b93c 100644
--- a/src/libnm-gtk/tests/test-mobile-providers.c
+++ b/src/libnm-gtk/tests/test-mobile-providers.c
@@ -490,7 +490,9 @@ int main (int argc, char **argv)
 {
        setlocale (LC_ALL, "");
 
+#if !GLIB_CHECK_VERSION(2,36,0)
        g_type_init ();
+#endif
        g_test_init (&argc, &argv, NULL);
 
        g_test_add_func ("/MobileProvidersDatabase/new-sync",  new_sync);
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 33a1d53..305249e 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -12,11 +12,11 @@ libutils_libnm_glib_la_SOURCES = \
 libutils_libnm_glib_la_CPPFLAGS = \
        -DLIBNM_GLIB_BUILD \
        $(GTK_CFLAGS) \
-       $(NMA_CFLAGS)
+       $(LIBNM_GLIB_CFLAGS)
 
 libutils_libnm_glib_la_LIBADD = \
        $(GTK_LIBS) \
-       $(NMA_LIBS)
+       $(LIBNM_GLIB_LIBS)
 
 libutils_libnm_la_SOURCES = \
        utils.c \
diff --git a/src/wireless-security/Makefile.am b/src/wireless-security/Makefile.am
index cb91106..dc26aef 100644
--- a/src/wireless-security/Makefile.am
+++ b/src/wireless-security/Makefile.am
@@ -39,12 +39,12 @@ libwireless_security_libnm_glib_la_CPPFLAGS = \
        $(GTK_CFLAGS) \
        -DUIDIR=\""$(uidir)"\" \
        -DLIBNM_GLIB_BUILD \
-       $(NMA_CFLAGS) \
+       $(LIBNM_GLIB_CFLAGS) \
        -I${top_srcdir}/src/utils
 
 libwireless_security_libnm_glib_la_LIBADD = \
        $(GTK_LIBS) \
-       $(NMA_LIBS) \
+       $(LIBNM_GLIB_LIBS) \
        ${top_builddir}/src/utils/libutils-libnm-glib.la
 
 libwireless_security_libnm_la_SOURCES = \