Don't hardcode librt but detect it at compile time

diff --git a/configure.ac b/configure.ac
index 80a014cbc318119e6452a61bf093e1364700010f..b2cea28e344a65c625f896b0de978257f3514609 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,7 @@ AC_CHECK_HEADERS(
 PDNS_CHECK_READLINE
 PDNS_CHECK_RAGEL
 PDNS_CHECK_LIBSODIUM
+PDNS_CHECK_CLOCK_GETTIME
 
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
@@ -143,7 +144,7 @@ THREADFLAGS=""
 
 case "$host_os" in
 solaris2.10)
-  LIBS="-lposix4 -lpthread -lrt $LIBS"
+  LIBS="-lposix4 -lpthread $RT_LIBS $LIBS"
   CXXFLAGS="-D_REENTRANT $CXXFLAGS"
   have_solaris="yes"
   ;;

diff --git a/m4/pdns_check_clock_gettime.m4 b/m4/pdns_check_clock_gettime.m4
new file mode 100644 (file)
index 0000000..ee1f660
--- /dev/null
+++ b/m4/pdns_check_clock_gettime.m4
@@ -0,0 +1,6 @@
+AC_DEFUN([PDNS_CHECK_CLOCK_GETTIME],[
+  OLD_LIBS="$LIBS"; LIBS=""
+  AC_SEARCH_LIBS([clock_gettime], [rt])
+  AC_SUBST([RT_LIBS],[$LIBS])
+  LIBS="$OLD_LIBS"
+])

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index e5f7fbd49da6ee00898775347d58fa79e782d214..2e7fecda7599652f0d24242b0dec6b3ee84c1251 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -585,7 +585,7 @@ dnsdist_LDFLAGS = \
        $(AM_LDFLAGS) 
 
 dnsdist_LDADD = \
-       $(READLINE_LIBS) -lrt \
+       $(READLINE_LIBS) $(RT_LIBS) \
        $(LUA_LIBS) ${LIBSODIUM_LIBS} $(YAHTTP_LIBS)
 
 nsec3dig_SOURCES = \
@@ -689,7 +689,8 @@ speedtest_SOURCES = \
        statbag.cc \
        unix_utility.cc
 
-speedtest_LDADD = $(POLARSSL_LIBS) -lrt
+speedtest_LDADD = $(POLARSSL_LIBS) \
+       $(RT_LIBS)
 
 dnswasher_SOURCES = \
        dnsparser.hh \

diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index d1fb73a638bcbe47fa0d313dc4ce2b65f48772d6..8e31562fc0106a00c6951e746437d2c7ffe34c34 100644 (file)
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -55,6 +55,6 @@ dnsdist_LDFLAGS = \
        -pthread 
 
 dnsdist_LDADD = \
-       $(READLINE_LIBS) -lrt \
+       $(READLINE_LIBS) $(RT_LIBS) \
        $(LUA_LIBS) $(YAHTTP_LIBS) ${LIBSODIUM_LIBS}
 

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index 305970dc0609dc36f0125c8a2545faf7a7e884df..d795a89c664286b8f8ff61123fe5208f391ba28f 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -8,6 +8,7 @@ AC_PROG_CXX
 PDNS_CHECK_LIBSODIUM
 AC_PROG_LIBTOOL
 PDNS_CHECK_READLINE([mandatory])
+PDNS_CHECK_CLOCK_GETTIME
 BOOST_REQUIRE([1.35])
 BOOST_FOREACH
 AC_SUBST([YAHTTP_CFLAGS], ['-I$(top_srcdir)/ext/yahttp'])

diff --git a/pdns/dnsdistdist/populate b/pdns/dnsdistdist/populate
index a91be12f69c3a7adb5bc9ba1c73bcfd88e49cf36..21d098f4d6972e231e2f1fd849cc1765f109d6b2 100755 (executable)
--- a/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@ -17,6 +17,7 @@ ln -fs ../../../m4/ax_lib_readline.m4 m4/
 ln -fs ../../../m4/boost.m4 m4/
 ln -fs ../../../m4/pdns_with_lua.m4 m4/
 ln -fs ../../../m4/ax_cxx_compile_stdcxx_11.m4 m4/
+ln -fs ../../../m4/pdns_check_clock_gettime.m4 m4/
 
 ln -fs ../README-dnsdist.md README.md
 ln -fs ../dnsdistconf.lua .