configure: Move Virtuozzo checks to a specific module

Eventually, every driver will be moved to a special module.
But for today the winner is Virtuozzo driver.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/configure.ac b/configure.ac
index 6533b88851efd5b1842d2beaaefcc254e6fce33d..71c3bb6f3d280880985d55bfdc3af25293cb123a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -562,10 +562,6 @@ AC_ARG_WITH([hyperv],
   [AS_HELP_STRING([--with-hyperv],
     [add Hyper-V support @<:@default=check@:>@])])
 m4_divert_text([DEFAULTS], [with_hyperv=check])
-AC_ARG_WITH([vz],
-  [AS_HELP_STRING([--with-vz],
-    [add Virtuozzo support @<:@default=check@:>@])])
-m4_divert_text([DEFAULTS], [with_vz=check])
 AC_ARG_WITH([test],
   [AS_HELP_STRING([--with-test],
     [add test driver support @<:@default=yes@:>@])])
@@ -1081,23 +1077,7 @@ dnl
 dnl Checks for the Parallels driver
 dnl
 
-
-if test "$with_vz" = "yes" ||
-   test "$with_vz" = "check"; then
-    PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk],
-                      [PARALLELS_SDK_FOUND=yes], [PARALLELS_SDK_FOUND=no])
-
-    if test "$with_vz" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then
-        AC_MSG_ERROR([Parallels Virtualization SDK is needed to build the Parallels driver.])
-    fi
-
-    with_vz=$PARALLELS_SDK_FOUND
-    if test "$with_vz" = "yes"; then
-        AC_DEFINE_UNQUOTED([WITH_VZ], 1,
-                           [whether vz driver is enabled])
-    fi
-fi
-AM_CONDITIONAL([WITH_VZ], [test "$with_vz" = "yes"])
+LIBVIRT_DRIVER_CHECK_VZ
 
 dnl
 dnl Checks for bhyve driver
@@ -2833,7 +2813,7 @@ AC_MSG_NOTICE([      LXC: $with_lxc])
 AC_MSG_NOTICE([     PHYP: $with_phyp])
 AC_MSG_NOTICE([      ESX: $with_esx])
 AC_MSG_NOTICE([  Hyper-V: $with_hyperv])
-AC_MSG_NOTICE([       vz: $with_vz])
+LIBVIRT_DRIVER_RESULT_VZ
 LIBVIRT_DRIVER_RESULT_BHYVE
 AC_MSG_NOTICE([     Test: $with_test])
 AC_MSG_NOTICE([   Remote: $with_remote])

diff --git a/m4/virt-driver-vz.m4 b/m4/virt-driver-vz.m4
new file mode 100644 (file)
index 0000000..704976e
--- /dev/null
+++ b/m4/virt-driver-vz.m4
@@ -0,0 +1,46 @@
+dnl The Virtuozzo driver
+dnl
+dnl Copyright (C) 2005-2015 Red Hat, Inc.
+dnl
+dnl This library is free software; you can redistribute it and/or
+dnl modify it under the terms of the GNU Lesser General Public
+dnl License as published by the Free Software Foundation; either
+dnl version 2.1 of the License, or (at your option) any later version.
+dnl
+dnl This library is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+dnl Lesser General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public
+dnl License along with this library.  If not, see
+dnl <http://www.gnu.org/licenses/>.
+dnl
+
+AC_DEFUN([LIBVIRT_DRIVER_CHECK_VZ],[
+    AC_ARG_WITH([vz],
+      [AS_HELP_STRING([--with-vz],
+        [add Virtuozzo support @<:@default=check@:>@])])
+    m4_divert_text([DEFAULTS], [with_vz=check])
+
+    if test "$with_vz" = "yes" ||
+       test "$with_vz" = "check"; then
+        PKG_CHECK_MODULES([PARALLELS_SDK], [parallels-sdk],
+                          [PARALLELS_SDK_FOUND=yes], [PARALLELS_SDK_FOUND=no])
+
+        if test "$with_vz" = "yes" && test "$PARALLELS_SDK_FOUND" = "no"; then
+            AC_MSG_ERROR([Parallels Virtualization SDK is needed to build the Virtuozzo driver.])
+        fi
+
+        with_vz=$PARALLELS_SDK_FOUND
+        if test "$with_vz" = "yes"; then
+            AC_DEFINE_UNQUOTED([WITH_VZ], 1,
+                               [whether vz driver is enabled])
+        fi
+    fi
+    AM_CONDITIONAL([WITH_VZ], [test "$with_vz" = "yes"])
+])
+
+AC_DEFUN([LIBVIRT_DRIVER_RESULT_VZ],[
+    AC_MSG_NOTICE([       vz: $with_vz])
+])