(Fdelete_frame): Fix previous change.

[gnu-emacs] / configure.in

diff --git a/configure.in b/configure.in
index ea4d9adf6ea9b7783f5057725318610a83f7ced6..471d952e4a32f8214e132fae4bd0b94b2eb8e554 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl This is an autoconf script.
 dnl To rebuild the `configure' script from this, execute the command
 dnl    autoconf
 dnl in the directory containing this script.
-AC_PREREQ(1.106)dnl
+AC_PREREQ(1.110)dnl
 AC_INIT(src/lisp.h)
 AC_CONFIG_HEADER(src/config.h)
 
@@ -24,8 +24,6 @@ AC_ARG_WITH(x10,
 [  --with-x10              Support the X Window System version 10])
 AC_ARG_WITH(x,
 [  --with-x                Support the X Window System version 11])
-AC_ARG_WITH(x11,
-[  --with-x11              Support the X Window System version 11])
 AC_ARG_WITH(x-toolkit,
 [  --with-x-toolkit=KIT    Use an X toolkit (KIT = lucid or athena)],
 [        case "${withval}" in
@@ -102,6 +100,7 @@ fi
 
 AC_CANONICAL_HOST
 canonical=$host
+configuration=$host_alias
 
 changequote(, )dnl
 
@@ -841,7 +840,7 @@ dnl other checks for UNIX variants
 case "${with_x10}" in
   yes ) window_system=x10 ;;
   no ) window_system=none ;;
-  *) test -n "$with_x11" && with_x="$with_x11"
+  *) 
     AC_FIND_X
     if test "$no_x" = yes; then
       window_system=none
@@ -1091,6 +1090,10 @@ if test $ok_so_far = yes; then
   AC_DEFINE(HAVE_INET_SOCKETS)
 fi
 
+if test -f /usr/lpp/X11/bin/smt.exp; then
+  AC_DEFINE(HAVE_AIX_SMT_EXP)
+fi
+
 # Set up the CFLAGS for real compilation, so we can substitute it.
 CFLAGS="$REAL_CFLAGS"
 
@@ -1103,10 +1106,6 @@ if test x"${version}" = x; then
   AC_MSG_ERROR(can't find current emacs version in \`${srcdir}/lisp/version.el'.)
 fi
 
-if test -f /usr/lpp/X11/bin/smt.exp; then
-  AC_DEFINE(HAVE_AIX_SMT_EXP)
-fi
-
 ### Specify what sort of things we'll be editing into Makefile and config.h.
 ### Use configuration here uncanonicalized to avoid exceeding size limits.
 AC_SUBST(version)
@@ -1217,16 +1216,8 @@ test "${exec_prefix}" != NONE &&
   exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
 changequote([, ])dnl
 
-save_no_create="$no_create"
-no_create=yes
-
-AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile lwlib/Makefile src/Makefile.in)
-
-cat >> ${CONFIG_STATUS} <<EOF
-CPP="$CPP" CPPFLAGS="$CPPFLAGS"
-EOF
-
-cat >> ${CONFIG_STATUS} <<\EOF
+AC_OUTPUT(Makefile lib-src/Makefile.in oldXMenu/Makefile \
+       lwlib/Makefile src/Makefile.in, [
 
 ### Make the necessary directories, if they don't exist.
 for dir in ./src ./lib-src ./cpp ./oldXMenu ./lwlib ./etc ; do
@@ -1282,6 +1273,4 @@ echo creating src/Makefile
   chmod 444 Makefile.new
   mv -f Makefile.new Makefile
 )
-EOF
-
-test "$save_no_create" = yes || ${CONFIG_SHELL-/bin/sh} ${CONFIG_STATUS}
+], [CPP="$CPP" CPPFLAGS="$CPPFLAGS"])