diff options
| author | Tor Lillqvist <tml@novell.com> | 2005-06-16 10:36:33 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@src.gnome.org> | 2005-06-16 10:36:33 +0000 |
| commit | e4bdbe0e4c468c50e809bf737444af04e054cd0e (patch) | |
| tree | 73d0ae4b8257c41bb1a0058450f3e7356d2e1abd | |
| parent | 089938692d64ab64924348ef5a7e550d08ee7c87 (diff) | |
| download | pango-e4bdbe0e4c468c50e809bf737444af04e054cd0e.tar.gz | |
Move the check for native Win32 a bit later, as $host didn't seem to be
2005-06-16 Tor Lillqvist <tml@novell.com>
* configure.in: Move the check for native Win32 a bit later, as
$host didn't seem to be set up yet at the point where we checked.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | configure.in | 28 |
3 files changed, 24 insertions, 14 deletions
@@ -1,3 +1,8 @@ +2005-06-16 Tor Lillqvist <tml@novell.com> + + * configure.in: Move the check for native Win32 a bit later, as + $host didn't seem to be set up yet at the point where we checked. + 2005-06-14 Owen Taylor <otaylor@redhat.com> * modules/indic/indic-ot-class-tables.c (guruCharClasses): Mark diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index e3139566..30eaadea 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2005-06-16 Tor Lillqvist <tml@novell.com> + + * configure.in: Move the check for native Win32 a bit later, as + $host didn't seem to be set up yet at the point where we checked. + 2005-06-14 Owen Taylor <otaylor@redhat.com> * modules/indic/indic-ot-class-tables.c (guruCharClasses): Mark diff --git a/configure.in b/configure.in index 07b28b52..06532e16 100644 --- a/configure.in +++ b/configure.in @@ -78,18 +78,6 @@ 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 @@ -106,6 +94,20 @@ AC_LANG_RESTORE AC_LIBTOOL_WIN32_DLL AM_DISABLE_STATIC +AM_PROG_LIBTOOL + +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 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.]) @@ -117,8 +119,6 @@ if test "$pango_os_win32" = "yes"; then enable_shared=yes fi -AM_PROG_LIBTOOL - AC_MSG_CHECKING([for some Win32 platform]) case "$host" in *-*-mingw*|*-*-cygwin*) |