Mercurial > emacs
comparison configure.in @ 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 | 9e490faa9f6b |
comparison
equal
deleted
inserted
replaced
90287:3cd97358d81a | 90288:7432ca837c8d |
---|---|
1998 HAVE_GTK=no | 1998 HAVE_GTK=no |
1999 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then | 1999 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then |
2000 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then | 2000 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then |
2001 AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); | 2001 AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]); |
2002 fi | 2002 fi |
2003 GLIB_REQUIRED=2.0.1 | 2003 GLIB_REQUIRED=2.4 |
2004 GTK_REQUIRED=2.0.1 | 2004 GTK_REQUIRED=2.4 |
2005 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" | 2005 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" |
2006 | 2006 |
2007 dnl Check if --with-pkg-config-prog has been given. | 2007 dnl Check if --with-pkg-config-prog has been given. |
2008 if test "X${with_pkg_config_prog}" != X; then | 2008 if test "X${with_pkg_config_prog}" != X; then |
2009 PKG_CONFIG="${with_pkg_config_prog}" | 2009 PKG_CONFIG="${with_pkg_config_prog}" |