Rename DBUS_CLIENT_LIBS to LIBDBUS_LIBS to more accurately reflect its meaning

This does still need to be in configure.ac, because it's common to
dbus/Makefile.am (linking the static/shared library) and dbus-1*.pc.in
(telling static library users which additional libraries they must link).

diff --git a/configure.ac b/configure.ac
index 1253d0a035ce73784a4cfadfe3c6923dc03844bf..4a7ac3e98443c09e6419b1ca24c591fa3fae1d48 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1134,8 +1134,8 @@ fi
 AC_SUBST([NETWORK_libs])
 
 #### Set up final flags
-DBUS_CLIENT_LIBS="$THREAD_LIBS $NETWORK_libs"
-AC_SUBST(DBUS_CLIENT_LIBS)
+LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs"
+AC_SUBST([LIBDBUS_LIBS])
 
 DBUS_TEST_LIBS="$THREAD_LIBS $NETWORK_libs"
 AC_SUBST(DBUS_TEST_LIBS)

diff --git a/dbus-1-uninstalled.pc.in b/dbus-1-uninstalled.pc.in
index 082222d6677497241e769211bdcb77f8203ae08d..f00723252e8e8b64a0dd41ad071e3185a3d530c6 100644 (file)
--- a/dbus-1-uninstalled.pc.in
+++ b/dbus-1-uninstalled.pc.in
@@ -13,5 +13,5 @@ Name: dbus
 Description: Free desktop message bus (uninstalled copy)
 Version: @VERSION@
 Libs: ${abs_top_builddir}/dbus/libdbus-1.la
-Libs.private: @DBUS_CLIENT_LIBS@
+Libs.private: @LIBDBUS_LIBS@
 Cflags: -I${abs_top_srcdir}

diff --git a/dbus-1.pc.in b/dbus-1.pc.in
index 421f3c82dd32e57647837ab02bef7e892a51b68f..7201e07f9850132e6cda8ffe62942c8ee88c56de 100644 (file)
--- a/dbus-1.pc.in
+++ b/dbus-1.pc.in
@@ -13,5 +13,5 @@ Name: dbus
 Description: Free desktop message bus
 Version: @VERSION@
 Libs: -L${libdir} -ldbus-1
-Libs.private: @DBUS_CLIENT_LIBS@
+Libs.private: @LIBDBUS_LIBS@
 Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include

diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 8ae07ebdf33b1d17021613147edaac9b4215d5c2..af34bd4b4f89461c50dac3f1c62ec94d6a8256da 100644 (file)
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -259,7 +259,7 @@ EXTRA_DIST=dbus-arch-deps.h.in
 noinst_LTLIBRARIES=libdbus-internal.la
 
 libdbus_1_la_CPPFLAGS= -Ddbus_1_EXPORTS
-libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS)
+libdbus_1_la_LIBADD= $(LIBDBUS_LIBS)
 libdbus_1_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(export_symbols) \
@@ -268,7 +268,7 @@ libdbus_1_la_LDFLAGS = \
        $(NULL)
 
 libdbus_internal_la_CPPFLAGS = -DDBUS_STATIC_BUILD
-libdbus_internal_la_LIBADD=$(DBUS_CLIENT_LIBS)
+libdbus_internal_la_LIBADD=$(LIBDBUS_LIBS)
 
 noinst_PROGRAMS =