config-ml.in doesn't need to worry about cygnus configure

From-SVN: r55149

diff --git a/ChangeLog b/ChangeLog
index 5d10fbc7f0d5e693688dc115e394f3be93b41272..d76fe03d8859e911164024e0e1a0ebf373cf9e0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2002-07-01  Nathanael Nerode <neroden@twcny.rr.com>
+2002-07-01  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+       * config-ml.in: Eliminate references to Cygnus configure.
+
+2002-07-01  Nathanael Nerode  <neroden@twcny.rr.com>
 
        * Makefile.in: Eliminate references to building emacs.
 

diff --git a/config-ml.in b/config-ml.in
index 5692fb33a46631c1ddf5e1e5f256cc1fb4c2123e..d19a79703b6a6e5e648c18260479fde013cf6c0b 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -64,11 +64,6 @@
 # newlib.  It is up to each target to turn on multilib support for the other
 # libraries as desired.
 
-# We have to handle being invoked by both Cygnus configure and Autoconf.
-#
-# Cygnus configure incoming variables:
-# srcdir, subdir, host, arguments
-#
 # Autoconf incoming variables:
 # srcdir, host, ac_configure_args
 #
@@ -78,21 +73,10 @@
 # Note that `host' in this case is GCC's `target'.  Target libraries are
 # configured for a particular host.
 
-if [ -n "${ac_configure_args}" ]; then
-  Makefile=${ac_file-Makefile}
-  ml_config_shell=${CONFIG_SHELL-/bin/sh}
-  ml_arguments="${ac_configure_args}"
-  ml_realsrcdir=${srcdir}
-else
-  Makefile=${Makefile-Makefile}
-  ml_config_shell=${config_shell-/bin/sh}
-  ml_arguments="${arguments}"
-  if [ -n "${subdir}" -a "${subdir}" != "." ] ; then
-    ml_realsrcdir=${srcdir}/${subdir}
-  else
-    ml_realsrcdir=${srcdir}
-  fi
-fi
+Makefile=${ac_file-Makefile}
+ml_config_shell=${CONFIG_SHELL-/bin/sh}
+ml_arguments="${ac_configure_args}"
+ml_realsrcdir=${srcdir}
 
 # Scan all the arguments and set all the ones we need.