diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-01 14:06:38 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-08-01 14:06:38 +0000 |
| commit | ad3e2295aeee5577f296042ace7c2a768f6de8e0 (patch) | |
| tree | effb41fe1613a10843995ddf92a12facf004da58 /libstdc++-v3/acinclude.m4 | |
| parent | a16de24a42d755d12aca8d722553fc2cc6ee8cc1 (diff) | |
| download | gcc-ad3e2295aeee5577f296042ace7c2a768f6de8e0.tar.gz | |
2008-08-01 Paolo Bonzini <bonzini@gnu.org>
Chris Fairles <chris.fairles@gmail.com>
* acinclude.m4 ([GLIBCXX_CHECK_CLOCK_GETTIME]): Reinstate clock_gettime
search, but only in libposix4, never link librt.
* src/Makefile.am: Reinstate previous change to add GLIBCXX_LIBS.
* configure: Regenerate.
* configure.in: Likewise.
* Makefile.in: Likewise.
* src/Makefile.in: Likewise.
* libsup++/Makefile.in: Likewise.
* po/Makefile.in: Likewise.
* doc/Makefile.in: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@138519 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index e998471c446..0a669c9a7fa 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1018,7 +1018,15 @@ AC_DEFUN([GLIBCXX_CHECK_CLOCK_GETTIME], [ AC_LANG_CPLUSPLUS ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fno-exceptions" - + ac_save_LIBS="$LIBS" + + AC_SEARCH_LIBS(clock_gettime, [posix4]) + + # Link to -lposix4. + case "$ac_cv_search_clock_gettime" in + -lposix4*) GLIBCXX_LIBS=$ac_cv_search_clock_gettime + esac + AC_CHECK_HEADERS(unistd.h, ac_has_unistd_h=yes, ac_has_unistd_h=no) ac_has_clock_monotonic=no; @@ -1055,13 +1063,16 @@ AC_DEFUN([GLIBCXX_CHECK_CLOCK_GETTIME], [ AC_DEFINE(_GLIBCXX_USE_CLOCK_MONOTONIC, 1, [ Defined if clock_gettime has monotonic clock support. ]) fi - + if test x"$ac_has_clock_realtime" = x"yes"; then AC_DEFINE(_GLIBCXX_USE_CLOCK_REALTIME, 1, [ Defined if clock_gettime has realtime clock support. ]) fi - + + AC_SUBST(GLIBCXX_LIBS) + CXXFLAGS="$ac_save_CXXFLAGS" + LIBS="$ac_save_LIBS" AC_LANG_RESTORE ]) |