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

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

	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.
	(GLIBCXX_ENABLE_ATOMIC_BUILTINS): Add warning information.
	* configure: Regenerate.
	* include/Makefile.am (parallel_headers): Make conditional on
	ENABLE_PARALLEL.
	* include/Makefile.in: Regenerate.

From-SVN: r134649

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8b16606df6a8ca72b84830fc4dab965e59832558..96672f8b9ce68e1bcd6780ce2442bd8ed09e7652 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2008-04-24  Benjamin Kosnik  <bkoz@redhat.com>
+
+       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.
+       (GLIBCXX_ENABLE_ATOMIC_BUILTINS): Add warning information.
+       * configure: Regenerate.
+       * 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

diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index 696e51e342958e26b012459d80ac741b7be6019c..90c4e4f6d21b016c70af862fb5d0dd9124ca30ca 100644 (file)
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1746,23 +1746,18 @@ dnl  +  Usage:  GLIBCXX_ENABLE_PARALLEL
 dnl
 AC_DEFUN([GLIBCXX_ENABLE_PARALLEL], [
 
-  # NB: libstdc++ may be configured before libgomp: can't check for the actual
-  # dependencies (omp.h and libgomp). 
   enable_parallel=no;
-  if test -f $glibcxx_builddir/../libgomp/omp.h; then
-    enable_parallel=yes;
+
+  # 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
-    AC_MSG_NOTICE([$glibcxx_builddir/../libgomp/omp.h not found])
+    enable_parallel=yes
   fi
 
-  # Check to see if it's explicitly disabled.
-#  GLIBCXX_ENABLE(libgomp,$1,,[enable code depending on libgomp],
-#      [permit yes|no])
-
-#  if test x$enable_libgomp = xno; then
-#    enable_parallel=no
-#  fi
-
   AC_MSG_CHECKING([for parallel mode support])
   AC_MSG_RESULT([$enable_parallel])
   GLIBCXX_CONDITIONAL(ENABLE_PARALLEL, test $enable_parallel = yes)
@@ -2224,6 +2219,14 @@ EOF
   # If still generic, set to mutex.
   if test $atomicity_dir = "cpu/generic" ; then
     atomicity_dir=cpu/generic/atomicity_mutex
+    AC_MSG_WARN([No native atomic operations are provided for this platform.])
+      if test $target_thread_file = single; then
+        AC_MSG_WARN([They cannot be faked when thread support is disabled.])
+        AC_MSG_WARN([Thread-safety of certain classes is not guaranteed.])
+      else
+        AC_MSG_WARN([They will be faked using a mutex.])
+        AC_MSG_WARN([Performance of certain classes will degrade as a result.])
+      fi
   fi
 
 ])

diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 2601fc0841483292729b54e6f8d85c77a20457e4..ca764fc3589cbf6c3d6212309c4c2611a11396c0 100755 (executable)
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -1045,6 +1045,7 @@ Optional Features:
                           [default="-g3 -O0"]
   --enable-libstdcxx-debug
                           build extra debug library [default=no]
+  --enable-libgomp        enable code depending on libgomp [default=yes]
   --enable-cxx-flags=FLAGS
                           pass compiler FLAGS when building library
                           [default=]
