re PR libstdc++/35887 (stl parallel includes installed for --disable-libgomp)

2008-04-25  Benjamin Kosnik  <bkoz@redhat.com>

	PR libstdc++/35887
	* acinclude.m4: (GLIBCXX_ENABLE_PARALLEL): Check for thread support.
	* configure.ac: Re-order compiler macros.
	* configure: Regenerated.

From-SVN: r134675

libstdc++-v3/ChangeLog

+2008-04-25  Benjamin Kosnik  <bkoz@redhat.com>
+
+	PR libstdc++/35887
+	* acinclude.m4: (GLIBCXX_ENABLE_PARALLEL): Check for thread support.
+	* configure.ac: Re-order compiler macros.
+	* configure: Regenerated.
+
 2008-04-24  Benjamin Kosnik  <bkoz@redhat.com>
 
-	PR libstdc++/35887 
+	PR libstdc++/35887
 	* configure.ac: Add default argument to GLIBCXX_ENABLE_PARALLEL.
 	Move atomic warnings to GLIBCXX_ENABLE_ATOMIC_BUILTINS.
 	* acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): Check for --disable-libgomp.
@@ -9,7 +16,7 @@
 	* include/Makefile.am (parallel_headers): Make conditional on
 	ENABLE_PARALLEL.
 	* include/Makefile.in: Regenerate.
-	
+
 2008-04-24  Paolo Carlini  <pcarlini@suse.de>
 
 	PR libstdc++/35969
@@ -30,7 +37,7 @@
 	* include/ext/atomicity.h: Use  _GLIBCXX_ATOMIC_BUILTINS_4.
 	* libsupc++/guard.cc: Use  _GLIBCXX_ATOMIC_BUILTINS_4.
 	* doc/xml/manual/concurrency.xm: Update docs.
-	
+
 2008-04-23  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* config/os/hpux/os_defines.h: Use _GLIBCXX_BEGIN_NAMESPACE,

libstdc++-v3/acinclude.m4

@@ -1748,14 +1748,19 @@ AC_DEFUN([GLIBCXX_ENABLE_PARALLEL], [
 
   enable_parallel=no;
 
-  # Check to see if OpenMP is explicitly disabled.
-  AC_MSG_CHECKING([for libgomp support])
-  GLIBCXX_ENABLE(libgomp,$1,,[enable code depending on libgomp],[permit yes|no])
-  AC_MSG_RESULT([$enable_libgomp])
-  if test x$enable_libgomp = xno; then
-    enable_parallel=no
-  else
-    enable_parallel=yes
+  # Check to see if threads are disabled.
+  # Requires GLIBCXX_ENABLE_THREADS.
+  if test x$enable_thread = xyes; then
+
+    # Check to see if OpenMP is disabled.
+    AC_MSG_CHECKING([for libgomp support])
+    GLIBCXX_ENABLE(libgomp,$1,,[enable code depending on libgomp],
+                   [permit yes|no])
+    AC_MSG_RESULT([$enable_libgomp])
+    if test x$enable_libgomp = xyes; then
+      enable_parallel=yes
+    fi
+
   fi
 
   AC_MSG_CHECKING([for parallel mode support])

libstdc++-v3/configure.ac

@@ -95,6 +95,12 @@ GLIBCXX_ENABLE_HOSTED
 # Enable compiler support that doesn't require linking.
 GLIBCXX_ENABLE_SJLJ_EXCEPTIONS
 GLIBCXX_ENABLE_PCH($is_hosted)
+GLIBCXX_ENABLE_ATOMIC_BUILTINS
+GLIBCXX_ENABLE_THREADS
+
+# Checks for compiler support that don't require linking.
+GLIBCXX_CHECK_COMPILER_FEATURES
+GLIBCXX_CHECK_STANDARD_LAYOUT
 
 # Enable all the variable C++ runtime options that doesn't require linking.
 GLIBCXX_ENABLE_CSTDIO
@@ -113,12 +119,7 @@ GLIBCXX_ENABLE_FULLY_DYNAMIC_STRING([no])
 
 # Checks for operating systems support that don't require linking.
 GLIBCXX_CHECK_SYSTEM_ERROR
-GLIBCXX_CHECK_STANDARD_LAYOUT
-GLIBCXX_ENABLE_THREADS
 
-# Checks for compiler support that don't require linking.
-GLIBCXX_ENABLE_ATOMIC_BUILTINS
-GLIBCXX_CHECK_COMPILER_FEATURES
 
 # Only do link tests if native. Else, hardcode.
 if $GLIBCXX_IS_NATIVE; then