From 11c87b6a37854a347eba8acd449d8108facacf35 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 5 Mar 2004 23:28:39 +0000 Subject: [PATCH] Move check for native Win32 (mingw) a bit earlier. If Win32, disable 2004-03-05 Tor Lillqvist * configure.in: Move check for native Win32 (mingw) a bit earlier. If Win32, disable static builds (as in GLib). Remove unnecessary AC_LIBTOOL_WIN32_DLL. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ configure.in | 37 ++++++++++++++++++++++++------------- 6 files changed, 44 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8dc45aabb8..96ad6a5d4d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-03-05 Tor Lillqvist + * configure.in: Move check for native Win32 (mingw) a bit + earlier. If Win32, disable static builds (as in GLib). Remove + unnecessary AC_LIBTOOL_WIN32_DLL. + * gdk/gdk.def: Add missing entries, thanks to J. Ali Harlow. * gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8dc45aabb8..96ad6a5d4d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-03-05 Tor Lillqvist + * configure.in: Move check for native Win32 (mingw) a bit + earlier. If Win32, disable static builds (as in GLib). Remove + unnecessary AC_LIBTOOL_WIN32_DLL. + * gdk/gdk.def: Add missing entries, thanks to J. Ali Harlow. * gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8dc45aabb8..96ad6a5d4d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,9 @@ 2004-03-05 Tor Lillqvist + * configure.in: Move check for native Win32 (mingw) a bit + earlier. If Win32, disable static builds (as in GLib). Remove + unnecessary AC_LIBTOOL_WIN32_DLL. + * gdk/gdk.def: Add missing entries, thanks to J. Ali Harlow. * gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8dc45aabb8..96ad6a5d4d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-03-05 Tor Lillqvist + * configure.in: Move check for native Win32 (mingw) a bit + earlier. If Win32, disable static builds (as in GLib). Remove + unnecessary AC_LIBTOOL_WIN32_DLL. + * gdk/gdk.def: Add missing entries, thanks to J. Ali Harlow. * gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8dc45aabb8..96ad6a5d4d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-03-05 Tor Lillqvist + * configure.in: Move check for native Win32 (mingw) a bit + earlier. If Win32, disable static builds (as in GLib). Remove + unnecessary AC_LIBTOOL_WIN32_DLL. + * gdk/gdk.def: Add missing entries, thanks to J. Ali Harlow. * gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness. diff --git a/configure.in b/configure.in index 922c6fb196..b68b5ce6fd 100644 --- a/configure.in +++ b/configure.in @@ -107,11 +107,34 @@ GETTEXT_PACKAGE=gtk20 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") +MATH_LIB=-lm +AC_MSG_CHECKING([for native Win32]) +case "$host" in + *-*-mingw*) + os_win32=yes + MATH_LIB= + ;; + *) + os_win32=no + ;; +esac +AC_MSG_RESULT([$os_win32]) dnl Initialize libtool AC_PROG_CC AM_DISABLE_STATIC -AC_LIBTOOL_WIN32_DLL + +if test "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 AM_PROG_AS @@ -133,18 +156,6 @@ esac AC_MSG_RESULT([$platform_win32]) AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") -MATH_LIB=-lm -AC_MSG_CHECKING([for native Win32]) -case "$host" in - *-*-mingw*) - os_win32=yes - MATH_LIB= - ;; - *) - os_win32=no - ;; -esac -AC_MSG_RESULT([$os_win32]) AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")