diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-12 14:15:48 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-06-15 14:25:48 +0100 |
| commit | efddba53da6b76478064f43d8235de12151f33ad (patch) | |
| tree | c4e2a252b17149e4d87e272bcec03a3e4934ddf9 /tools | |
| parent | 09d71f92c349fb25053136fd329b5903c7216bdd (diff) | |
| download | dbus-efddba53da6b76478064f43d8235de12151f33ad.tar.gz | |
When not producing a dynamic library, define DBUS_STATIC_BUILD
When targeting Windows, linking against the static library requires
special effort to turn off DLL import/export processing. We normally
link some things against the dynamic library, but if we're not building
that, we'll have to link everything statically.
Based on patches from 'william' on fd.o #46367.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33973
Tested-by: René Berber <Rene.Berber gmail com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 08b90234..c4632e3e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -2,6 +2,7 @@ configdir=$(sysconfdir)/dbus-1 AM_CPPFLAGS = \ -I$(top_srcdir) \ + $(DBUS_STATIC_BUILD_CPPFLAGS) \ $(DBUS_X_CFLAGS) \ -DDBUS_COMPILATION \ -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ |