Merge from HEAD.

diff --git a/configure.in b/configure.in
index abe9d262589dea4e963dc1a1bbae4cdab4f67f2b..060a89bd36bffd97d9cf6e9ece961eb23a9b8669 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1134,7 +1134,7 @@ dnl see the `changequote' comment above.
   powerpc-apple-darwin* )
     machine=powermac opsys=darwin
     # Define CPP as follows to make autoconf work correctly.
-    CPP="cc -E -traditional-cpp"
+    CPP="gcc -E -no-cpp-precomp"
   ;;
 
   ## AMD x86-64 Linux-based GNU system
@@ -1900,7 +1900,7 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
     AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
   fi
   GLIB_REQUIRED=2.0.1
-  GTK_REQUIRED=2.2
+  GTK_REQUIRED=2.0.1
   GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
 
   dnl Check if --with-pkg-config-prog has been given.