X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fuuid.m4;h=67d5fa37f6e04c391ebe47c7e650f0e45ad4d0cf;hb=f5b5250c862c98dadbe30cebc1f92962c76125c3;hp=1122bb495998542258c6b4efdda713766a702c02;hpb=f3b89b9159152927ca1c547ef30c892bfba05e19;p=awesomized%2Flibmemcached

diff --git a/m4/uuid.m4 b/m4/uuid.m4
index 1122bb49..67d5fa37 100644
--- a/m4/uuid.m4
+++ b/m4/uuid.m4
@@ -23,66 +23,71 @@
 #serial 3
 
 AC_DEFUN([AX_UUID], [
-         AC_CHECK_HEADER([uuid/uuid.h], [
-                         AC_CACHE_CHECK([check to see if we need -luuid], [ax_cv_libuuid_is_required], [
-                                        save_LDFLAGS="$LDFLAGS"
-                                        LDFLAGS="-luuid"
-                                        AC_LANG_PUSH([C])
-                                        AC_LINK_IFELSE([
-                                                       AC_LANG_PROGRAM([#include <uuid/uuid.h>], [
-                                                                       uuid_t out;
-                                                                       uuid_generate(out);
-                                                                       ])],
-                                                       [ax_cv_libuuid_is_required=yes],
-                                                       [])
-                                        AC_LANG_POP
-                                        LDFLAGS="$save_LDFLAGS"
-                                        ])
-                         AS_IF([test x"ax_cv_libuuid_is_required" = xyes], [
-                               LIBUUID_LDFLAGS="-luuid"
-                               UUID_UUID_H=yes
-                               ],[
-                               AC_CACHE_CHECK([check to see if -luuid is not needed], [ax_cv_libuuid_is_not_required], [
-                                              AC_LANG_PUSH([C])
-                                              AC_COMPILE_IFELSE([
-                                                                AC_LANG_PROGRAM([#include <uuid/uuid.h>], [
-                                                                                uuid_t out;
-                                                                                uuid_generate(out);
-                                                                                ])],
-                                                                [ax_cv_libuuid_is_not_required=yes],
-                                                                [ax_cv_libuuid_is_not_required=no])
-                                              AC_LANG_POP
-                                              ])
-                               AS_IF([test x"ax_cv_libuuid_is_not_required" = xyes], [UUID_UUID_H=yes], [UUID_UUID_H=])
-                               ])
-                         ], [UUID_UUID_H=])
-
-AS_IF([test x"$UUID_UUID_H" = xyes], [
-      AC_DEFINE([HAVE_UUID_UUID_H], [ 1 ], [Have uuid/uuid.h])
-      ],[
-      AC_DEFINE([HAVE_UUID_UUID_H], [ 0 ], [Have uuid/uuid.h])
-      ])
-])
-
-AC_DEFUN([AX_UUID_GENERATE_TIME_SAFE], [
-  AC_REQUIRE([AX_UUID])
-  AC_CACHE_CHECK([for uuid_generate_time_safe], [ax_cv_uuid_generate_time_safe], [
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS=$LIBUUID_LDFLAGS
+    AC_CHECK_HEADER([uuid/uuid.h], [
+      AC_CACHE_CHECK([check to see if -luuid is not needed], [ax_cv_libuuid_is_required], [
         AC_LANG_PUSH([C])
-        AC_LINK_IFELSE([
+        AC_RUN_IFELSE([
+          AC_LANG_PROGRAM([#include <uuid/uuid.h>], [
+            uuid_t out;
+            uuid_generate(out);
+            ])],
+          [ax_cv_libuuid_is_required=no],
+          [ax_cv_libuuid_is_required=maybe],
+	  [AC_MSG_WARN([test program execution failed])])
+        AC_LANG_POP
+        ])
+
+      AS_IF([test "$ax_cv_libuuid_is_required" = maybe], [
+        AC_CACHE_CHECK([check to see if -luuid is needed], [ax_cv_libuuid_works], [
+          save_LIBS="$LIBS"
+          LIBS="-luuid $LIBS"
+          AC_LANG_PUSH([C])
+          AC_RUN_IFELSE([
             AC_LANG_PROGRAM([#include <uuid/uuid.h>], [
-                            uuid_t out;
-                            uuid_generate_time_safe(out);
-                            ])],
-            [ax_cv_uuid_generate_time_safe=yes],
-            [ax_cv_uuid_generate_time_safe=no])
+              uuid_t out;
+              uuid_generate(out);
+              ])],
+            [ax_cv_libuuid_works=yes],
+            [ax_cv_libuuid_works=no],
+	    [AC_MSG_WARN([test program execution failed])])
           AC_LANG_POP
-          LDFLAGS="$save_LDFLAGS"
+          LIBS="$save_LIBS"
           ])
+        AS_IF([test "$ax_cv_libuuid_works" = yes], [
+          AC_SUBST([LIBUUID_LDFLAGS],[-luuid])])
+        ])
+
+      AS_IF([test "$ax_cv_libuuid_is_required" = no], [UUID_UUID_H=yes])
+      AS_IF([test "$ax_cv_libuuid_works" = yes], [UUID_UUID_H=yes])
+      ])
 
-  AS_IF([test "$ax_cv_uuid_generate_time_safe" = yes],[
-    AC_DEFINE(HAVE_UUID_GENERATE_TIME_SAFE,[1],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])],[
-    AC_DEFINE(HAVE_UUID_GENERATE_TIME_SAFE,[0],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])
+  AS_IF([test "$UUID_UUID_H" = yes], [
+      AC_DEFINE([HAVE_UUID_UUID_H], [1], [Have uuid/uuid.h])
+      ],[
+      AC_DEFINE([HAVE_UUID_UUID_H], [0], [Have uuid/uuid.h])
+      ])
   ])
-])
+
+  AC_DEFUN([AX_UUID_GENERATE_TIME_SAFE], [
+      AC_REQUIRE([AX_UUID])
+      AC_CACHE_CHECK([for uuid_generate_time_safe], [ax_cv_uuid_generate_time_safe], [
+        save_LIBS="$LIBS"
+        LIBS="$LIBUUID_LDFLAGS $LIBS"
+        AC_LANG_PUSH([C])
+        AC_RUN_IFELSE([
+          AC_LANG_PROGRAM([#include <uuid/uuid.h>], [
+            uuid_t out;
+            uuid_generate_time_safe(out);
+            ])],
+          [ax_cv_uuid_generate_time_safe=yes],
+          [ax_cv_uuid_generate_time_safe=no],
+	  [AC_MSG_WARN([test program execution failed])])
+        AC_LANG_POP
+        LIBS="$save_LIBS"
+        ])
+
+      AS_IF([test "$ax_cv_uuid_generate_time_safe" = yes],[
+        AC_DEFINE(HAVE_UUID_GENERATE_TIME_SAFE,[1],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])],[
+        AC_DEFINE(HAVE_UUID_GENERATE_TIME_SAFE,[0],[Define if uuid_generate_time_safe is present in uuid/uuid.h.])
+        ])
+      ])