Mercurial > emacs

comparison configure @ 83464:49f9dd4bb117

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-32 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-33 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-34 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-35 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-36 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-37 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-8 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-9 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-10 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-11 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-12 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-13 Merge from emacs--devo--0 git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-504
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 03 Feb 2006 13:58:41 +0000
parents de425e4eb0bc d10c5b8ae128
children a380ca43a190
comparison
equal deleted inserted replaced
83463:38c49afb29d9 83464:49f9dd4bb117
10135 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then 10135 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
10136 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 10136 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5
10137 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} 10137 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;}
10138 { (exit 1); exit 1; }; }; 10138 { (exit 1); exit 1; }; };
10139 fi 10139 fi
10140 GLIB_REQUIRED=2.0.1 10140 GLIB_REQUIRED=2.4
10141 GTK_REQUIRED=2.0.1 10141 GTK_REQUIRED=2.4
10142 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 10142 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
10143 10143
10144 if test "X${with_pkg_config_prog}" != X; then 10144 if test "X${with_pkg_config_prog}" != X; then
10145 PKG_CONFIG="${with_pkg_config_prog}" 10145 PKG_CONFIG="${with_pkg_config_prog}"
10146 fi 10146 fi