Module Name: src
Committed By: pooka
Date: Wed Nov 5 00:50:17 UTC 2014
Modified Files:
src/lib/librumpuser: configure configure.ac rumpuser_config.h.in
Log Message:
actually check for clock_nanosleep()
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/librumpuser/configure \
src/lib/librumpuser/configure.ac src/lib/librumpuser/rumpuser_config.h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/configure
diff -u src/lib/librumpuser/configure:1.1 src/lib/librumpuser/configure:1.2
--- src/lib/librumpuser/configure:1.1 Tue Nov 4 19:05:17 2014
+++ src/lib/librumpuser/configure Wed Nov 5 00:50:17 2014
@@ -3877,6 +3877,13 @@ fi
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_nanosleep in -lrt" >&5
+$as_echo_n "checking for clock_nanosleep in -lrt... " >&6; }
+if ${ac_cv_lib_rt_clock_nanosleep+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lrt $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -3886,26 +3893,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif
-char clock_gettime ();
+char clock_nanosleep ();
int
main ()
{
-return clock_gettime ();
+return clock_nanosleep ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
-
+ ac_cv_lib_rt_clock_nanosleep=yes
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if ${ac_cv_lib_rt_clock_gettime+:} false; then :
- $as_echo_n "(cached) " >&6
+ ac_cv_lib_rt_clock_nanosleep=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_nanosleep" >&5
+$as_echo "$ac_cv_lib_rt_clock_nanosleep" >&6; }
+if test "x$ac_cv_lib_rt_clock_nanosleep" = xyes; then :
+
+$as_echo "#define HAVE_CLOCK_NANOSLEEP 1" >>confdefs.h
+
else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
@@ -3914,39 +3927,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
#ifdef __cplusplus
extern "C"
#endif
-char clock_gettime ();
+char clock_nanosleep ();
int
main ()
{
-return clock_gettime ();
+return clock_nanosleep ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_rt_clock_gettime=yes
-else
- ac_cv_lib_rt_clock_gettime=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBRT 1
-_ACEOF
-
- LIBS="-lrt $LIBS"
-
-fi
+$as_echo "#define HAVE_CLOCK_NANOSLEEP 1" >>confdefs.h
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlinfo in -ldl" >&5
$as_echo_n "checking for dlinfo in -ldl... " >&6; }
if ${ac_cv_lib_dl_dlinfo+:} false; then :
Index: src/lib/librumpuser/configure.ac
diff -u src/lib/librumpuser/configure.ac:1.1 src/lib/librumpuser/configure.ac:1.2
--- src/lib/librumpuser/configure.ac:1.1 Tue Nov 4 19:05:17 2014
+++ src/lib/librumpuser/configure.ac Wed Nov 5 00:50:17 2014
@@ -33,9 +33,10 @@ AC_CHECK_FUNCS([kqueue chflags strsuftol
AC_TRY_LINK_FUNC([clock_nanosleep],,
AC_CHECK_LIB([rt], [clock_nanosleep])
)
-AC_TRY_LINK_FUNC([clock_gettime],,
- AC_CHECK_LIB([rt], [clock_gettime])
-)
+AC_CHECK_LIB([rt], [clock_nanosleep],
+ AC_DEFINE([HAVE_CLOCK_NANOSLEEP], 1, [clock_nanosleep]),
+ AC_TRY_LINK_FUNC([clock_nanosleep],
+ AC_DEFINE([HAVE_CLOCK_NANOSLEEP], 1, [clock_nanosleep])))
AC_CHECK_LIB([dl], [dlinfo],
AC_DEFINE([HAVE_DLINFO], 1, [dlinfo]),
AC_TRY_LINK_FUNC([dlinfo], AC_DEFINE([HAVE_DLINFO], 1, [dlinfo])))
Index: src/lib/librumpuser/rumpuser_config.h.in
diff -u src/lib/librumpuser/rumpuser_config.h.in:1.1 src/lib/librumpuser/rumpuser_config.h.in:1.2
--- src/lib/librumpuser/rumpuser_config.h.in:1.1 Tue Nov 4 19:05:17 2014
+++ src/lib/librumpuser/rumpuser_config.h.in Wed Nov 5 00:50:17 2014
@@ -15,6 +15,9 @@
/* Define to 1 if you have the `clock_gettime' function. */
#undef HAVE_CLOCK_GETTIME
+/* clock_nanosleep */
+#undef HAVE_CLOCK_NANOSLEEP
+
/* dlinfo */
#undef HAVE_DLINFO
