From c4112b799e2b55ec9c6a4f7f118aad98c8b908aa Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Fri, 19 Mar 2004 01:59:30 +0000 Subject: [PATCH] Simpler fix for the libuuid problem from awhile ago, works with all autoconf versions. --- aclocal.m4 | 19 +++++++++---------- m4/package_uuiddev.m4 | 19 +++++++++---------- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 155a923d..7eb5fbbc 100644 --- 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 1e406772..71c9d57b 100644 --- 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="" - ]) -- 2.30.2