Define GLIB_STATIC_COMPILATION here also, if needed.

2008-04-04  Tor Lillqvist  <tml@novell.com>

	* glibconfig.h.win32.in: Define GLIB_STATIC_COMPILATION here also,
	if needed.

svn path=/trunk/; revision=6822

diff --git a/ChangeLog b/ChangeLog
index d215443..bf9befe 100644 (file)
--- 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  <tml@novell.com>
 
        * configure.in: Don't enforce shared library build only on

diff --git a/configure.in b/configure.in
index 1a0c1a1..c12b038 100644 (file)
--- 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 b7e8b4c..a37a948 100644 (file)
--- 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