[libvirt] [PATCH 1/2] build: properly handle ./configure --with-libpcap

Without this fix, ./configure --with-libpcap will cause --with-libpcap=yes to be implicitly passed down, which cause yes/bin/pcap-config to be searched for rather than /usr/bin/pcap-config. Also output pcap: no when pcap is not found or disabled. --- configure.ac | 30 ++++++++++++++++-------------- 1 files changed, 16 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index d8be160..b5c995f 100644 --- a/configure.ac +++ b/configure.ac @@ -1194,20 +1194,22 @@ LIBPCAP_FOUND="no" AC_ARG_WITH([libpcap], AC_HELP_STRING([--with-libpcap=@<:@PFX@:>@], [libpcap location])) if test "$with_qemu" = "yes"; then - if test "x$with_libpcap" != "xno" ; then - if test "x$with_libpcap" != "x" ; then - LIBPCAP_CONFIG=$with_libpcap/bin/$LIBPCAP_CONFIG - fi - AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED ) - if ! $LIBPCAP_CONFIG --libs > /dev/null 2>&1 ; then - AC_MSG_RESULT(no) - else - LIBPCAP_LIBS="`$LIBPCAP_CONFIG --libs`" - LIBPCAP_CFLAGS="`$LIBPCAP_CONFIG --cflags`" - LIBPCAP_FOUND="yes" - AC_MSG_RESULT(yes) - fi + AS_CASE(["x$with_libpcap"], + [xno], [LIBPCAP_CONFIG=""], + [x|xyes], [LIBPCAP_CONFIG="pcap-config"], + [LIBPCAP_CONFIG="$with_libpcap/bin/pcap-config"] + ) + AS_IF([test "x$LIBPCAP_CONFIG" != "x"], [ + AC_MSG_CHECKING(libpcap $LIBPCAP_CONFIG >= $LIBPCAP_REQUIRED ) + if ! $LIBPCAP_CONFIG --libs > /dev/null 2>&1 ; then + AC_MSG_RESULT(no) + else + LIBPCAP_LIBS="`$LIBPCAP_CONFIG --libs`" + LIBPCAP_CFLAGS="`$LIBPCAP_CONFIG --cflags`" + LIBPCAP_FOUND="yes" + AC_MSG_RESULT(yes) fi + ]) fi if test "x$LIBPCAP_FOUND" = "xyes"; then @@ -2406,7 +2408,7 @@ AC_MSG_NOTICE([ xmlrpc: $XMLRPC_CFLAGS $XMLRPC_LIBS]) else AC_MSG_NOTICE([ xmlrpc: no]) fi -if test "$with_qemu" = "yes" ; then +if test "$with_qemu" = "yes" -a "$LIBPCAP_FOUND" != "no"; then AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) else AC_MSG_NOTICE([ pcap: no]) -- 1.7.3.3