forked from AuroraMiddleware/gtk
Move check for native Win32 (mingw) a bit earlier. If Win32, disable
2004-03-05 Tor Lillqvist <tml@iki.fi> * 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.
This commit is contained in:
parent
72d622fcf5
commit
11c87b6a37
@ -1,5 +1,9 @@
|
|||||||
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* 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/gdk.def: Add missing entries, thanks to J. Ali Harlow.
|
||||||
|
|
||||||
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* 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/gdk.def: Add missing entries, thanks to J. Ali Harlow.
|
||||||
|
|
||||||
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* 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/gdk.def: Add missing entries, thanks to J. Ali Harlow.
|
||||||
|
|
||||||
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* 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/gdk.def: Add missing entries, thanks to J. Ali Harlow.
|
||||||
|
|
||||||
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
2004-03-05 Tor Lillqvist <tml@iki.fi>
|
||||||
|
|
||||||
|
* 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/gdk.def: Add missing entries, thanks to J. Ali Harlow.
|
||||||
|
|
||||||
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
* gdk/win32/gdkcursor-win32.c (color_is_white): const-correctness.
|
||||||
|
37
configure.in
37
configure.in
@ -107,11 +107,34 @@ GETTEXT_PACKAGE=gtk20
|
|||||||
AC_SUBST(GETTEXT_PACKAGE)
|
AC_SUBST(GETTEXT_PACKAGE)
|
||||||
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$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
|
dnl Initialize libtool
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AM_DISABLE_STATIC
|
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_LIBTOOL
|
||||||
|
|
||||||
AM_PROG_AS
|
AM_PROG_AS
|
||||||
@ -133,18 +156,6 @@ esac
|
|||||||
AC_MSG_RESULT([$platform_win32])
|
AC_MSG_RESULT([$platform_win32])
|
||||||
AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes")
|
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_WIN32, test "$os_win32" = "yes")
|
||||||
AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
|
AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes")
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user