isolate librt dependency, minor script correcttion.

Author: x0id

config.h.in

@@ -27,6 +27,9 @@
 /* define if the Boost::Unit_Test_Framework library is available */
 #undef HAVE_BOOST_UNIT_TEST_FRAMEWORK
 
+/* Define to 1 if you have the `clock_gettime' function. */
+#undef HAVE_CLOCK_GETTIME
+
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 

configure.ac

@@ -64,6 +64,14 @@ AC_CONFIG_HEADERS([config.h])
 # Checks for libraries.
 
 AC_CHECK_LIB(pthread, pthread_create)
+
+AC_CHECK_FUNCS(clock_gettime, [], [
+  AC_CHECK_LIB(rt, clock_gettime, [
+    RTLIB="-lrt"
+    AC_SUBST([RTLIB])
+  ])
+])
+
 AX_BOOST_BASE([1.47.0], [], [AC_MSG_ERROR("BOOST library version >= 1.47.0 not found!")])
 AX_BOOST_SYSTEM
 AX_BOOST_ASIO
@@ -75,8 +83,6 @@ LDFLAGS="$LDFLAGS $BOOST_LDFLAGS $BOOST_SYSTEM_LIB"
 AX_BOOST_THREAD
 AX_BOOST_CHRONO
 LDFLAGS=$LDFLAGS_SAVED_1
-# chrono.hpp depends on ::clock_gettime, which is in rt
-BOOST_CHRONO_LIB="$BOOST_CHRONO_LIB -lrt"
 
 AX_BOOST_FILESYSTEM
 AX_BOOST_UNIT_TEST_FRAMEWORK

test.sh.in

@@ -22,4 +22,4 @@ else
 	fi
 fi
 
-LD_LIBRARY_PATH=@BOOST_LIBDIR@ test/test_util $tests $*
+LD_LIBRARY_PATH=@BOOST_LIBDIR@ test/test_utxx $tests $*

test/Makefile.am

@@ -77,7 +77,8 @@ test_utxx_LDADD    	= $(srcdir)/../src/.libs/libutxx.la \
 					$(BOOST_TIMER_LIB) \
 					$(BOOST_CHRONO_LIB) \
 					$(BOOST_FILESYSTEM_LIB) \
-					$(BOOST_UNIT_TEST_FRAMEWORK_LIB)
+					$(BOOST_UNIT_TEST_FRAMEWORK_LIB) \
+					$(RTLIB)
 
 test_utxx_DATA 		= test_config_validator.xml