From: Martin Willi <martin@revosec.ch>
Date: Thu, 5 Jun 2014 11:08:38 +0000 (+0200)
Subject: windows: Do not check if having clock_gettime()
X-Git-Tag: 5.2.0dr6~13^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd19e27ae3295f224bf568d0b7d625a5c6bae8b8;p=thirdparty%2Fstrongswan.git

windows: Do not check if having clock_gettime()

Windows does not have it, but libwinpthread has. If this library is available
during build, it will be linked, which we prefer to avoid.
---

diff --git a/configure.ac b/configure.ac
index 6ac371973e..9359264de8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -459,12 +459,6 @@ AC_SEARCH_LIBS(socket, socket, [SOCKLIB=$LIBS],
 )
 AC_SUBST(SOCKLIB)
 
-# FreeBSD has clock_gettime in libc, Linux needs librt
-LIBS=""
-AC_SEARCH_LIBS(clock_gettime, rt, [RTLIB=$LIBS])
-AC_CHECK_FUNCS(clock_gettime)
-AC_SUBST(RTLIB)
-
 # Android has pthread_* functions in bionic (libc), others need libpthread
 LIBS=""
 AC_SEARCH_LIBS(pthread_create, pthread, [PTHREADLIB=$LIBS])
@@ -759,6 +753,17 @@ AC_COMPILE_IFELSE(
 	[
 		AC_MSG_RESULT([no])
 		openssl_lib=crypto
+
+		# check for clock_gettime() on non-Windows only. Otherwise this
+		# check might find clock_gettime() in libwinpthread, but we don't want
+		# to link against it.
+		saved_LIBS=$LIBS
+		# FreeBSD has clock_gettime in libc, Linux needs librt
+		LIBS=""
+		AC_SEARCH_LIBS(clock_gettime, rt, [RTLIB=$LIBS])
+		AC_CHECK_FUNCS(clock_gettime)
+		AC_SUBST(RTLIB)
+		LIBS=$saved_LIBS
 	]
 )
 AC_SUBST(OPENSSL_LIB, [-l$openssl_lib])