@@ -4666,13 +4667,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4669: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4670: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4672: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4673: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4675: output\"" >&5)
+  (eval echo "\"\$as_me:4676: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5716,7 +5717,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5719 "configure"' > conftest.$ac_ext
+  echo '#line 5720 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7178,11 +7179,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7181: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7182: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7185: \$? = $ac_status" >&5
+   echo "$as_me:7186: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7500,11 +7501,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7503: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7504: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7507: \$? = $ac_status" >&5
+   echo "$as_me:7508: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7605,11 +7606,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7608: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7609: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7612: \$? = $ac_status" >&5
+   echo "$as_me:7613: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7660,11 +7661,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7663: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7664: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7667: \$? = $ac_status" >&5
+   echo "$as_me:7668: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10512,7 +10513,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10515 "configure"
+#line 10516 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10612,7 +10613,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10615 "configure"
+#line 10616 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12650,11 +12651,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12653: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12654: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12657: \$? = $ac_status" >&5
+   echo "$as_me:12658: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -12749,11 +12750,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12752: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12753: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12756: \$? = $ac_status" >&5
+   echo "$as_me:12757: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12801,11 +12802,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12804: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12805: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12808: \$? = $ac_status" >&5
+   echo "$as_me:12809: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13850,7 +13851,7 @@ fi;
     #
     # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
     cat > conftest.$ac_ext << EOF
-#line 13853 "configure"
+#line 13854 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
@@ -16906,23 +16907,33 @@ echo "${ECHO_T}$enable_libstdcxx_debug" >&6
 
 
 
-  # NB: libstdc++ may be configured before libgomp: can't check for the actual
-  # dependencies (omp.h and libgomp).
   enable_parallel=no;
-  if test -f $glibcxx_builddir/../libgomp/omp.h; then
-    enable_parallel=yes;
-  else
-    { echo "$as_me:$LINENO: $glibcxx_builddir/../libgomp/omp.h not found" >&5
-echo "$as_me: $glibcxx_builddir/../libgomp/omp.h not found" >&6;}
-  fi
 
-  # Check to see if it's explicitly disabled.
-#  GLIBCXX_ENABLE(libgomp,,,[enable code depending on libgomp],
-#      [permit yes|no])
+  # Check to see if OpenMP is explicitly disabled.
+  echo "$as_me:$LINENO: checking for libgomp support" >&5
+echo $ECHO_N "checking for libgomp support... $ECHO_C" >&6
+   # Check whether --enable-libgomp or --disable-libgomp was given.
+if test "${enable_libgomp+set}" = set; then
+  enableval="$enable_libgomp"
 
-#  if test x$enable_libgomp = xno; then
-#    enable_parallel=no
-#  fi
+      case "$enableval" in
+       yes|no) ;;
+       *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable libgomp" >&5
+echo "$as_me: error: Unknown argument to enable/disable libgomp" >&2;}
+   { (exit 1); exit 1; }; } ;;
+                          esac
+
+else
+  enable_libgomp=yes
+fi;
+
+  echo "$as_me:$LINENO: result: $enable_libgomp" >&5
+echo "${ECHO_T}$enable_libgomp" >&6
+  if test x$enable_libgomp = xno; then
+    enable_parallel=no
+  else
+    enable_parallel=yes
+  fi
 
   echo "$as_me:$LINENO: checking for parallel mode support" >&5
 echo $ECHO_N "checking for parallel mode support... $ECHO_C" >&6
@@ -18043,8 +18054,6 @@ _ACEOF
   fi
 
 
-# No surprises, no surprises...
-
   echo "$as_me:$LINENO: checking for thread model used by GCC" >&5
 echo $ECHO_N "checking for thread model used by GCC... $ECHO_C" >&6
   target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'`
@@ -18071,6 +18080,8 @@ _ACEOF
 
 
 
+# Checks for compiler support that don't require linking.
+
 
 
   ac_ext=cc
@@ -18088,7 +18099,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
   # unnecessary for a builtins test.
 
     cat > conftest.$ac_ext << EOF
