summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-07-12 15:51:26 +0000
committerTor Lillqvist <tml@src.gnome.org>2005-07-12 15:51:26 +0000
commit07085142899378e7b5c0ad8e3fdd35ea2a941b1a (patch)
tree6488fa6efa0fd3ec3a6764e68bca36795a6da178
parentcde661031c455a7bb0f080179afd87cf0034eb17 (diff)
downloadpango-07085142899378e7b5c0ad8e3fdd35ea2a941b1a.tar.gz
Actually commit the configure.in change...
2005-07-09 Tor Lillqvist <tml@novell.com> * configure.in: Call AC_CANONICAL_HOST before looking at $host. Check for windres on Win32.
-rw-r--r--configure.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.in b/configure.in
index 35d55f84..9e7d03bc 100644
--- a/configure.in
+++ b/configure.in
@@ -78,6 +78,8 @@ AC_SUBST(LT_CURRENT_MINUS_AGE)
dnl ==========================================================================
+AC_CANONICAL_HOST
+
AC_MSG_CHECKING([for native Win32])
case "$host" in
*-*-mingw*)
@@ -132,6 +134,10 @@ AC_MSG_RESULT([$pango_platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$pango_platform_win32" = "yes")
if test "$pango_os_win32" = "yes"; then
+ AC_CHECK_TOOL(WINDRES, windres, no)
+ if test "$WINDRES" = no; then
+ AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
+ fi
AC_CHECK_PROG(ms_librarian, lib.exe, yes, no)
fi
AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)