From e55d0e3595352308d03019c43c052f6e4474e62b Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Fri, 25 Apr 2008 18:37:22 +0000 Subject: re PR libstdc++/35887 (stl parallel includes installed for --disable-libgomp) 2008-04-25 Benjamin Kosnik 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/acinclude.m4 | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'libstdc++-v3/acinclude.m4') diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 90c4e4f..0b76efc 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/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]) -- cgit v1.1