2009-09-07 H.J. Lu <hongjiu.lu@intel.com>

            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	PR libstdc++/41280
	* configure.ac: Run "${multi_basedir}/config-ml.in" to generate
	MULTISUBDIR = in subdirectory Makefiles, with ml_norecursion set.
	* configure: Regenerate.

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index acc7355..bfd0e99 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2009-09-07  H.J. Lu  <hongjiu.lu@intel.com>
+            Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       PR libstdc++/41280
+       * configure.ac: Run "${multi_basedir}/config-ml.in" to generate
+       MULTISUBDIR = in subdirectory Makefiles, with ml_norecursion set.
+       * configure: Regenerate.
+
 2009-09-06  Paolo Carlini  <paolo.carlini@oracle.com>
 
        PR libstdc++/41267

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 2d0c977..122b46a 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -61956,57 +61956,78 @@ fi
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
-   grep '^MULTISUBDIR =' Makefile >> tmp$$
    mv tmp$$ $ac_file
    rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
  ;;
     "libsupc++/Makefile":F) cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
-   grep '^MULTISUBDIR =' Makefile >> tmp$$
    mv tmp$$ $ac_file
    rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
  ;;
     "python/Makefile":F) cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
-   grep '^MULTISUBDIR =' Makefile >> tmp$$
    mv tmp$$ $ac_file
    rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
  ;;
     "src/Makefile":F) cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
-   grep '^MULTISUBDIR =' Makefile >> tmp$$
    mv tmp$$ $ac_file
    rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
  ;;
     "doc/Makefile":F) cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
-   grep '^MULTISUBDIR =' Makefile >> tmp$$
    mv tmp$$ $ac_file
    rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
  ;;
     "po/Makefile":F) cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
-   grep '^MULTISUBDIR =' Makefile >> tmp$$
    mv tmp$$ $ac_file
    rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
  ;;
     "testsuite/Makefile":F) cat > vpsed$$ << \_EOF
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
-   grep '^MULTISUBDIR =' Makefile >> tmp$$
    mv tmp$$ $ac_file
    rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   { ml_norecursion=; unset ml_norecursion;}
  ;;
     "generate-headers":C) (cd include && ${MAKE-make} pch_build= ) ;;
 

diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index e8f6805..e35bc0a 100644 (file)
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -404,9 +404,12 @@ AC_CONFIG_FILES(AC_FOREACH([DIR], glibcxx_SUBDIRS, [DIR/Makefile ]),
 s!`test -f '$<' || echo '$(srcdir)/'`!!
 _EOF
    sed -f vpsed$$ $ac_file > tmp$$
-   grep '^MULTISUBDIR =' Makefile >> tmp$$
    mv tmp$$ $ac_file
    rm vpsed$$
+   echo 'MULTISUBDIR =' >> $ac_file
+   ml_norecursion=yes
+   . ${multi_basedir}/config-ml.in
+   AS_UNSET([ml_norecursion])
 ])
 
 AC_CONFIG_COMMANDS([generate-headers],