From e2bcb1d1a6dc9792c252e1b18f27e5b4e7aab983 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 3 Apr 2008 22:43:31 +0000 Subject: [PATCH] Define GLIB_STATIC_COMPILATION here also, if needed. 2008-04-04 Tor Lillqvist * glibconfig.h.win32.in: Define GLIB_STATIC_COMPILATION here also, if needed. svn path=/trunk/; revision=6822 --- ChangeLog | 3 +++ configure.in | 2 ++ glibconfig.h.win32.in | 1 + 3 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index d215443a..bf9befed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,9 @@ force the developer who compiles against a statically built GLib to use -DGLIB_STATIC_COMPILATION. + * glibconfig.h.win32.in: Define GLIB_STATIC_COMPILATION here also, + if needed. + 2008-04-03 Tor Lillqvist * configure.in: Don't enforce shared library build only on diff --git a/configure.in b/configure.in index 1a0c1a11..c12b0382 100644 --- a/configure.in +++ b/configure.in @@ -491,6 +491,8 @@ if test "$glib_native_win32" = "yes"; then fi if test x$enable_static = xyes; then glib_win32_static_compilation=yes + GLIB_WIN32_STATIC_COMPILATION_DEFINE="#define GLIB_STATIC_COMPILATION 1" + AC_SUBST(GLIB_WIN32_STATIC_COMPILATION_DEFINE) fi fi diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index b7e8b4c7..a37a948e 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -103,6 +103,7 @@ typedef gint64 goffset; #define G_OS_WIN32 #define G_PLATFORM_WIN32 +@GLIB_WIN32_STATIC_COMPILATION_DEFINE@ #ifndef _MSC_VER #define G_VA_COPY va_copy -- 2.34.1