From bb7ea3259cfab29e349cfb900848e757746ec56d Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Fri, 9 Jul 2004 04:41:10 +0000 Subject: [PATCH] Fix up configure problems in xfstests and xfsprogs. --- aclocal.m4 | 4 ++-- doc/CHANGES | 2 ++ m4/package_utilies.m4 | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 7d07819ff..c274667b5 100644 --- 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 f29486c49..03736cda2 100644 --- 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 5ddafedcf..c29492d5a 100644 --- 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 -- 2.47.2