Check for GLib under the name GLIB, not DBUS_GLIB

Signed-off-by: Simon McVittie <smcv@debian.org>

9 files changed, 22 insertions, 22 deletions

diff --git a/configure.ac b/configure.ac
index 889faf9..4c49836 100644
--- a/configure.ac
+++ b/configure.ac
@@ -263,15 +263,15 @@ AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_32],
   [Warn on use of APIs added after GLib 2.32])
 AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_32],
   [Warn on use of APIs deprecated before GLib 2.32])
-PKG_CHECK_MODULES([DBUS_GLIB], [gobject-2.0 >= 2.32, gio-2.0 >= 2.32])
+PKG_CHECK_MODULES([GLIB], [gobject-2.0 >= 2.32, gio-2.0 >= 2.32])
 
 GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
 AC_SUBST(GLIB_GENMARSHAL)
 
 dnl GLib flags
-AC_SUBST(DBUS_GLIB_CFLAGS)
-AC_SUBST(DBUS_GLIB_LIBS)
-AC_SUBST(DBUS_GLIB_THREADS_LIBS)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_THREADS_LIBS)
 
 DBUS_GLIB_TOOL_CFLAGS=$XML_CFLAGS
 DBUS_GLIB_TOOL_LIBS="$XML_LIBS"
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index a51750e..37c6334 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)						\
 	-I$(top_builddir)					\
 	$(DBUS_CFLAGS)						\
-	$(DBUS_GLIB_CFLAGS)					\
+	$(GLIB_CFLAGS)					\
 	$(DBUS_GLIB_TOOL_CFLAGS)				\
 	-DDBUS_COMPILATION=1					\
 	-DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" 
@@ -51,7 +51,7 @@ libdbus_glibdir = $(includedir)/dbus-1.0/dbus
 libdbus_glib_1_la_LIBADD = \
 	$(top_builddir)/dbus-gmain/libdbus-gmain.la \
 	$(DBUS_LIBS) \
-	$(DBUS_GLIB_LIBS) \
+	$(GLIB_LIBS) \
 	$(NULL)
 ## don't export symbols that start with "_" (we use this 
 ## convention for internal symbols)
@@ -70,7 +70,7 @@ libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \
 libdbus_gtool_la_LIBADD = \
 	-lexpat \
 	$(DBUS_LIBS) \
-	$(DBUS_GLIB_LIBS) \
+	$(GLIB_LIBS) \
 	libdbus-glib-1.la \
 	$(NULL)
 
@@ -82,7 +82,7 @@ dbus_binding_tool_SOURCES =			\
 	dbus-glib-tool.h			\
 	dbus-glib-tool.c
 
-dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat
+dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(GLIB_LIBS) -lexpat
 
 ## we just rebuilt these manually and check them into cvs; easier than
 ## convincing automake/make to do this properly
@@ -105,7 +105,7 @@ CLEANFILES += dbus-bash-completion.sh
 
 dbus_bash_completion_helper_SOURCES =                 	\
 	dbus-bash-completion-helper.c
-dbus_bash_completion_helper_LDADD=$(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS)
+dbus_bash_completion_helper_LDADD=$(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(GLIB_LIBS)
 
 
 EXTRA_DIST=dbus-gmarshal.list dbus-bash-completion.sh.in
diff --git a/dbus/examples/Makefile.am b/dbus/examples/Makefile.am
index 867f307..6f8b0f4 100644
--- a/dbus/examples/Makefile.am
+++ b/dbus/examples/Makefile.am
@@ -5,11 +5,11 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)			\
 	-I$(top_builddir)/dbus			\
 	$(DBUS_CFLAGS)				\
-	$(DBUS_GLIB_CFLAGS)			\
+	$(GLIB_CFLAGS)				\
 	-DDBUS_COMPILATION
 
 LDADD = \
-	$(DBUS_GLIB_LIBS) \
+	$(GLIB_LIBS) \
 	$(top_builddir)/dbus/libdbus-glib-1.la
 
 ## Makefile.am bits for sample client/server pair
diff --git a/dbus/examples/statemachine/Makefile.am b/dbus/examples/statemachine/Makefile.am
index 671fcda..187b044 100644
--- a/dbus/examples/statemachine/Makefile.am
+++ b/dbus/examples/statemachine/Makefile.am
@@ -3,12 +3,12 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)			\
 	-I$(top_builddir)/dbus			\
 	$(DBUS_CFLAGS)				\
-	$(DBUS_GLIB_CFLAGS)			\
+	$(GLIB_CFLAGS)				\
 	$(DBUS_GTK_THREADS_CFLAGS)		\
 	-DDBUS_COMPILATION
 
 LDADD = $(top_builddir)/dbus/libdbus-glib-1.la \
-	$(DBUS_GLIB_LIBS)
+	$(GLIB_LIBS)
 
 ## Makefile.am bits for sample client/server pair
 
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 4592d99..f16f343 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -96,7 +96,7 @@ expand_content_files=
 # signals and properties.
 # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-GTKDOC_CFLAGS=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
+GTKDOC_CFLAGS=-I$(top_srcdir) $(DBUS_CFLAGS) $(GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
 GTKDOC_LIBS=$(top_builddir)/dbus/libdbus-glib-1.la
 
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
diff --git a/test/Makefile.am b/test/Makefile.am
index e538f2d..7393bed 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,12 +6,12 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)			\
 	-I$(top_builddir)/dbus			\
 	$(DBUS_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(NULL)
 
 LDADD = \
 	$(top_builddir)/dbus/libdbus-glib-1.la \
-	$(DBUS_GLIB_LIBS) \
+	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(NULL)
 
diff --git a/test/core/Makefile.am b/test/core/Makefile.am
index 314ff40..91c3772 100644
--- a/test/core/Makefile.am
+++ b/test/core/Makefile.am
@@ -4,12 +4,12 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)			\
 	-I$(top_builddir)/dbus			\
 	$(DBUS_CFLAGS)				\
-	$(DBUS_GLIB_CFLAGS)			\
+	$(GLIB_CFLAGS)				\
 	-DDBUS_COMPILATION
 
 LDADD = \
-	$(DBUS_GLIB_THREADS_LIBS) \
-	$(DBUS_GLIB_LIBS) \
+	$(GLIB_THREADS_LIBS) \
+	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
 	$(top_builddir)/dbus/libdbus-glib-1.la \
 	$(top_builddir)/dbus-gmain/tests/libtest.la \
diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
index fa5ae33..f3f62e4 100644
--- a/test/interfaces/Makefile.am
+++ b/test/interfaces/Makefile.am
@@ -3,10 +3,10 @@ AM_CPPFLAGS = \
 	-I$(top_builddir)			\
 	-I$(top_builddir)/dbus			\
 	$(DBUS_CFLAGS)				\
-	$(DBUS_GLIB_CFLAGS)			\
+	$(GLIB_CFLAGS)				\
 	-DDBUS_COMPILATION
 
-LDADD = $(DBUS_GLIB_LIBS) \
+LDADD = $(GLIB_LIBS) \
 	$(top_builddir)/dbus/libdbus-glib-1.la \
 	$(top_builddir)/dbus/libdbus-gtool.la \
 	$(top_builddir)/dbus-gmain/tests/libtest.la \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 57ae527..b032229 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	$(DBUS_CFLAGS) \
-	$(DBUS_GLIB_CFLAGS) \
+	$(GLIB_CFLAGS) \
 	$(DBUS_X_CFLAGS) \
 	$(DBUS_GTK_THREADS_CFLAGS) \
 	-DDBUS_COMPILATION \