New upstream version 2.4.0~rc1

1 files changed, 23 insertions, 22 deletions

diff --git a/configure b/configure
index f0976c802..103b9a392 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libvirt 2.3.0.
+# Generated by GNU Autoconf 2.69 for libvirt 2.4.0.
 #
 # Report bugs to <libvir-list@redhat.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libvirt'
 PACKAGE_TARNAME='libvirt'
-PACKAGE_VERSION='2.3.0'
-PACKAGE_STRING='libvirt 2.3.0'
+PACKAGE_VERSION='2.4.0'
+PACKAGE_STRING='libvirt 2.4.0'
 PACKAGE_BUGREPORT='libvir-list@redhat.com'
 PACKAGE_URL='http://libvirt.org'
 
@@ -961,7 +961,7 @@ WITH_BSD_NSS_FALSE
 WITH_BSD_NSS_TRUE
 WITH_NSS_FALSE
 WITH_NSS_TRUE
-plugindir
+ws_plugindir
 WITH_WIRESHARK_DISSECTOR_FALSE
 WITH_WIRESHARK_DISSECTOR_TRUE
 WIRESHARK_DISSECTOR_LIBS
@@ -3097,7 +3097,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libvirt 2.3.0 to adapt to many kinds of systems.
+\`configure' configures libvirt 2.4.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -3167,7 +3167,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libvirt 2.3.0:";;
+     short | recursive ) echo "Configuration of libvirt 2.4.0:";;
    esac
   cat <<\_ACEOF
 
@@ -3505,7 +3505,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libvirt configure 2.3.0
+libvirt configure 2.4.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -4214,7 +4214,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libvirt $as_me 2.3.0, which was
+It was created by libvirt $as_me 2.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -5215,7 +5215,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libvirt'
- VERSION='2.3.0'
+ VERSION='2.4.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -61488,20 +61488,21 @@ fi
 
     if test "x$with_wireshark_dissector" != "xno" ; then
     if test "x$with_ws_plugindir" = "xcheck" ; then
-      plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
-      if test "x$plugindir" = "x" ; then
-                        plugindir="$libdir/wireshark/plugins/$($PKG_CONFIG --modversion wireshark)"
-      else
-        ws_prefix="$($PKG_CONFIG --variable prefix wireshark)"
-        if test "x$ws_prefix" = "x" ; then
-          ws_prefix="/usr";
-        fi
-        plugindir="${prefix}${plugindir#$ws_prefix}"
+      ws_plugindir="$($PKG_CONFIG --variable plugindir wireshark)"
+      ws_prefix="$($PKG_CONFIG --variable prefix wireshark)"
+      ws_modversion="$($PKG_CONFIG --modversion wireshark)"
+      if test "x$ws_plugindir" = "x" ; then
+                        ws_plugindir="$libdir/wireshark/plugins/$ws_modversion"
+        ws_prefix="$prefix"
+      fi
+      if test "x$ws_prefix" = "x" ; then
+                        ws_prefix="/usr"
       fi
+                              ws_plugindir='$(prefix)'"${ws_plugindir#$ws_prefix}"
     elif test "x$with_ws_plugindir" = "xno" || test "x$with_ws_plugindir" = "xyes"; then
       as_fn_error $? "ws-plugindir must be used only with valid path" "$LINENO" 5
     else
-      plugindir=$with_ws_plugindir
+      ws_plugindir=$with_ws_plugindir
     fi
   fi
 
@@ -61660,7 +61661,7 @@ fi
 done
 
     if test -x "$QEMU"; then
-      if `$QEMU -help | grep libvirt` >/dev/null; then
+      if $QEMU -help 2>/dev/null | grep -q libvirt; then
         with_yajl=yes
       else
         qemu_version_sed='s/.*ersion \([0-9.,]*\).*/\1/'
@@ -73032,7 +73033,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libvirt $as_me 2.3.0, which was
+This file was extended by libvirt $as_me 2.4.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -73103,7 +73104,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libvirt config.status 2.3.0
+libvirt config.status 2.4.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"