Use newer rule for libuuid.

diff --git a/configure.ac b/configure.ac
index d54a7d96b551e8342a67ce007ea3a5fea560fe82..6b95e25eec534c3d9de901d434bff7060c825c62 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,7 @@ AX_CXX_GCC_ABI_DEMANGLE
 AX_CHECK_LIBRARY([LIBUUID], [uuid/uuid.h], [uuid], 
                  [
                   LIBUUID_LDFLAGS="-luuid"
+                  AC_DEFINE([HAVE_LIBUUID], [ 1 ], [Have libuuid])
                   ],
                  [
                   AC_DEFINE([HAVE_LIBUUID], [ 0 ], [Have libuuid])

diff --git a/m4/pandora_have_libuuid.m4 b/m4/pandora_have_libuuid.m4
deleted file mode 100644 (file)
index 0bd28b9..0000000
--- a/m4/pandora_have_libuuid.m4
+++ /dev/null
@@ -1,55 +0,0 @@
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
-dnl This file is free software; Sun Microsystems, Inc.
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-#--------------------------------------------------------------------
-# Check for libuuid
-#--------------------------------------------------------------------
-
-
-AC_DEFUN([_PANDORA_SEARCH_LIBUUID],[
-  AC_REQUIRE([AC_LIB_PREFIX])
-
-  dnl Do this by hand. Need to check for uuid/uuid.h, but uuid may or may
-  dnl not be a lib is weird.
-  AC_CHECK_HEADERS(uuid/uuid.h)
-  AC_LIB_HAVE_LINKFLAGS(uuid,,
-  [
-    #include <uuid/uuid.h>
-  ],
-  [
-    uuid_t uout;
-    uuid_generate(uout);
-  ])
-
-  AM_CONDITIONAL(HAVE_LIBUUID, [test "x${ac_cv_libuuid}" = "xyes"])
-])
-
-AC_DEFUN([_PANDORA_HAVE_LIBUUID],[
-
-  AC_ARG_ENABLE([libuuid],
-    [AS_HELP_STRING([--disable-libuuid],
-      [Build with libuuid support @<:@default=on@:>@])],
-    [ac_enable_libuuid="$enableval"],
-    [ac_enable_libuuid="yes"])
-
-  _PANDORA_SEARCH_LIBUUID
-])
-
-
-AC_DEFUN([PANDORA_HAVE_LIBUUID],[
-  AC_REQUIRE([_PANDORA_HAVE_LIBUUID])
-])
-
-AC_DEFUN([_PANDORA_REQUIRE_LIBUUID],[
-  ac_enable_libuuid="yes"
-  _PANDORA_SEARCH_LIBUUID
-  AS_IF([test "x$ac_cv_header_uuid_uuid_h" = "xno"],[
-    AC_MSG_ERROR([Couldn't find uuid/uuid.h. On Debian this can be found in uuid-dev. On RHEL 4 this can be found in e2fsprogs-devel and Fedora/RHEL 6 in libuuid-devel.])
-  ])
-])
-
-AC_DEFUN([PANDORA_REQUIRE_LIBUUID],[
-  AC_REQUIRE([_PANDORA_REQUIRE_LIBUUID])
-])