From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Thu, 7 May 2015 19:52:56 +0000 (+0200)
Subject: Don't hardcode librt but detect it at compile time
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~28^2~54^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcd17c71073981e235c38b1f2a2294ef90d15009;p=thirdparty%2Fpdns.git

Don't hardcode librt but detect it at compile time
---

diff --git a/configure.ac b/configure.ac
index 80a014cbc3..b2cea28e34 100644
--- 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
index 0000000000..ee1f6603c3
--- /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 e5f7fbd49d..2e7fecda75 100644
--- 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 d1fb73a638..8e31562fc0 100644
--- 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 305970dc06..d795a89c66 100644
--- 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 a91be12f69..21d098f4d6 100755
--- 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 .