diff options
| author | Dave Love | 2003-09-29 17:50:08 +0000 |
|---|---|---|
| committer | Dave Love | 2003-09-29 17:50:08 +0000 |
| commit | 1a95ffe4c4bcd02ecd9ea04bcb39e30c181286f2 (patch) | |
| tree | 98dab2c7093beacf41447752dfafee11becaadb5 | |
| parent | 7f04a736adf36a0acf38516fee883d7044c28ba4 (diff) | |
| download | emacs-1a95ffe4c4bcd02ecd9ea04bcb39e30c181286f2.tar.gz emacs-1a95ffe4c4bcd02ecd9ea04bcb39e30c181286f2.zip | |
Merge from HEAD.
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
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. | |||
| 1134 | powerpc-apple-darwin* ) | 1134 | powerpc-apple-darwin* ) |
| 1135 | machine=powermac opsys=darwin | 1135 | machine=powermac opsys=darwin |
| 1136 | # Define CPP as follows to make autoconf work correctly. | 1136 | # Define CPP as follows to make autoconf work correctly. |
| 1137 | CPP="cc -E -traditional-cpp" | 1137 | CPP="gcc -E -no-cpp-precomp" |
| 1138 | ;; | 1138 | ;; |
| 1139 | 1139 | ||
| 1140 | ## AMD x86-64 Linux-based GNU system | 1140 | ## AMD x86-64 Linux-based GNU system |
| @@ -1900,7 +1900,7 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then | |||
| 1900 | AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); | 1900 | AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); |
| 1901 | fi | 1901 | fi |
| 1902 | GLIB_REQUIRED=2.0.1 | 1902 | GLIB_REQUIRED=2.0.1 |
| 1903 | GTK_REQUIRED=2.2 | 1903 | GTK_REQUIRED=2.0.1 |
| 1904 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" | 1904 | GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" |
| 1905 | 1905 | ||
| 1906 | dnl Check if --with-pkg-config-prog has been given. | 1906 | dnl Check if --with-pkg-config-prog has been given. |