* configure.in : Remove --srcdir argument from targargs and buildargs

(it's always overridden in the Makefile anyway).  Rearrange a bit.

diff --git a/ChangeLog b/ChangeLog
index 8983a0e31cc37a8593c92695e65f74a2b84cb2d5..55d388abae79fcba2d1efb26437d6c62c91550f7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,10 @@
 2002-05-13  Nathanael Nerode  <neroden@twcny.rr.com>
 
-       * configure: move some logic to configure.in
-       * configure.in: move some logic from configure
+       * configure.in : Remove --srcdir argument from targargs and buildargs
+       (it's always overridden in the Makefile anyway).  Rearrange a bit.
+
+       * configure: Move some logic to configure.in.
+       * configure.in: Move some logic from configure.
 
 2002-05-07  Jeff Johnston  <jjohnstn@redhat.com>
 

diff --git a/configure.in b/configure.in
index 5b13cd4a9849054a11ae0dd640371f64e99b8a68..67b45c5aad961ea65efb537108e5c4434f963ecc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1401,12 +1401,12 @@ if test "${shared}" = "yes" ; then
   esac
 fi
 
-# Record target_configdirs and the configure arguments for target and
-# build configuration in Makefile.
-target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
-targargs=`echo "${arguments}" | \
+# Base args.  Strip norecursion, cache-file, srcdir, host, build, target.
+# These are the ones we might not want to pass down to subconfigures.
+baseargs=`echo "${arguments}" | \
        sed -e 's/--no[^        ]*//' \
            -e 's/--cache[a-z-]*=[^     ]*//' \
+           -e 's/--sr[a-z-]*=[^        ]*//' \
            -e 's/--ho[a-z-]*=[^        ]*//' \
            -e 's/--bu[a-z-]*=[^        ]*//' \
            -e 's/--ta[a-z-]*=[^        ]*//'`
@@ -1414,7 +1414,12 @@ targargs=`echo "${arguments}" | \
 # For the build-side libraries, we just need to pretend we're native,
 # and not use the same cache file.  Multilibs are neither needed nor
 # desired.
-buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${targargs}"
+buildargs="--cache-file=../config.cache --build=${build_alias} --host=${build_alias} ${baseargs}"
+
+# Record target_configdirs and the configure arguments for target and
+# build configuration in Makefile.
+target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
+targargs=${baseargs}
 
 # Passing a --with-cross-host argument lets the target libraries know
 # whether they are being built with a cross-compiler or being built