Update ddm4

[awesomized/libmemcached] / m4 / ax_uuid.m4

diff --git a/m4/ax_uuid.m4 b/m4/ax_uuid.m4
index a6b5b496ece7f7067f67a7551bb5ee2dc4e8690f..293fdfc58a06c39a5a9f75fa2d8debc9176d7acc 100644 (file)
--- a/m4/ax_uuid.m4
+++ b/m4/ax_uuid.m4
@@ -6,22 +6,23 @@
 # SYNOPSIS
 #
 #   AX_UUID()
+#   AX_UUID_GENERATE_TIME()
 #   AX_UUID_GENERATE_TIME_SAFE()
 #
 # DESCRIPTION
 #
-#   Check for uuid, and uuid_generate_time_safe support.
+#   Check for uuid, uuid_generate_time, and uuid_generate_time_safe support.
 #
 # LICENSE
 #
-#   Copyright (c) 2012 Brian Aker <brian@tangent.org>
+#   Copyright (c) 2012-2013 Brian Aker <brian@tangent.org>
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 5
+#serial 7
 
 AC_DEFUN([AX_UUID],
     [AC_PREREQ([2.63])dnl
@@ -62,23 +63,48 @@ AC_DEFUN([AX_UUID],
           [ax_libuuid=yes])
       ],[ax_libuuid=no])
 
-      AS_IF([test "$ax_libuuid" = yes],
+      AS_IF([test "x$ax_libuuid" = xyes],
           [AC_DEFINE([HAVE_UUID_UUID_H],[1],[Have uuid/uuid.h])
-          AS_IF([test "$ax_cv_libuuid_is_required" = yes],[ LIBUUID_LDFLAGS='-luuid' ])],
+          AS_IF([test "x$ax_cv_libuuid_is_required" = xyes],[ LIBUUID_LIB='-luuid' ])],
           [AC_DEFINE([HAVE_UUID_UUID_H],[0],[Have uuid/uuid.h])
           ])
 
-  AC_SUBST([LIBUUID_LDFLAGS])
-  AM_CONDITIONAL([HAVE_LIBUUID],[test "$ax_libuuid" = yes])
+  AC_SUBST([LIBUUID_LIB])
+  AM_CONDITIONAL([HAVE_LIBUUID],[test "x$ax_libuuid" = xyes])
   ])
 
+  AC_DEFUN([AX_UUID_GENERATE_TIME],
+      [AC_PREREQ([2.63])dnl
+      AC_REQUIRE([AX_UUID])dnl
+      AC_CACHE_CHECK([for uuid_generate_time],
+        [ax_cv_uuid_generate_time],
+        [AX_SAVE_FLAGS
+        LIBS="$LIBUUID_LIB $LIBS"
+        AC_LANG_PUSH([C])
+        AC_RUN_IFELSE([
+          AC_LANG_PROGRAM([#include <uuid/uuid.h>],[
+            uuid_t out;
+            uuid_generate_time(out);
+            ])],
+          [ax_cv_uuid_generate_time=yes],
+          [ax_cv_uuid_generate_time=no],
+          [AC_MSG_WARN([test program execution failed])])
+        AC_LANG_POP
+        AX_RESTORE_FLAGS
+        ])
+
+      AS_IF([test "$ax_cv_uuid_generate_time" = yes],
+        [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[1],[Define if uuid_generate_time is present in uuid/uuid.h.])],
+        [AC_DEFINE([HAVE_UUID_GENERATE_TIME],[0],[Define if uuid_generate_time is present in uuid/uuid.h.])])
+      ])
+
   AC_DEFUN([AX_UUID_GENERATE_TIME_SAFE],
-      [AC_PREREQ([2.68])dnl
+      [AC_PREREQ([2.63])dnl
       AC_REQUIRE([AX_UUID])dnl
       AC_CACHE_CHECK([for uuid_generate_time_safe],
         [ax_cv_uuid_generate_time_safe],
         [AX_SAVE_FLAGS
-        LIBS="$LIBUUID_LDFLAGS $LIBS"
+        LIBS="$LIBUUID_LIB $LIBS"
         AC_LANG_PUSH([C])
         AC_RUN_IFELSE([
           AC_LANG_PROGRAM([#include <uuid/uuid.h>],[