acinclude.m4 (GLIBCPP_CHECK_PCH): Only set glibcpp_PCHFLAGS if .gch compilation works.

	* acinclude.m4 (GLIBCPP_CHECK_PCH): Only set glibcpp_PCHFLAGS if
	.gch compilation works.
	* aclocal.m4, configure: Regenerate.
	* testsuite_flags.in (--build-cxx): Use glibcpp_PCHFLAGS to
	initialize PCHFLAGS.

From-SVN: r67515

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8b457cbbde0a65c50938ee9ecbf72ba4f3361c87..a76d385fd6e61506b64fb21e8c55b53bb28843e3 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-05  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * acinclude.m4 (GLIBCPP_CHECK_PCH): Only set glibcpp_PCHFLAGS if
+       .gch compilation works.
+       * aclocal.m4, configure: Regenerate.
+       * testsuite_flags.in (--build-cxx): Use glibcpp_PCHFLAGS to
+       initialize PCHFLAGS.
+
 2003-06-04  Paolo Carlini  <pcarlini@unitus.it>
 
        * include/bits/basic_string.h (_M_fold, insert(iterator, _CharT),

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index ed9eda0024165ccce9736cee7bcc22f393093ff1..b96f517dd7926a69083727441649b30e957807f4 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1464,6 +1464,12 @@ AC_DEFUN(GLIBCPP_CHECK_PCH, [
 
   CXXFLAGS="$ac_save_CXXFLAGS"
   AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "$glibcpp_pch_comp" = yes)
+  if test "$glibcpp_pch_comp" = yes; then
+       glibcpp_PCHFLAGS="-include bits/stdc++.h"
+  else
+       glibcpp_PCHFLAGS=""
+  fi
+  AC_SUBST(glibcpp_PCHFLAGS)
 ])
 
 dnl

diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4
index 975bb1cf2c0c06cdb262d4c709c33fa55eebb4a3..f130d561b25955aa9f5262cfa55f7fc15c3fd27a 100644 (file)
--- a/libstdc++-v3/aclocal.m4
+++ b/libstdc++-v3/aclocal.m4
@@ -1476,6 +1476,12 @@ AC_DEFUN(GLIBCPP_CHECK_PCH, [
 
   CXXFLAGS="$ac_save_CXXFLAGS"
   AM_CONDITIONAL(GLIBCPP_BUILD_PCH, test "$glibcpp_pch_comp" = yes)
+  if test "$glibcpp_pch_comp" = yes; then
+       glibcpp_PCHFLAGS="-include bits/stdc++.h"
+  else
+       glibcpp_PCHFLAGS=""
+  fi
+  AC_SUBST(glibcpp_PCHFLAGS)
 ])
 
 dnl

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index ab52d2d148f47d476f77981da9433980a9770bb9..ac499c5aaf5da3dc03848172385cda6a0b06f644 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -2784,6 +2784,12 @@ else
   GLIBCPP_BUILD_PCH_TRUE='#'
   GLIBCPP_BUILD_PCH_FALSE=
 fi
+  if test "$glibcpp_pch_comp" = yes; then
+       glibcpp_PCHFLAGS="-include bits/stdc++.h"
+  else
+       glibcpp_PCHFLAGS=""
+  fi
+  
 
 
 # Enable all the variable C++ stuff.  C_MBCHAR must come early.

diff --git a/libstdc++-v3/testsuite_flags.in b/libstdc++-v3/testsuite_flags.in
index 568650dc5109dc46d5e24c28ab8b2411cc6a1a0a..4858c2e6606acbe04bf5f7822307a024e6b5dd82 100755 (executable)
--- a/libstdc++-v3/testsuite_flags.in
+++ b/libstdc++-v3/testsuite_flags.in
@@ -43,7 +43,7 @@ case ${query} in
       echo ${CXX}
       ;;
     --build-cxx)
-      PCHFLAGS="-include bits/stdc++.h"
+      PCHFLAGS="@glibcpp_PCHFLAGS@"
       CXX_build="@glibcpp_CXX@ ${PCHFLAGS}"
       CXX=`echo "$CXX_build" | sed 's,gcc/xgcc ,gcc/g++ ,'`
       echo ${CXX}