diff options
author | Glenn Morris <rgm@gnu.org> | 2010-05-19 22:48:16 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2010-05-19 22:48:16 -0700 |
commit | 21566ba7e5c6d0ba3fdd14da8320e76bc3cb63fe (patch) | |
tree | 0aebd989a332e90d5521522c668c5f940e43abb6 | |
parent | 49a817b3b33a62f66ff99f2b2c1ecc904d558a9e (diff) | |
download | emacs-21566ba7e5c6d0ba3fdd14da8320e76bc3cb63fe.tar.gz |
* configure.in (--with-gtk, --with-gcc): Remove option stubs.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 15 |
2 files changed, 8 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index d51d9afc3a6..0f068a033bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-05-20 Glenn Morris <rgm@gnu.org> + + * configure.in (--with-gtk, --with-gcc): Remove option stubs. + 2010-05-19 Glenn Morris <rgm@gnu.org> * configure.in (LINKER, YMF_PASS_LDFLAGS): New output variables. diff --git a/configure.in b/configure.in index 5d168d77886..a3574dd2391 100644 --- a/configure.in +++ b/configure.in @@ -2,9 +2,11 @@ dnl Autoconf script for GNU Emacs dnl To rebuild the `configure' script from this, execute the command dnl autoconf dnl in the directory containing this script. +dnl If you changed any AC_DEFINES, also run autoheader. dnl -dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, -dnl 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +dnl Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, +dnl 2005, 2006, 2007, 2008, 2009, 2010 +dnl Free Software Foundation, Inc. dnl dnl This file is part of GNU Emacs. dnl @@ -168,15 +170,6 @@ OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support]) dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html OPTION_DEFAULT_ON([makeinfo],[don't require makeinfo for building manuals]) -dnl Can remove these in Emacs 24. -AC_ARG_WITH([gtk],, - [AC_MSG_ERROR([--with-gtk has been removed. Use --with-x-toolkit to -specify a toolkit.])],,) - -AC_ARG_WITH([gcc],, - [AC_MSG_ERROR([--with-gcc has been removed. Set the `CC' environment -variable to specify a compiler.])],,) - AC_ARG_WITH([pkg-config-prog],dnl [AS_HELP_STRING([--with-pkg-config-prog=PATH], [path to pkg-config for finding GTK and librsvg])]) |