comparison configure @ 90288:7432ca837c8d

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-9 Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 16-33) - Update from CVS - Install ERC. - Fix ERC compiler warnings. - Use utf-8 encoding in ERC ChangeLogs. - Merge ERC-related Viper hacks into Viper. - Merge from erc--main--0 - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 8-13) - Merge from emacs--devo--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Wed, 01 Feb 2006 10:07:17 +0000
parents 7beb78bc1f8e d10c5b8ae128
children a7364c1a561e
comparison
equal deleted inserted replaced
90287:3cd97358d81a 90288:7432ca837c8d
10198 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then 10198 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
10199 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 10199 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5
10200 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} 10200 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;}
10201 { (exit 1); exit 1; }; }; 10201 { (exit 1); exit 1; }; };
10202 fi 10202 fi
10203 GLIB_REQUIRED=2.0.1 10203 GLIB_REQUIRED=2.4
10204 GTK_REQUIRED=2.0.1 10204 GTK_REQUIRED=2.4
10205 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 10205 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
10206 10206
10207 if test "X${with_pkg_config_prog}" != X; then 10207 if test "X${with_pkg_config_prog}" != X; then
10208 PKG_CONFIG="${with_pkg_config_prog}" 10208 PKG_CONFIG="${with_pkg_config_prog}"
10209 fi 10209 fi