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