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