r2419 - trunk/varnish-cache

[des at projects.linpro.no]

Author: des
Date: 2008-02-03 23:27:15 +0100 (Sun, 03 Feb 2008)
New Revision: 2419

Modified:
   trunk/varnish-cache/configure.ac
Log:
Clean up checks for non-portable pthread extensions, and add a check for
pthread_mutex_islocked_np() (not present on any platform I know of, but I
am testing a FreeBSD patch)


Modified: trunk/varnish-cache/configure.ac
===================================================================
--- trunk/varnish-cache/configure.ac	2008-02-03 22:26:25 UTC (rev 2418)
+++ trunk/varnish-cache/configure.ac	2008-02-03 22:27:15 UTC (rev 2419)
@@ -52,8 +52,6 @@
 LIBS=""
 AC_SEARCH_LIBS(pthread_create, [thr pthread c_r])
 PTHREAD_LIBS="${LIBS}"
-# Check for thread naming function
-AC_CHECK_FUNCS([pthread_set_name_np])
 LIBS="${save_LIBS}"
 AC_SUBST(PTHREAD_LIBS)
 
@@ -77,11 +75,11 @@
 AC_CHECK_HEADERS([sys/statvfs.h])
 AC_CHECK_HEADERS([sys/vfs.h])
 AC_CHECK_HEADERS([netinet/in.h])
+AC_CHECK_HEADERS([pthread_np.h])
 AC_CHECK_HEADERS([stddef.h])
 AC_CHECK_HEADERS([stdlib.h])
 AC_CHECK_HEADERS([unistd.h])
 AC_CHECK_HEADERS([vis.h])
-AC_CHECK_HEADERS([pthread_np.h])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -103,6 +101,12 @@
 AC_CHECK_FUNCS([fmtcheck])
 AC_CHECK_FUNCS([getdtablesize])
 
+save_LIBS="${LIBS}"
+LIBS="${PTHREAD_LIBS}"
+AC_CHECK_FUNCS([pthread_set_name_np])
+AC_CHECK_FUNCS([pthread_mutex_islocked_np])
+LIBS="${save_LIBS}"
+
 ## This one is tricky, there are multiple versions
 case $host in
 *-*-freebsd*)