From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 20 Feb 2015 16:14:08 +0000 (+0000)
Subject: Fix static linking with mingw
X-Git-Tag: dbus-1.9.14~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c35d7d1eb773c27018ec4e326bfac0b973e743c0;p=thirdparty%2Fdbus.git

Fix static linking with mingw

Now that we're normally linking libdbus-1 dynamically, we need to
use DBUS_STATIC_BUILD_CPPFLAGS in every Makefile that would normally
link it dynamically, but might link it statically if we are only
building static libraries.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=83115
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
---

diff --git a/bus/Makefile.am b/bus/Makefile.am
index 0b9998da3..1db7c9e12 100644
--- a/bus/Makefile.am
+++ b/bus/Makefile.am
@@ -18,11 +18,11 @@ DBUS_LAUNCHER_LIBS = \
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
+	$(DBUS_STATIC_BUILD_CPPFLAGS) \
 	$(XML_CFLAGS) \
 	$(APPARMOR_CFLAGS) \
 	-DDBUS_SYSTEM_CONFIG_FILE=\""$(configdir)/system.conf"\" \
 	-DDBUS_COMPILATION \
-	-DDBUS_STATIC_BUILD \
 	$(NULL)
 
 # if assertions are enabled, improve backtraces
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index 56668d309..e5a5688ae 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -4,6 +4,7 @@ configdir=$(sysconfdir)/dbus-1
 AM_CPPFLAGS = \
 	-I$(top_builddir) \
 	-I$(top_srcdir) \
+	$(DBUS_STATIC_BUILD_CPPFLAGS) \
 	$(SYSTEMD_CFLAGS) \
 	$(VALGRIND_CFLAGS) \
 	-DDBUS_COMPILATION \
diff --git a/test/Makefile.am b/test/Makefile.am
index 723d7767e..54bcd8686 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,6 +6,7 @@ DIST_SUBDIRS=name-test
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
+	$(DBUS_STATIC_BUILD_CPPFLAGS) \
 	-DDBUS_COMPILATION \
 	$(GLIB_CFLAGS) \
 	$(NULL)
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am
index b28a7e865..c6611aa37 100644
--- a/test/name-test/Makefile.am
+++ b/test/name-test/Makefile.am
@@ -1,5 +1,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
+	$(DBUS_STATIC_BUILD_CPPFLAGS) \
 	-DDBUS_COMPILATION \
 	$(NULL)