X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_pthread_timedjoin_np.m4;h=39de8fa8f041b66082fcfa3b85c7618402d5def1;hb=538ce08e1871cfa9e409455fd82f9f948635c135;hp=833b2846417e5d700fcc52545d63676e039aed83;hpb=535cb0763dff986a148356bf58dd91f15ad8ed39;p=awesomized%2Flibmemcached

diff --git a/m4/ax_pthread_timedjoin_np.m4 b/m4/ax_pthread_timedjoin_np.m4
index 833b2846..39de8fa8 100644
--- a/m4/ax_pthread_timedjoin_np.m4
+++ b/m4/ax_pthread_timedjoin_np.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_LIB_UUID
+#   AX_PTHREAD_TIMEDJOIN_NP()
 #
 # DESCRIPTION
 #
@@ -19,30 +19,32 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 2
+#serial 6
 
-AC_DEFUN([AX_PTHREAD_TIMEDJOIN_NP], [
-    AC_CACHE_CHECK([check for pthread_timedjoin_np], [ax_cv_pthread_timedjoin_np], [
-      save_LDFLAGS="$LDFLAGS"
-      LDFLAGS="$PTHREAD_LIBS"
+AC_DEFUN([AX_PTHREAD_TIMEDJOIN_NP],
+    [AC_PREREQ([2.63])dnl
+    AC_REQUIRE([AX_PTHREAD])
+    AC_CACHE_CHECK([check for pthread_timedjoin_np], [ax_cv_pthread_timedjoin_np],
+      [AX_SAVE_FLAGS
+      CFLAGS="$PTHREAD_CFLAGS"
+      LIBS="$PTHREAD_LIBS"
       AC_LANG_PUSH([C])
-      AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([
-#include <uuid/uuid.h>
-      ], [
-      uuid_t out;
-      pthread_timedjoin_np(out);
-      ]), [ax_cv_pthread_timedjoin_np=yes ], [ax_cv_pthread_timedjoin_np=no ]
-      ])
-
-    AC_LANG_POP
-     LDFLAGS="$save_LDFLAGS"
+      AC_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+          [
+#include <pthread.h>
+#include <stdlib.h>
+          ],[
+          pthread_t thread;
+          pthread_timedjoin_np(thread, NULL, NULL);
+          ])],
+        [ax_cv_pthread_timedjoin_np=yes],[])
 
-    ])
+      AC_LANG_POP
+      AX_RESTORE_FLAGS
+      ])
 
-    AS_IF([test "$ax_cv_pthread_timedjoin_np" = yes],[
-      AC_DEFINE(HAVE_PTHREAD_TIMEDJOIN_NP,[1],[Define if pthread_timedjoin_np is present in pthread.h.])],[
-      AC_DEFINE(HAVE_PTHREAD_TIMEDJOIN_NP,[0],[Define if pthread_timedjoin_np is present in pthread.h.])
+    AS_IF([test "$ax_cv_pthread_timedjoin_np" = yes],
+        [AC_DEFINE(HAVE_PTHREAD_TIMEDJOIN_NP,[1],[Define if pthread_timedjoin_np is present in pthread.h.])],
+        [AC_DEFINE(HAVE_PTHREAD_TIMEDJOIN_NP,[0],[Define if pthread_timedjoin_np is present in pthread.h.])])
     ])
-])
-