From: Dave Love <fx@gnu.org>
Date: Mon, 29 Sep 2003 17:50:08 +0000 (+0000)
Subject: Merge from HEAD.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1807
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1a95ffe4c4bcd02ecd9ea04bcb39e30c181286f2;p=emacs.git

Merge from HEAD.
---

diff --git a/configure.in b/configure.in
index abe9d262589..060a89bd36b 100644
--- 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.