Don't bother running 'rpm -qa' to see whether querying packages works, as

it's quicker just to query for specific packages.

diff --git a/m4/as-linux.m4 b/m4/as-linux.m4
index de6e09864ac0a8b137bb919dd8c2e298a8f15aff..7da43d88b48333803c851ddede2db72be586130d 100644 (file)
--- a/m4/as-linux.m4
+++ b/m4/as-linux.m4
@@ -212,21 +212,11 @@ AC_DEFUN([AS_LINUX_RPM_TARGET],
                dnl we want to build for using rpm
                AC_PATH_PROG(RPM, rpm, yes, no)
                if test "x$RPM" != "xno" ; then
-                       AC_MSG_CHECKING([if rpm can be used to query packages])
-                       if rpm -qa >/dev/null 2>/dev/null ; then
-                         rpm_check=yes
+                       if rpm -q kernel-$RELEASE > /dev/null
+                       then
+                         LINUX_RPM_TARGET=`rpm -q --queryformat %{arch} kernel-$RELEASE`
                        else
-                         rpm_check=no
-                       fi
-                       AC_MSG_RESULT($rpm_check)
-
-                       if test "x$rpm_check" = yes ; then
-                         if rpm -q kernel-$RELEASE > /dev/null
-                         then
-                           LINUX_RPM_TARGET=`rpm -q --queryformat %{arch} kernel-$RELEASE`
-                         else
-                           AC_MSG_NOTICE([Cannot guess target arch, consider setting it using --with-rpm-target])
-                         fi
+                         AC_MSG_NOTICE([Cannot guess target arch, consider setting it using --with-rpm-target])
                        fi
                fi
        fi