X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_pthread_timedjoin_np.m4;h=39de8fa8f041b66082fcfa3b85c7618402d5def1;hb=dc1e22ba362663bf052e7cfbbdf933bb462a7006;hp=a0e6c253c168df75ab9322c2837d2e8a870105d7;hpb=f3b89b9159152927ca1c547ef30c892bfba05e19;p=awesomized%2Flibmemcached

diff --git a/m4/ax_pthread_timedjoin_np.m4 b/m4/ax_pthread_timedjoin_np.m4
index a0e6c253..39de8fa8 100644
--- a/m4/ax_pthread_timedjoin_np.m4
+++ b/m4/ax_pthread_timedjoin_np.m4
@@ -4,7 +4,7 @@
 #
 # SYNOPSIS
 #
-#   AX_PTHREAD_TIMEDJOIN_NP
+#   AX_PTHREAD_TIMEDJOIN_NP()
 #
 # DESCRIPTION
 #
@@ -19,37 +19,32 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 3
+#serial 6
 
-AC_DEFUN([AX_PTHREAD_TIMEDJOIN_NP], [
-         AC_REQUIRE([AX_PTHREAD])
-         AC_CACHE_CHECK([check for pthread_timedjoin_np], [ax_cv_pthread_timedjoin_np], [
-                        save_LDFLAGS="$LDFLAGS"
-                        LDFLAGS="$PTHREAD_LIBS"
-                        AC_LANG_PUSH([C])
-                        AC_LINK_IFELSE([
-                                       AC_LANG_PROGRAM([
-#ifndef _GNU_SOURCE 
-#define _GNU_SOURCE 
-#endif
-
-#include <stdlib.h> 
+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_LINK_IFELSE(
+        [AC_LANG_PROGRAM(
+          [
 #include <pthread.h>
-                                                       ], [
-                                                       pthread_t thread;
-                                                       pthread_timedjoin_np(thread, NULL);
-                                                       ])],
-                                       [ax_cv_pthread_timedjoin_np=yes],
-                                       [])
-
-                        AC_LANG_POP
-                        LDFLAGS="$save_LDFLAGS"
-
-         ])
+#include <stdlib.h>
+          ],[
+          pthread_t thread;
+          pthread_timedjoin_np(thread, NULL, NULL);
+          ])],
+        [ax_cv_pthread_timedjoin_np=yes],[])
 
-         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.])
-               ])
-         ])
+      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.])])
+    ])