2003-01-09 Benjamin Kosnik <bkoz@redhat.com>

	* configure.in: Revert.
	* configure: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@61140 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5945c93..ce4ec87 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * configure.in: Revert.
+       * configure: Regenerate.
+
 2003-01-09  Christian Cornelssen  <ccorn@cs.tu-berlin.de>
 
        * include/Makefile.am (install-data-local): Prepend

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 5794cba..d883bef 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -23929,9 +23929,9 @@ ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "Makefile \
-    include/Makefile src/Makefile \
-    libmath/Makefile libio/Makefile libsupc++/Makefile \
-    po/Makefile testsuite/Makefile mkcheck testsuite_flags config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+include/Makefile src/Makefile \
+libmath/Makefile libio/Makefile libsupc++/Makefile \
+po/Makefile testsuite/Makefile mkcheck testsuite_flags config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -24127,9 +24127,9 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"Makefile \
-    include/Makefile src/Makefile \
-    libmath/Makefile libio/Makefile libsupc++/Makefile \
-    po/Makefile testsuite/Makefile mkcheck testsuite_flags"}
+include/Makefile src/Makefile \
+libmath/Makefile libio/Makefile libsupc++/Makefile \
+po/Makefile testsuite/Makefile mkcheck testsuite_flags"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -24313,20 +24313,17 @@ CXX="${CXX}"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
- if ! test -f stamp-h; then
-   test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-    if test -n "$CONFIG_FILES"; then
-     if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
-      LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-      ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
-      grep '^MULTISUBDIR =' Makefile >> src/Makefile
-      grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
-     fi
-    fi
+test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+ if test -n "$CONFIG_FILES"; then
+   if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
+     LD="${ORIGINAL_LD_FOR_MULTILIBS}"
+     ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+     grep '^MULTISUBDIR =' Makefile >> src/Makefile
+     grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
    fi
-chmod +x mkcheck
-chmod +x testsuite_flags
-
+ fi
+ chmod +x mkcheck
+ chmod +x testsuite_flags
 exit 0
 EOF
 chmod +x $CONFIG_STATUS

diff --git a/libstdc++-v3/configure.in b/libstdc++-v3/configure.in
index 0de1794..6bc8656 100644 (file)
--- a/libstdc++-v3/configure.in
+++ b/libstdc++-v3/configure.in
@@ -471,23 +471,20 @@ AC_SUBST(LIBSUPCXX_PICFLAGS)
 # down from config-ml.in -> top_srcdir/Makefile.am ->
 # top_srcdir/{src,libsupc++}/Makefile.am, manually append it here.
 AC_OUTPUT(Makefile \
-    include/Makefile src/Makefile \
-    libmath/Makefile libio/Makefile libsupc++/Makefile \
-    po/Makefile testsuite/Makefile mkcheck testsuite_flags,
-[ if ! test -f stamp-h; then
-   test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-    if test -n "$CONFIG_FILES"; then
-     if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
-      LD="${ORIGINAL_LD_FOR_MULTILIBS}"
-      ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
-      grep '^MULTISUBDIR =' Makefile >> src/Makefile
-      grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
-     fi
-    fi
+include/Makefile src/Makefile \
+libmath/Makefile libio/Makefile libsupc++/Makefile \
+po/Makefile testsuite/Makefile mkcheck testsuite_flags,
+[test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
+ if test -n "$CONFIG_FILES"; then
+   if test -n "${with_build_subdir}" || test -n "${with_target_subdir}"; then
+     LD="${ORIGINAL_LD_FOR_MULTILIBS}"
+     ac_file=Makefile . ${glibcpp_basedir}/../config-ml.in
+     grep '^MULTISUBDIR =' Makefile >> src/Makefile
+     grep '^MULTISUBDIR =' Makefile >> libsupc++/Makefile
    fi
-chmod +x mkcheck
-chmod +x testsuite_flags
-],
+ fi
+ chmod +x mkcheck
+ chmod +x testsuite_flags],
 srcdir=${srcdir}
 host=${host}
 target=${target}