* configure.in (--with-gtk, --with-gcc): Remove option stubs.

diff --git a/ChangeLog b/ChangeLog
index d51d9afc3a6e668105a4a40fcff0f6bb2793b63a..0f068a033bd02769bf5da67ad3d2ceffef82e519 100644 (file)
--- 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 5d168d77886374bbb5775cc925f80a99a8ad8622..a3574dd2391690e36cccbdb8e75cc53548f80207 100644 (file)
--- 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])])