head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2013.01.10.23.03.35;	author svnexp;	state dead;
branches;
next	1.1;

1.1
date	2012.09.07.22.10.01;	author flo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/310207
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r310207 | flo | 2013-01-10 22:29:23 +0000 (Thu, 10 Jan 2013) | 9 lines
## SVN ##
## SVN ## - update www/firefox to 18.0
## SVN ## - update www/firefox-esr to 17.0.2
## SVN ## - update www/seamonkey to 2.15 (enigmail to 1.5.0)
## SVN ## - remove QT4 option to avoid confusion (it turned out to be too experimental)
## SVN ##
## SVN ## In collaboration with: Jan Beich <jbeich@@tormail.org>
## SVN ##
## SVN ## Security:	http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@commit 4075972
Author: Mike Hommey <mh+mozilla@@glandium.org>
Date:   Thu Feb 23 11:00:46 2012 +0100

    Bug 728968 - Detect clock_gettime when it's not in -lrt. r=khuey
---
 configure.in | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git configure.in configure.in
index 3ba7e2f..3d0614c 100644
--- configure.in
+++ configure.in
@@@@ -3728,20 +3728,23 @@@@ AC_CHECK_FUNCS(random strerror lchown fchmod snprintf statvfs memmove rint stat6
 AC_CHECK_FUNCS(flockfile getpagesize)
 AC_CHECK_FUNCS(localtime_r strtok_r)
 
-dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt
-_SAVE_LDFLAGS=$LDFLAGS
-LDFLAGS="$LDFLAGS -lrt"
-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt,
-               ac_cv_have_clock_monotonic,
-               [AC_TRY_LINK([#include <time.h>],
-                            [ struct timespec ts;
-                              clock_gettime(CLOCK_MONOTONIC, &ts); ],
-                            ac_cv_have_clock_monotonic=yes,
-                            ac_cv_have_clock_monotonic=no)])
-LDFLAGS=$_SAVE_LDFLAGS
-if test "$ac_cv_have_clock_monotonic" = "yes"; then
+dnl check for clock_gettime(), the CLOCK_MONOTONIC clock
+AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC),
+               ac_cv_clock_monotonic,
+               [for libs in "" -lrt; do
+                    _SAVE_LDFLAGS="$LDFLAGS"
+                    LDFLAGS="$LDFLAGS $libs"
+                    AC_TRY_LINK([#include <time.h>],
+                                 [ struct timespec ts;
+                                   clock_gettime(CLOCK_MONOTONIC, &ts); ],
+                                 ac_cv_clock_monotonic=$libs
+                                 break,
+                                 ac_cv_clock_monotonic=no)
+                    LDFLAGS="$_SAVE_LDFLAGS"
+                done])
+if test "$ac_cv_clock_monotonic" != "no"; then
     HAVE_CLOCK_MONOTONIC=1
-    REALTIME_LIBS=-lrt
+    REALTIME_LIBS=$ac_cv_clock_monotonic
     AC_DEFINE(HAVE_CLOCK_MONOTONIC)
     AC_SUBST(HAVE_CLOCK_MONOTONIC)
     AC_SUBST(REALTIME_LIBS)
@


1.1
log
@SVN rev 303831 on 2012-09-07 22:10:01Z by flo

- Update firefox to 15.0.1
- Sync changes from gecko repository@@r995
 general
 - don't specify prefix for libevent when using pkg-config
 - ia64 and sparc64 use 8k pagesize by default
 - add visibility hack for clang 3.2 with libc++
 - fix build using clang 3.2 (on FreeBSD 10-CURRENT)
 - rename a few more patches to ease tracking of bugzilla bugs
 www/seamonkey
 - unbreak unsetting LDAP and MAILNEWS options after bug 707305
 - use compile time debugging WITH_DEBUG
 security/nss
 - unbreak install WITH_DEBUG
 - unbreak powerpc64
 devel/nspr
 - use absolute paths when specifiying srcdir to make gdb(1) happy

In collaboration with:	andreast, zeising, Jan Beich <jbeich@@tormail.org>
@
text
@@