-#line 18091 "configure"
+#line 18102 "configure"
 int main()
 {
   // NB: _Atomic_word not necessarily int.
@@ -18128,7 +18139,7 @@ echo "${ECHO_T}$enable_atomic_builtinsi" >&6
     rm -f conftest*
 
     cat > conftest.$ac_ext << EOF
-#line 18131 "configure"
+#line 18142 "configure"
 int main()
 {
   typedef bool atomic_type;
@@ -18182,24 +18193,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
   # If still generic, set to mutex.
   if test $atomicity_dir = "cpu/generic" ; then
     atomicity_dir=cpu/generic/atomicity_mutex
-  fi
-
-
-if test $atomicity_dir = cpu/generic/atomicity_mutex ; then
-  { echo "$as_me:$LINENO: WARNING: No native atomic operations are provided for this platform." >&5
+    { echo "$as_me:$LINENO: WARNING: No native atomic operations are provided for this platform." >&5
 echo "$as_me: WARNING: No native atomic operations are provided for this platform." >&2;}
-  if test $target_thread_file = single; then
-    { echo "$as_me:$LINENO: WARNING: They cannot be faked when thread support is disabled." >&5
+      if test $target_thread_file = single; then
+        { echo "$as_me:$LINENO: WARNING: They cannot be faked when thread support is disabled." >&5
 echo "$as_me: WARNING: They cannot be faked when thread support is disabled." >&2;}
-    { echo "$as_me:$LINENO: WARNING: Thread-safety of certain classes is not guaranteed." >&5
+        { echo "$as_me:$LINENO: WARNING: Thread-safety of certain classes is not guaranteed." >&5
 echo "$as_me: WARNING: Thread-safety of certain classes is not guaranteed." >&2;}
-  else
-    { echo "$as_me:$LINENO: WARNING: They will be faked using a mutex." >&5
+      else
+        { echo "$as_me:$LINENO: WARNING: They will be faked using a mutex." >&5
 echo "$as_me: WARNING: They will be faked using a mutex." >&2;}
-    { echo "$as_me:$LINENO: WARNING: Performance of certain classes will degrade as a result." >&5
+        { echo "$as_me:$LINENO: WARNING: Performance of certain classes will degrade as a result." >&5
 echo "$as_me: WARNING: Performance of certain classes will degrade as a result." >&2;}
+      fi
   fi
-fi
+
 
 
   # All these tests are for C++; save the language and the compiler flags.
@@ -18294,6 +18302,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+# Only do link tests if native. Else, hardcode.
 if $GLIBCXX_IS_NATIVE; then
 
   # We can do more elaborate tests that assume a working linker.

diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac
index 366e443ef7ba6e32f0ec3ab9f3e1d3cbe4126f8b..c3f1756373eb6ba6e5d5c331105c551f34cd1475 100644 (file)
--- a/libstdc++-v3/configure.ac
+++ b/libstdc++-v3/configure.ac
@@ -107,30 +107,20 @@ GLIBCXX_ENABLE_C99([yes])
 GLIBCXX_ENABLE_CONCEPT_CHECKS([no])
 GLIBCXX_ENABLE_DEBUG_FLAGS(["-g3 -O0"])
 GLIBCXX_ENABLE_DEBUG([no])
-GLIBCXX_ENABLE_PARALLEL
+GLIBCXX_ENABLE_PARALLEL([yes])
 GLIBCXX_ENABLE_CXX_FLAGS
 GLIBCXX_ENABLE_FULLY_DYNAMIC_STRING([no])
 
 # Checks for operating systems support that don't require linking.
 GLIBCXX_CHECK_SYSTEM_ERROR
 GLIBCXX_CHECK_STANDARD_LAYOUT
-
-# No surprises, no surprises...
 GLIBCXX_ENABLE_THREADS
-GLIBCXX_ENABLE_ATOMIC_BUILTINS
-if test $atomicity_dir = cpu/generic/atomicity_mutex ; then
-  AC_MSG_WARN([No native atomic operations are provided for this platform.])
-  if test $target_thread_file = single; then
-    AC_MSG_WARN([They cannot be faked when thread support is disabled.])
-    AC_MSG_WARN([Thread-safety of certain classes is not guaranteed.])
-  else
-    AC_MSG_WARN([They will be faked using a mutex.])
-    AC_MSG_WARN([Performance of certain classes will degrade as a result.])
-  fi
-fi
 
+# 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
 
   # We can do more elaborate tests that assume a working linker.

diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index e2b7412f1cd869c2eeb4f59bd11f432bde8cb2a3..22ac39c436b0c14e34ecf6b4ab1bd4274b411326 100644 (file)
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -706,6 +706,7 @@ debug_headers = \
 # Parallel mode headers
 parallel_srcdir = ${glibcxx_srcdir}/include/parallel
 parallel_builddir = ./parallel
+if ENABLE_PARALLEL
 parallel_headers = \
         ${parallel_srcdir}/algorithm \
         ${parallel_srcdir}/algobase.h \
@@ -751,6 +752,9 @@ parallel_headers = \
         ${parallel_srcdir}/types.h \
         ${parallel_srcdir}/unique_copy.h \
         ${parallel_srcdir}/workstealing.h 
+else
+parallel_headers =
+endif
 
 
 # Some of the different "C" header models need extra files.

diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index 092ad96e4fbd0488417ba841e6c76ebca953d631..61fa83ec81228e183fd5414c0f214f73cdbd4252 100644 (file)
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -951,51 +951,52 @@ debug_headers = \
 # Parallel mode headers
 parallel_srcdir = ${glibcxx_srcdir}/include/parallel
 parallel_builddir = ./parallel
-parallel_headers = \
-        ${parallel_srcdir}/algorithm \
-        ${parallel_srcdir}/algobase.h \
-        ${parallel_srcdir}/algo.h \
-        ${parallel_srcdir}/algorithm \
-        ${parallel_srcdir}/algorithmfwd.h \
-        ${parallel_srcdir}/balanced_quicksort.h \
-        ${parallel_srcdir}/base.h \
-        ${parallel_srcdir}/basic_iterator.h \
-        ${parallel_srcdir}/checkers.h \
-        ${parallel_srcdir}/compatibility.h \
-        ${parallel_srcdir}/compiletime_settings.h \
-        ${parallel_srcdir}/equally_split.h \
-        ${parallel_srcdir}/features.h \
-        ${parallel_srcdir}/find.h \
-        ${parallel_srcdir}/find_selectors.h \
-        ${parallel_srcdir}/for_each.h \
-        ${parallel_srcdir}/for_each_selectors.h \
-        ${parallel_srcdir}/iterator.h \
-        ${parallel_srcdir}/list_partition.h \
-        ${parallel_srcdir}/losertree.h \
-        ${parallel_srcdir}/merge.h \
-        ${parallel_srcdir}/multiseq_selection.h \
-        ${parallel_srcdir}/multiway_merge.h \
-        ${parallel_srcdir}/multiway_mergesort.h \
-        ${parallel_srcdir}/numeric \
-        ${parallel_srcdir}/numericfwd.h \
-        ${parallel_srcdir}/omp_loop.h \
-        ${parallel_srcdir}/omp_loop_static.h \
-        ${parallel_srcdir}/parallel.h \
-        ${parallel_srcdir}/par_loop.h \
-        ${parallel_srcdir}/partial_sum.h \
-        ${parallel_srcdir}/partition.h \
-        ${parallel_srcdir}/queue.h \
-        ${parallel_srcdir}/quicksort.h \
-        ${parallel_srcdir}/random_number.h \
-        ${parallel_srcdir}/random_shuffle.h \
-        ${parallel_srcdir}/search.h \
-        ${parallel_srcdir}/set_operations.h \
-        ${parallel_srcdir}/settings.h \
-        ${parallel_srcdir}/sort.h \
-        ${parallel_srcdir}/tags.h \
-        ${parallel_srcdir}/types.h \
-        ${parallel_srcdir}/unique_copy.h \
-        ${parallel_srcdir}/workstealing.h 
+@ENABLE_PARALLEL_FALSE@parallel_headers = 
+@ENABLE_PARALLEL_TRUE@parallel_headers = \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/algorithm \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/algobase.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/algo.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/algorithm \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/algorithmfwd.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/balanced_quicksort.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/base.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/basic_iterator.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/checkers.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/compatibility.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/compiletime_settings.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/equally_split.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/features.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/find.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/find_selectors.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/for_each.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/for_each_selectors.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/iterator.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/list_partition.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/losertree.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/merge.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/multiseq_selection.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/multiway_merge.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/multiway_mergesort.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/numeric \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/numericfwd.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/omp_loop.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/omp_loop_static.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/parallel.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/par_loop.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/partial_sum.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/partition.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/queue.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/quicksort.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/random_number.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/random_shuffle.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/search.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/set_operations.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/settings.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/sort.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/tags.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/types.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/unique_copy.h \
+@ENABLE_PARALLEL_TRUE@        ${parallel_srcdir}/workstealing.h 
 
 @GLIBCXX_C_HEADERS_EXTRA_FALSE@c_base_headers_extra =