Move check for native Win32 (mingw) a bit earlier. If Win32, disable

2004-03-03  Tor Lillqvist  <tml@iki.fi>

	* configure.in: Move check for native Win32 (mingw) a bit
	earlier. If Win32, disable static builds (like GLib does).

6 files changed, 44 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index cca434a6..87a70c81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 2004-03-03  Tor Lillqvist  <tml@iki.fi>
 
+	* configure.in: Move check for native Win32 (mingw) a bit
+	earlier. If Win32, disable static builds (like GLib does).
+
 	* pango/pango.def
 	* pango/pangoft2.def: Add some missing symbols. (#135945, Cedric
-	Gustin, #135980, J. Ali Harlow)
+	Gustin; #135980, J. Ali Harlow)
 
 	* pango/pangowin32-fontmap.c (pango_win32_family_get_name): Can be
 	static.
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index cca434a6..87a70c81 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,8 +1,11 @@
 2004-03-03  Tor Lillqvist  <tml@iki.fi>
 
+	* configure.in: Move check for native Win32 (mingw) a bit
+	earlier. If Win32, disable static builds (like GLib does).
+
 	* pango/pango.def
 	* pango/pangoft2.def: Add some missing symbols. (#135945, Cedric
-	Gustin, #135980, J. Ali Harlow)
+	Gustin; #135980, J. Ali Harlow)
 
 	* pango/pangowin32-fontmap.c (pango_win32_family_get_name): Can be
 	static.
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index cca434a6..87a70c81 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,8 +1,11 @@
 2004-03-03  Tor Lillqvist  <tml@iki.fi>
 
+	* configure.in: Move check for native Win32 (mingw) a bit
+	earlier. If Win32, disable static builds (like GLib does).
+
 	* pango/pango.def
 	* pango/pangoft2.def: Add some missing symbols. (#135945, Cedric
-	Gustin, #135980, J. Ali Harlow)
+	Gustin; #135980, J. Ali Harlow)
 
 	* pango/pangowin32-fontmap.c (pango_win32_family_get_name): Can be
 	static.
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index cca434a6..87a70c81 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,8 +1,11 @@
 2004-03-03  Tor Lillqvist  <tml@iki.fi>
 
+	* configure.in: Move check for native Win32 (mingw) a bit
+	earlier. If Win32, disable static builds (like GLib does).
+
 	* pango/pango.def
 	* pango/pangoft2.def: Add some missing symbols. (#135945, Cedric
-	Gustin, #135980, J. Ali Harlow)
+	Gustin; #135980, J. Ali Harlow)
 
 	* pango/pangowin32-fontmap.c (pango_win32_family_get_name): Can be
 	static.
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index cca434a6..87a70c81 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,8 +1,11 @@
 2004-03-03  Tor Lillqvist  <tml@iki.fi>
 
+	* configure.in: Move check for native Win32 (mingw) a bit
+	earlier. If Win32, disable static builds (like GLib does).
+
 	* pango/pango.def
 	* pango/pangoft2.def: Add some missing symbols. (#135945, Cedric
-	Gustin, #135980, J. Ali Harlow)
+	Gustin; #135980, J. Ali Harlow)
 
 	* pango/pangowin32-fontmap.c (pango_win32_family_get_name): Can be
 	static.
diff --git a/configure.in b/configure.in
index 7463ee64..16f322f1 100644
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,18 @@ AC_SUBST(LT_CURRENT_MINUS_AGE)
 
 dnl ==========================================================================
 
+AC_MSG_CHECKING([for native Win32])
+case "$host" in
+  *-*-mingw*)
+    pango_os_win32=yes
+    ;;
+  *)
+    pango_os_win32=no
+    ;;
+esac
+AC_MSG_RESULT([$pango_os_win32])
+AM_CONDITIONAL(OS_WIN32, test "$pango_os_win32" = "yes")
+
 AC_PROG_CC
 	
 dnl 
@@ -93,6 +105,18 @@ AC_LANG_RESTORE
 
 AC_LIBTOOL_WIN32_DLL
 AM_DISABLE_STATIC
+
+if test "$pango_os_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
+
 AM_PROG_LIBTOOL
 
 AC_MSG_CHECKING([for some Win32 platform])
@@ -107,18 +131,6 @@ esac
 AC_MSG_RESULT([$pango_platform_win32])
 AM_CONDITIONAL(PLATFORM_WIN32, test "$pango_platform_win32" = "yes")
 
-AC_MSG_CHECKING([for native Win32])
-case "$host" in
-  *-*-mingw*)
-    pango_os_win32=yes
-    ;;
-  *)
-    pango_os_win32=no
-    ;;
-esac
-AC_MSG_RESULT([$pango_os_win32])
-AM_CONDITIONAL(OS_WIN32, test "$pango_os_win32" = "yes")
-
 if test "$pango_os_win32" = "yes"; then
   AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
 fi