]> sourceware.org Git - libabigail.git/commitdiff
Detect the presence of 'rpm' as it's now needed by abipkgdiff
authorDodji Seketeli <dodji@redhat.com>
Thu, 29 Mar 2018 11:28:29 +0000 (13:28 +0200)
committerDodji Seketeli <dodji@redhat.com>
Thu, 29 Mar 2018 11:35:54 +0000 (13:35 +0200)
If the rpm program is not installed, then we disable tests that
require it.

* configure.ac: Detect that the 'rpm' is present. Otherwise,
disable rpm support.

Signed-off-by: Dodji Seketeli <dodji@redhat.com>
configure.ac

index 4738faaab2878b7f5d673db5fb045a584292a1d0..179174ee39433a9abbe68b28bab2d0ab68528cea 100644 (file)
@@ -214,12 +214,13 @@ dnl Check for the rpm2cpio and cpio programs
 if test x$ENABLE_RPM = xyes -o x$ENABLE_RPM = xauto; then
   AC_CHECK_PROG(HAS_RPM2CPIO, rpm2cpio, yes, no)
   AC_CHECK_PROG(HAS_CPIO, cpio, yes, no)
+  AC_CHECK_PROG(HAS_RPM, rpm, yes, no)
 
-  if test x$HAS_RPM2CPIO = xyes -a x$HAS_CPIO = xyes; then
+  if test x$HAS_RPM2CPIO = xyes -a x$HAS_CPIO = xyes -a x$HAS_RPM = xyes; then
      ENABLE_RPM=yes
   else
     if test x$ENABLE_RPM = xyes; then
-      AC_MSG_ERROR([rpm support in abipkgdiff needs both 'rpm2cpio' and 'cpio' programs to be installed])
+      AC_MSG_ERROR([rpm support in abipkgdiff needs 'rpm2cpio', 'cpio' and 'rpm' programs to be installed])
     fi
     ENABLE_RPM=no
   fi
This page took 0.079024 seconds and 5 git commands to generate.