diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2008-04-25 18:37:22 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2008-04-25 18:37:22 +0000 |
| commit | e55d0e3595352308d03019c43c052f6e4474e62b (patch) | |
| tree | 55687f11c55f3bb14acecd907f8d8d92389f7781 /libstdc++-v3/acinclude.m4 | |
| parent | d116398717ba3d7a32fb4065c8ee347405380482 (diff) | |
| download | gcc-e55d0e3595352308d03019c43c052f6e4474e62b.zip gcc-e55d0e3595352308d03019c43c052f6e4474e62b.tar.gz gcc-e55d0e3595352308d03019c43c052f6e4474e62b.tar.bz2 | |
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
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 21 |
1 files changed, 13 insertions, 8 deletions
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]) |