c313de
From 899e80657b58f8ef4c0faf452859fd9649d33b79 Mon Sep 17 00:00:00 2001
c313de
Message-Id: <899e80657b58f8ef4c0faf452859fd9649d33b79@dist-git>
c313de
From: Michal Privoznik <mprivozn@redhat.com>
c313de
Date: Thu, 27 Jun 2019 15:55:39 +0200
c313de
Subject: [PATCH] m4: Drop needless string checks
c313de
MIME-Version: 1.0
c313de
Content-Type: text/plain; charset=UTF-8
c313de
Content-Transfer-Encoding: 8bit
c313de
c313de
We provide default values for both MODPROBE and RMMOD and thus
c313de
there is no way that their paths can be empty strings.
c313de
c313de
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
(cherry picked from commit 3c8d5762a9fcf3f7d23a41d0b49def0387ecddf7)
c313de
c313de
https://bugzilla.redhat.com/show_bug.cgi?id=1710575
c313de
c313de
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
c313de
Message-Id: <cb42f6a7b7462140e463a33a7b421ed441617266.1561643698.git.mprivozn@redhat.com>
c313de
Reviewed-by: Ján Tomko <jtomko@redhat.com>
c313de
---
c313de
 m4/virt-external-programs.m4 | 12 ++++--------
c313de
 1 file changed, 4 insertions(+), 8 deletions(-)
c313de
c313de
diff --git a/m4/virt-external-programs.m4 b/m4/virt-external-programs.m4
c313de
index f1ae104b32..0f995998c3 100644
c313de
--- a/m4/virt-external-programs.m4
c313de
+++ b/m4/virt-external-programs.m4
c313de
@@ -67,14 +67,10 @@ AC_DEFUN([LIBVIRT_CHECK_EXTERNAL_PROGRAMS], [
c313de
                      [Location or name of the ovs-vsctl program])
c313de
   AC_DEFINE_UNQUOTED([UDEVADM], ["$UDEVADM"],
c313de
                      [Location or name of the udevadm program])
c313de
-  if test -n "$MODPROBE"; then
c313de
-    AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"],
c313de
-                       [Location or name of the modprobe program])
c313de
-  fi
c313de
-  if test -n "$RMMOD"; then
c313de
-    AC_DEFINE_UNQUOTED([RMMOD], ["$RMMOD"],
c313de
-                       [Location or name of the rmmod program])
c313de
-  fi
c313de
+  AC_DEFINE_UNQUOTED([MODPROBE], ["$MODPROBE"],
c313de
+                     [Location or name of the modprobe program])
c313de
+  AC_DEFINE_UNQUOTED([RMMOD], ["$RMMOD"],
c313de
+                     [Location or name of the rmmod program])
c313de
   AC_DEFINE_UNQUOTED([SCRUB], ["$SCRUB"],
c313de
                      [Location or name of the scrub program (for wiping algorithms)])
c313de
   AC_DEFINE_UNQUOTED([ADDR2LINE], ["$ADDR2LINE"],
c313de
-- 
c313de
2.22.0
c313de