Fix up configure problems in xfstests and xfsprogs.

diff --git a/aclocal.m4 b/aclocal.m4
index 7d07819fff04d8d002125d29169c5fb539121e3c..c274667b5d479a7e1ed43fb6e2068536dfc81513 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -163,14 +163,14 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     fi
 
     if test -z "$RPM"; then
-        AC_PATH_PROG(RPM, rpm,, /bin:/usr/freeware/bin)
+        AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
     fi
     rpm=$RPM
     AC_SUBST(rpm)
 
     dnl .. and what version is rpm
     rpm_version=0
-    test -x $RPM && rpm_version=`$RPM --version \
+    test -x "$RPM" && rpm_version=`$RPM --version \
                         | awk '{print $NF}' | awk -F. '{V=1; print $V}'`
     AC_SUBST(rpm_version)
     dnl At some point in rpm 4.0, rpm can no longer build rpms, and

diff --git a/doc/CHANGES b/doc/CHANGES
index f29486c49a49ed89aa0b6637906e2e32c2ad089c..03736cda2036d70108eaa1dd3c23cbfce2502750 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,6 +1,8 @@
 xfsprogs-2.6.18 (23 June 2004)
        - Fix libhandle from possibly returning an invalid
          handle length on systems where size_t is 64 bits.
+       - Minor autoconf fixups to get rpm test working on
+         all platforms again.
 
 xfsprogs-2.6.17 (23 June 2004)
        - Fix use of isset macro, getting realtime devices to

diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
index 5ddafedcf9c332ac3c95393db8f8e9d2136b3984..c29492d5a84ee8f1f746e9229d7141efe3095267 100644 (file)
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -104,14 +104,14 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     fi
 
     if test -z "$RPM"; then
-        AC_PATH_PROG(RPM, rpm,, /bin:/usr/freeware/bin)
+        AC_PATH_PROG(RPM, rpm,, /bin:/usr/bin:/usr/freeware/bin)
     fi
     rpm=$RPM
     AC_SUBST(rpm)
 
     dnl .. and what version is rpm
     rpm_version=0
-    test -x $RPM && rpm_version=`$RPM --version \
+    test -x "$RPM" && rpm_version=`$RPM --version \
                         | awk '{print $NF}' | awk -F. '{V=1; print $V}'`
     AC_SUBST(rpm_version)
     dnl At some point in rpm 4.0, rpm can no longer build rpms, and