Mercurial > emacs
comparison configure.in @ 89541:148a846dccfd
Merge from HEAD.
author | Dave Love <fx@gnu.org> |
---|---|
date | Mon, 29 Sep 2003 17:50:08 +0000 |
parents | 375f2633d815 |
children | 68c22ea6027c |
comparison
equal
deleted
inserted
replaced
89540:00740a07ad9a | 89541:148a846dccfd |
---|---|
1132 | 1132 |
1133 ## Darwin / Mac OS X | 1133 ## Darwin / Mac OS X |
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 |
1141 x86_64-*-linux-gnu* ) | 1141 x86_64-*-linux-gnu* ) |
1142 machine=amdx86-64 opsys=gnu-linux | 1142 machine=amdx86-64 opsys=gnu-linux |
1898 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then | 1898 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then |
1899 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then | 1899 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; 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. |
1907 if test "X${with_pkg_config_prog}" != X; then | 1907 if test "X${with_pkg_config_prog}" != X; then |
1908 PKG_CONFIG="${with_pkg_config_prog}" | 1908 PKG_CONFIG="${with_pkg_config_prog}" |