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

diff --git a/aclocal.m4 b/aclocal.m4
index 625b2a112aff1c3447338714154a46013d274c25..138dbe628aa1ffa51cfa4f01f567e62efe41c680 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -184,31 +184,19 @@ AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_CHECK_LIBUUID],
+AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
   [ AC_CHECK_FUNCS(uuid_compare)
     if test $ac_cv_func_uuid_compare = yes; then
        libuuid=""
-    elif test "$enable_shared_uuid" = no; then
-       AC_MSG_CHECKING([for libuuid])
-       OLDLIBS="$LIBS"
-       UUIDLIBS="/usr/lib/libuuid.a /usr/lib64/libuuid.a"
-       for uuidlib in $UUIDLIBS; do
-           LIBS="$OLDLIBS $uuidlib"
-           AC_LINK_IFELSE([AC_LANG_PROGRAM(, [ uuid_compare(); ])],
-                          [ libuuid="$uuidlib" ], [ continue ],)
-           AC_MSG_RESULT($libuuid)
-       done
-       if test -z "$libuuid"; then
-           AC_MSG_RESULT(not found)
+    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
-       fi
-       LIBS="$OLDLIBS"
-    else
+           exit 1])
        libuuid="-luuid"
     fi
+    AC_SUBST(libuuid)
   ])
 
 AC_DEFUN([AC_PACKAGE_NEED_PTHREAD_H],

diff --git a/configure.in b/configure.in
index 19f37ad41ed6b133b83a492793eb6a1564f3b344..d12087bd3638c2daa9281d6842658b812efcfa12 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,12 +29,7 @@ AC_PACKAGE_GLOBALS(xfsprogs)
 AC_PACKAGE_UTILITIES(xfsprogs)
 
 AC_PACKAGE_NEED_UUID_H
-AC_ARG_ENABLE(shared-uuid,
-[ --enable-shared-uuid=[yes/no]        Link shared libuuid [default=no].],
-       enable_shared_uuid=yes,
-       enable_shared_uuid=no)
-AC_PACKAGE_CHECK_LIBUUID
-AC_SUBST(libuuid)
+AC_PACKAGE_NEED_UUIDCOMPARE
 
 AC_PACKAGE_NEED_PTHREAD_H
 AC_PACKAGE_NEED_PTHREADMUTEXINIT

diff --git a/debian/changelog b/debian/changelog
index 728499997bac954f49d60ba7667de555158602f9..00fce9dcf650a399c883bab97b344c3f5df11c31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xfsprogs (2.6.6-1) unstable; urgency=low
+xfsprogs (2.6.7-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Nathan Scott <nathans@debian.org>  Wed, 03 Mar 2004 08:14:14 +1100
+ -- Nathan Scott <nathans@debian.org>  Fri, 19 Mar 2004 13:53:16 +1100
 
 xfsprogs (2.6.5-1) unstable; urgency=low
 

diff --git a/debian/rules b/debian/rules
index 023470fb3615eb6f2938299d5ee16e6cf90e09ab..8f539c3ef5d17142dd7cb33d4176555a86598451 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ pkgdi  = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT;
 stdenv = @GZIP=-q; export GZIP;
 
 options = DEBUG=-DNDEBUG; DISTRIBUTION=debian; LOCAL_CONFIGURE_OPTIONS=--enable-readline=yes; export DEBUG DISTRIBUTION LOCAL_CONFIGURE_OPTIONS;
-diopts = $(options) OPTIMIZER=-Os; LOCAL_CONFIGURE_OPTIONS="--enable-shared-uuid=yes --enable-gettext=no"; export OPTIMIZER LOCAL_CONFIGURE_OPTIONS;
+diopts = $(options) OPTIMIZER=-Os; LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no"; export OPTIMIZER LOCAL_CONFIGURE_OPTIONS;
 checkdir = test -f debian/rules
 
 build: built

diff --git a/doc/CHANGES b/doc/CHANGES
index 863efda3a3cda26930fa0433a19fc5c9c776a603..a2fde188f41a7f78c4c7458323ea44e4f1567213 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,17 @@
+xfsprogs-2.6.7 (19 March 2003)
+       - Fix up UUID library checks again, previous fix didn't work
+         for older versions of autconf.
+       - Allow for future extensions to the XFS ondisk structure by
+         reserving an extra 32 bits in the superblock for feature
+         bits (update xfs_db to dump them).
+       - Fix xfs_repair handling of version 2 directories with a
+         hole at the start.
+       - Fix an endian bug in xfs_copy, when operating on allocation
+         groups with multi-level freespace btrees.
+       - Ensure xfs_repair "dangerous" mode does not attempt to set
+         the device blocksize, this generates an error when target
+         filesystem is mounted readonly.
+
 xfsprogs-2.6.6 (03 March 2003)
        - mkfs now opens the devices it's operating on with the
          O_EXCL flag set, which is used by the Linux 2.6 block

diff --git a/m4/package_uuiddev.m4 b/m4/package_uuiddev.m4
index 4a2772f89b6519104c19a357f8000873bd406855..71c9d57bd85192357fb3a9d3dd3298bb6eb53eb1 100644 (file)
--- a/m4/package_uuiddev.m4
+++ b/m4/package_uuiddev.m4
@@ -9,29 +9,17 @@ AC_DEFUN([AC_PACKAGE_NEED_UUID_H],
     fi
   ])
 
-AC_DEFUN([AC_PACKAGE_CHECK_LIBUUID],
+AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE],
   [ AC_CHECK_FUNCS(uuid_compare)
     if test $ac_cv_func_uuid_compare = yes; then
        libuuid=""
-    elif test "$enable_shared_uuid" = no; then
-       AC_MSG_CHECKING([for libuuid])
-       OLDLIBS="$LIBS"
-       UUIDLIBS="/usr/lib/libuuid.a /usr/lib64/libuuid.a"
-       for uuidlib in $UUIDLIBS; do
-           LIBS="$OLDLIBS $uuidlib"
-           AC_LINK_IFELSE([AC_LANG_PROGRAM(, [ uuid_compare(); ])],
-                          [ libuuid="$uuidlib" ], [ continue ],)
-           AC_MSG_RESULT($libuuid)
-       done
-       if test -z "$libuuid"; then
-           AC_MSG_RESULT(not found)
+    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
-       fi
-       LIBS="$OLDLIBS"
-    else
+           exit 1])
        libuuid="-luuid"
     fi
+    AC_SUBST(libuuid)
   ])