glib r6819 - in branches/glib-2-16: . glib

[tml svn gnome org]

Author: tml
Date: Thu Apr  3 21:19:07 2008
New Revision: 6819
URL: http://svn.gnome.org/viewvc/glib?rev=6819&view=rev

Log:
2008-04-03  Tor Lillqvist  <tml novell com>

	* configure.in: Don't enforce shared library build only on
	Windows. It might well make sense to build static libraries in
	some use cases.

	* glib/gutils.c: Don't compile the DllMain if building libglib
	statically. Also in that case don't return NULL from
	_glib_get_installation_directory(), but return the installation
	directory of the program's .exe file.



Modified:
   branches/glib-2-16/ChangeLog
   branches/glib-2-16/configure.in
   branches/glib-2-16/glib/gutils.c

Modified: branches/glib-2-16/configure.in
==============================================================================
--- branches/glib-2-16/configure.in	(original)
+++ branches/glib-2-16/configure.in	Thu Apr  3 21:19:07 2008
@@ -250,17 +250,6 @@
   AC_MSG_RESULT([yes])
 fi
 
-if test "$glib_native_win32" = "yes"; then
-  if test x$enable_static = xyes -o x$enable_static = x; then
-    AC_MSG_WARN([Disabling static library build, must build as DLL on Windows.])
-    enable_static=no
-  fi
-  if test x$enable_shared = xno; then
-    AC_MSG_WARN([Enabling shared library build, must build as DLL on Windows.])
-  fi
-  enable_shared=yes
-fi
-
 dnl Checks for programs.
 AC_PROG_CC
 

Modified: branches/glib-2-16/glib/gutils.c
==============================================================================
--- branches/glib-2-16/glib/gutils.c	(original)
+++ branches/glib-2-16/glib/gutils.c	Thu Apr  3 21:19:07 2008
@@ -134,6 +134,8 @@
 
 static HMODULE glib_dll = NULL;
 
+#ifdef DLL_EXPORT
+
 BOOL WINAPI
 DllMain (HINSTANCE hinstDLL,
 	 DWORD     fdwReason,
@@ -145,12 +147,18 @@
   return TRUE;
 }
 
+#endif
+
 gchar *
 _glib_get_installation_directory (void)
 {
+#ifdef DLL_EXPORT
   if (glib_dll == NULL)
     return NULL;
-
+#endif
+  /* In a static build of GLib just use the application's .exe file's
+   * installation directory...
+   */
   return g_win32_get_package_installation_directory_of_module (glib_dll);
 }