Simpler fix for the libuuid problem from awhile ago, works with all autoconf versions.

diff --git a/aclocal.m4 b/aclocal.m4
index 155a923db8e7af37275942660daa8fb55108f667..7eb5fbbc9216cade858bf0778f8eee3ef5e645e4 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -186,20 +186,19 @@ AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
 
 AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
   [ AC_CHECK_FUNCS(uuid_compare)
-    if test $ac_cv_func_uuid_compare = no; then
-       AC_CHECK_LIB(uuid, uuid_compare, [libuuid=/usr/lib/libuuid.a], [
-       echo
-       echo 'FATAL ERROR: could not find a valid UUID library.'
-       echo 'Install the Universally Unique Identifiers library package.'
-       exit 1])
+    if test $ac_cv_func_uuid_compare = yes; then
+       libuuid=""
+    else
+       AC_CHECK_LIB(uuid, uuid_compare,, [
+           echo
+           echo 'FATAL ERROR: could not find a valid UUID library.'
+           echo 'Install the Universally Unique Identifiers library package.'
+           exit 1])
+       libuuid="-luuid"
     fi
     AC_SUBST(libuuid)
   ])
 
-AC_DEFUN([AC_PACKAGE_CHECK_LIBUUID],
-  [ test $pkg_platform = freebsd && libuuid=""
-  ])
-
 AC_DEFUN([AC_PACKAGE_NEED_XFS_LIBXFS_H],
   [ AC_CHECK_HEADERS([xfs/libxfs.h])
     if test "$ac_cv_header_xfs_libxfs_h" != "yes"; then

diff --git a/m4/package_uuiddev.m4 b/m4/package_uuiddev.m4
index 1e406772c9e84188c3f1a0080b47b36335044adf..71c9d57bd85192357fb3a9d3dd3298bb6eb53eb1 100644 (file)
--- a/m4/package_uuiddev.m4
+++ b/m4/package_uuiddev.m4
@@ -11,16 +11,15 @@ AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
 
 AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
   [ AC_CHECK_FUNCS(uuid_compare)
-    if test $ac_cv_func_uuid_compare = no; then
-       AC_CHECK_LIB(uuid, uuid_compare, [libuuid=/usr/lib/libuuid.a], [
-       echo
-       echo 'FATAL ERROR: could not find a valid UUID library.'
-       echo 'Install the Universally Unique Identifiers library package.'
-       exit 1])
+    if test $ac_cv_func_uuid_compare = yes; then
+       libuuid=""
+    else
+       AC_CHECK_LIB(uuid, uuid_compare,, [
+           echo
+           echo 'FATAL ERROR: could not find a valid UUID library.'
+           echo 'Install the Universally Unique Identifiers library package.'
+           exit 1])
+       libuuid="-luuid"
     fi
     AC_SUBST(libuuid)
   ])
-
-AC_DEFUN([AC_PACKAGE_CHECK_LIBUUID],
-  [ test $pkg_platform = freebsd && libuuid=""
-  ])