diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2008-04-29 04:40:08 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2008-04-29 04:40:08 +0000 |
| commit | 0aec205c3ba181eb52a98a0e93de628161efea82 (patch) | |
| tree | 73203368afc274c6a3519de1f9c2a9e00c144d58 /libstdc++-v3/acinclude.m4 | |
| parent | 268688b39c1724b6e8dd92c61c4f9b8256c844dc (diff) | |
| download | gcc-0aec205c3ba181eb52a98a0e93de628161efea82.zip gcc-0aec205c3ba181eb52a98a0e93de628161efea82.tar.gz gcc-0aec205c3ba181eb52a98a0e93de628161efea82.tar.bz2 | |
re PR libstdc++/35887 (stl parallel includes installed for --disable-libgomp)
2008-04-28 Benjamin Kosnik <bkoz@redhat.com>
PR libstdc++/35887
* acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): Revert back to just
checking for omp.h.
* configure: Regenerate.
From-SVN: r134776
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 0b76efc..022548b 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1748,19 +1748,12 @@ AC_DEFUN([GLIBCXX_ENABLE_PARALLEL], [ enable_parallel=no; - # 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 - + # See if configured libgomp/omp.h exists. (libgomp may be in + # noconfigdirs but not explicitly disabled.) + if test -f $glibcxx_builddir/../libgomp/omp.h; then + enable_parallel=yes; + else + AC_MSG_NOTICE([$glibcxx_builddir/../libgomp/omp.h not found]) fi AC_MSG_CHECKING([for parallel mode support]) |