procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from HEAD.

Browse source
This commit is contained in:
Dave Love 2003-09-29 17:50:08 +00:00
parent 7f04a736ad
commit 1a95ffe4c4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.in
View file

@ -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.