Additional uuid changes - last round didnt work with all autoconf versions.

diff --git a/aclocal.m4 b/aclocal.m4
index 5cc135cf7d67def27d3facf4b73e746f7b4042a0..2679de5f1246bff9cd0906a1b2619382d09298bd 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,15 +1,14 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+dnl aclocal.m4 generated automatically by aclocal 1.4-p6
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
 
 # 
 # Generic macro, sets up all of the global packaging variables.
@@ -173,28 +172,33 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     AC_SUBST(rpmbuild)
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_UUID_UUID_H],
-  [ AC_CHECK_HEADERS(uuid/uuid.h,, [
-       AC_CHECK_HEADER(uuid.h,, [
+AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
+  [ AC_CHECK_HEADERS(uuid.h)
+    if test $ac_cv_header_uuid_h = no; then
+       AC_CHECK_HEADERS(uuid/uuid.h,, [
        echo
        echo 'FATAL ERROR: could not find a valid UUID header.'
        echo 'Install the Universally Unique Identifiers development package.'
        exit 1])
-    ])
+    fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE_LIBUUID],
-  [ AC_CHECK_LIB(uuid, uuid_compare,, [
-       AC_CHECK_FUNCS(uuid_compare,, [
+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])
-    ])
-    libuuid="/usr/lib/libuuid.a"
+    fi
     AC_SUBST(libuuid)
   ])
 
+AC_DEFUN([AC_PACKAGE_CHECK_LIBUUID],
+  [ test $pkg_platform = freebsd && libuuid=""
+  ])
+
 # 
 # Check if we have a type for the pointer's size integer (__psint_t)
 # 

diff --git a/configure.in b/configure.in
index 226714002ce8583d7e03ddae9e77ea7b2ed1ec42..b091a4796180abb7a964b5b885516f8d209f0271 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,13 +28,14 @@ AC_SUBST(enable_editline)
 AC_PACKAGE_GLOBALS(xfsprogs)
 AC_PACKAGE_UTILITIES(xfsprogs)
 
-AC_PACKAGE_NEED_UUID_UUID_H
-AC_PACKAGE_NEED_UUIDCOMPARE_LIBUUID
+AC_PACKAGE_NEED_UUID_H
+AC_PACKAGE_NEED_UUIDCOMPARE
 AC_ARG_ENABLE(shared-uuid,
 [ --enable-shared-uuid=[yes/no]        Link shared libuuid [default=no].],
        libuuid="/usr/lib/libuuid.a"
        test "$enable_shared_uuid" = yes && libuuid="-luuid",
        libuuid="/usr/lib/libuuid.a")
+AC_PACKAGE_CHECK_LIBUUID
 AC_SUBST(libuuid)
 
 AC_TYPE_PSINT

diff --git a/include/builddefs.in b/include/builddefs.in
index 17e9db49a08b400d2bdd707df0535e883b8e2a0e..b6ed182ce5bb0204fa48735cdc6d3bb5f5c2102b 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -107,7 +107,6 @@ endif
 ifeq ($(PKG_PLATFORM),freebsd)
 PLDLIBS = -L/usr/local/lib -lintl
 PCFLAGS = -I/usr/local/include
-LIBUUID =
 endif
 
 GCFLAGS += -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall -I$(TOPDIR)/include \

diff --git a/m4/package_uuiddev.m4 b/m4/package_uuiddev.m4
index ef33dc7ca37ef31d2c491784adbf4a83bddfd2f1..1e406772c9e84188c3f1a0080b47b36335044adf 100644 (file)
--- a/m4/package_uuiddev.m4
+++ b/m4/package_uuiddev.m4
@@ -1,21 +1,26 @@
-AC_DEFUN([AC_PACKAGE_NEED_UUID_UUID_H],
-  [ AC_CHECK_HEADERS(uuid/uuid.h,, [
-       AC_CHECK_HEADER(uuid.h,, [
+AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
+  [ AC_CHECK_HEADERS(uuid.h)
+    if test $ac_cv_header_uuid_h = no; then
+       AC_CHECK_HEADERS(uuid/uuid.h,, [
        echo
        echo 'FATAL ERROR: could not find a valid UUID header.'
        echo 'Install the Universally Unique Identifiers development package.'
        exit 1])
-    ])
+    fi
   ])
 
-AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE_LIBUUID],
-  [ AC_CHECK_LIB(uuid, uuid_compare,, [
-       AC_CHECK_FUNCS(uuid_compare,, [
+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])
-    ])
-    libuuid="/usr/lib/libuuid.a"
+    fi
     AC_SUBST(libuuid)
   ])
+
+AC_DEFUN([AC_PACKAGE_CHECK_LIBUUID],
+  [ test $pkg_platform = freebsd && libuuid=""
+  ])