configure: Define program name if not found

AC_CHECK_PROG checks for program in given path. However, if it doesn't
exists, [variable] is set to [value-if-not-found]. We don't want this
to be the empty string in case of 'modprobe' and 'scrub' as we want to
fallback to runtime detection.

diff --git a/configure.ac b/configure.ac
index 4493b94ac87773831eadd5780df2e9b46b0f0544..732f4fe72578d558a0b91b9929de2f182a4d54ba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -211,11 +211,11 @@ AC_PATH_PROG([UDEVADM], [udevadm], [],
        [/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([UDEVSETTLE], [udevsettle], [],
        [/sbin:/usr/sbin:/usr/local/sbin:$PATH])
-AC_PATH_PROG([MODPROBE], [modprobe], [],
+AC_PATH_PROG([MODPROBE], [modprobe], [modprobe],
        [/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 AC_PATH_PROG([OVSVSCTL], [ovs-vsctl], [ovs-vsctl],
        [/sbin:/usr/sbin:/usr/local/sbin:$PATH])
-AC_PATH_PROG([SCRUB], [scrub], [],
+AC_PATH_PROG([SCRUB], [scrub], [scrub],
        [/sbin:/usr/sbin:/usr/local/sbin:$PATH])
 
 AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"],

diff --git a/src/util/pci.c b/src/util/pci.c
index 633dcd89ed500cb5e550e60e5fa5c06ba38043b4..c660e8d9b3b482827893d28df85f8a8ee36bf9f6 100644 (file)
--- a/src/util/pci.c
+++ b/src/util/pci.c
@@ -40,11 +40,6 @@
 #include "virterror_internal.h"
 #include "virfile.h"
 
-/* avoid compilation breakage on some systems */
-#ifndef MODPROBE
-# define MODPROBE "modprobe"
-#endif
-
 #define PCI_SYSFS "/sys/bus/pci/"
 #define PCI_ID_LEN 10   /* "XXXX XXXX" */
 #define PCI_ADDR_LEN 13 /* "XXXX:XX:XX.X" */