[libvirt] [PATCH 03/89] configure: move external programs check to its own file

Jiri Denemark jdenemar at redhat.com
Fri Dec 16 21:07:32 UTC 2016


On Fri, Dec 16, 2016 at 10:10:31 +0100, Pavel Hrdina wrote:
> Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
> ---
>  configure.ac                 | 93 ++++---------------------------------------
>  m4/virt-external-programs.m4 | 95 ++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 102 insertions(+), 86 deletions(-)
>  create mode 100644 m4/virt-external-programs.m4
...
> +
> +  AC_DEFINE_UNQUOTED([DMIDECODE],["$DMIDECODE"],

While touching this, please put a space after the comma between the
first and the second argument. Twelve times :-)

> +                     [Location or name of the dmidecode program])
> +  AC_DEFINE_UNQUOTED([DNSMASQ],["$DNSMASQ"],
> +                     [Location or name of the dnsmasq program])
> +  AC_DEFINE_UNQUOTED([RADVD],["$RADVD"],
> +                     [Location or name of the radvd program])
> +  AC_DEFINE_UNQUOTED([TC],["$TC"],
> +                     [Location or name of the tc program (see iproute2)])
> +  AC_DEFINE_UNQUOTED([MMCTL],["$MMCTL"],
> +                     [Location or name of the mm-ctl program])
> +  AC_DEFINE_UNQUOTED([OVSVSCTL],["$OVSVSCTL"],
> +                     [Location or name of the ovs-vsctl program])
> +
> +  if test -n "$UDEVADM"; then
> +    AC_DEFINE_UNQUOTED([UDEVADM],["$UDEVADM"],
> +                       [Location or name of the udevadm program])
> +  fi
> +  if test -n "$UDEVSETTLE"; then
> +    AC_DEFINE_UNQUOTED([UDEVSETTLE],["$UDEVSETTLE"],
> +                       [Location or name of the udevsettle program])
> +  fi
> +  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([SCRUB],["$SCRUB"],
> +                     [Location or name of the scrub program (for wiping algorithms)])
> +  AC_DEFINE_UNQUOTED([ADDR2LINE],["$ADDR2LINE"],
> +                     [Location of addr2line program])
> +
> +  AC_PATH_PROG([IP_PATH], [ip], /sbin/ip, [$LIBVIRT_SBIN_PATH])
> +  AC_DEFINE_UNQUOTED([IP_PATH], "$IP_PATH", [path to ip binary])

Shouldn't we put /sbin/ip and "$IP_PATH" inside [] here and in the three
places below?

> +
> +  AC_PATH_PROG([IPTABLES_PATH], [iptables], /sbin/iptables, [$LIBVIRT_SBIN_PATH])
> +  AC_DEFINE_UNQUOTED([IPTABLES_PATH], "$IPTABLES_PATH", [path to iptables binary])
> +
> +  AC_PATH_PROG([IP6TABLES_PATH], [ip6tables], /sbin/ip6tables, [$LIBVIRT_SBIN_PATH])
> +  AC_DEFINE_UNQUOTED([IP6TABLES_PATH], "$IP6TABLES_PATH", [path to ip6tables binary])
> +
> +  AC_PATH_PROG([EBTABLES_PATH], [ebtables], /sbin/ebtables, [$LIBVIRT_SBIN_PATH])
> +  AC_DEFINE_UNQUOTED([EBTABLES_PATH], "$EBTABLES_PATH", [path to ebtables binary])
> +])

ACK with the suggested changes.

Jirka




More information about the libvir-list mailing list