Thu Jul 24 13:04:33 EDT 2008 Pekka Pessi <first.last@nokia.com>

  * su_time0.c, m4/sac-su2.m4: check for CLOCK_MONOTONIC, too

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9270 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index c255c773709fd9d506228fd410569c07e8722e27..d46948d9ca2bdeee31078c0a94c3fdd2b5efde3e 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue Aug 12 13:04:10 EDT 2008
+Tue Aug 12 13:04:33 EDT 2008

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c b/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c
index 5e504e33be1f2293a233b986e1c891c57858da8c..466bb7a4ab256e54dd9c799d80f1d874f86f1f5c 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c
+++ b/libs/sofia-sip/libsofia-sip-ua/su/su_time0.c
@@ -179,7 +179,7 @@ su_nanotime_t su_nanotime(su_nanotime_t *return_time)
  */
 su_nanotime_t su_monotime(su_nanotime_t *return_time)
 {
-#if HAVE_CLOCK_GETTIME
+#if HAVE_CLOCK_GETTIME && CLOCK_MONOTONIC
   {
     struct timespec tv;
   

diff --git a/libs/sofia-sip/m4/sac-su2.m4 b/libs/sofia-sip/m4/sac-su2.m4
index 8927ca142874ccaf2b7653e7335e3ba5e1edb472..5203293d534f212bf3ba6e453abe8b4a55a1d726 100644 (file)
--- a/libs/sofia-sip/m4/sac-su2.m4
+++ b/libs/sofia-sip/m4/sac-su2.m4
@@ -442,6 +442,10 @@ AC_ARG_WITH(rt,
 if test "${with_rt}" != no; then
        AC_SEARCH_LIBS(clock_gettime, rt)
         AC_CHECK_FUNCS([clock_gettime clock_getcpuclockid])
+        AC_CHECK_DECL([CLOCK_MONOTONIC],
+AC_DEFINE([HAVE_CLOCK_MONOTONIC], 1,
+[Define to 1 if you have CLOCK_MONOTONIC]),,[
+#include <time.h>])
 fi
 
 # No GLib path explicitly defined, use pkg-config