merges from stable branch

[~andy/gtk] / configure.in

diff --git a/configure.in b/configure.in
index 23d9e37e506c078c87a703b6b1cbd6909d2ddc4e..c34744c10c152a232e5072bb4cacac820de91a77 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -160,6 +160,8 @@ if test -n "$PERL" && perl -v | grep 'version 5.' > /dev/null ; then
 fi
 AC_SUBST(REBUILD)
 
+AC_CHECK_FUNCS(lstat)
+
 # i18n stuff
 ALL_LINGUAS="cs de es fr hu it ja ko nl no pl pt ru sv"
 AM_GTK_GNU_GETTEXT
@@ -214,9 +216,9 @@ fi
 if test x$with_glib = x ; then 
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.2.0,,
+  AM_PATH_GLIB(1.3.0,,
     AC_MSG_ERROR([
-*** GLIB 1.2.0 or better is required. The latest version of GLIB
+*** GLIB 1.3.0 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org/.]),
     gmodule gthread)
 
@@ -586,5 +588,5 @@ po/Makefile.in
 docs/Makefile
 gdk/Makefile
 gtk/Makefile
-gtk/gtkfeatures.h
+gtk/gtkcompat.h
 ], [chmod +x gtk-config])