From: Christoph Hellwig <hch@sgi.com>
Date: Mon, 18 Apr 2005 19:39:36 +0000 (+0000)
Subject: check whether we actually have an rpm binary before lookin at its version
X-Git-Tag: v2.7.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a903a4ffc07cd8a70781b0e2652cce1faf69a038;p=thirdparty%2Fxfsprogs-dev.git

check whether we actually have an rpm binary before lookin at its version
check whether we actually have an rpm binary before lookin at its version
---

diff --git a/aclocal.m4 b/aclocal.m4
index 45a41d523..104738b53 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
 
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 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,
@@ -170,7 +170,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 
     dnl .. and what version is rpm
     rpm_version=0
-    test -x "$RPM" && rpm_version=`$RPM --version \
+    test -n "$RPM" && 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/m4/package_utilies.m4 b/m4/package_utilies.m4
index efcc0a104..c034a7c6c 100644
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -111,7 +111,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 
     dnl .. and what version is rpm
     rpm_version=0
-    test -x "$RPM" && rpm_version=`$RPM --version \
+    test -n "$RPM" && 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