seccomp: libseccomp version varying according to arch

Libseccomp dependency was mandating version 2.2.0 on all architectures
and this was causing configure and virt-test to break on non-updates
distros. This patch works-around it and give a more flexible way to
check the version, giving more time for other distros to update
libseccomp version.

Signed-off-by: Eduardo Otubo <[email protected]>
Reported-by: Juan Quintela <[email protected]>
Reviewed-by: Juan Quintela <[email protected]>
Tested-by: Juan Quintela <[email protected]>
Message-id: 1427385385[email protected]
Signed-off-by: Peter Maydell <[email protected]>

diff --git a/configure b/configure
index cbe6495d52811491f3cc75d5a943df2614ea379a..09c922511cd0beeabd8530fd1ed36109336e8111 100755 (executable)
--- a/configure
+++ b/configure
@@ -1848,13 +1848,19 @@ fi
 # libseccomp check
 
 if test "$seccomp" != "no" ; then
-    if $pkg_config --atleast-version=2.2.0 libseccomp; then
+    if $pkg_config --atleast-version=2.2.0 libseccomp ||
+        (test "$cpu" = "i386" || test "$cpu" = "x86_64" &&
+        $pkg_config --atleast-version=2.1.1 libseccomp); then
         libs_softmmu="$libs_softmmu `$pkg_config --libs libseccomp`"
         QEMU_CFLAGS="$QEMU_CFLAGS `$pkg_config --cflags libseccomp`"
        seccomp="yes"
     else
        if test "$seccomp" = "yes"; then
+        if test "$cpu" = "i386" || test "$cpu" = "x86_64"; then
+            feature_not_found "libseccomp" "Install libseccomp devel >= 2.1.1"
+        else
             feature_not_found "libseccomp" "Install libseccomp devel >= 2.2.0"
+        fi
        fi
        seccomp="no"
     fi