Mercurial > emacs
changeset 89541:148a846dccfd
Merge from HEAD.
| author | Dave Love <fx@gnu.org> |
|---|---|
| date | Mon, 29 Sep 2003 17:50:08 +0000 |
| parents | 00740a07ad9a |
| children | 2785238e3aea |
| files | configure.in |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Sun Sep 28 23:57:00 2003 +0000 +++ b/configure.in Mon Sep 29 17:50:08 2003 +0000 @@ -1134,7 +1134,7 @@ 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 @@ 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.