diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2003-01-10 04:51:48 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2003-01-10 04:51:48 +0000 |
| commit | 38a9323a836051dc33367af0aa2213e913f89651 (patch) | |
| tree | d91ee5430899a9754e0e1ab78064ebaeb414b398 | |
| parent | d12689d20156fae5c35de61ca68bdbf76779101f (diff) | |
| download | gcc-38a9323a836051dc33367af0aa2213e913f89651.zip gcc-38a9323a836051dc33367af0aa2213e913f89651.tar.gz gcc-38a9323a836051dc33367af0aa2213e913f89651.tar.bz2 | |
configure.in: Revert.
2003-01-09 Benjamin Kosnik <bkoz@redhat.com>
* configure.in: Revert.
* configure: Regenerate.
From-SVN: r61140
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 35 | ||||
| -rw-r--r-- | libstdc++-v3/configure.in | 29 |
3 files changed, 34 insertions, 35 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 5945c93..ce4ec87 100644 --- 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 --- 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 --- 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} |