configure: move libparted check to its own file

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

diff --git a/configure.ac b/configure.ac
index 2efda1058055e9c5e87d4917dca81117948f070b..517b51bdc91bbb7bc2244ee79055f50bcb514c68 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,6 @@ then
 fi
 
 dnl Required minimum versions of all libs we depend on
-PARTED_REQUIRED="1.8.0"
 PARALLELS_SDK_REQUIRED="7.0.22"
 dnl Where we look for daemons and admin binaries during configure
 LIBVIRT_SBIN_PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin"
@@ -1376,22 +1375,10 @@ if test "$with_storage_fs" = "yes" ||
   fi
 fi
 
-LIBPARTED_CFLAGS=
-LIBPARTED_LIBS=
+LIBVIRT_CHECK_LIBPARTED
+
 if test "$with_storage_disk" = "yes" ||
    test "$with_storage_disk" = "check"; then
-  AC_PATH_PROG([PARTED], [parted], [], [$LIBVIRT_SBIN_PATH])
-  if test -z "$PARTED" ; then
-    PARTED_FOUND=no
-  else
-    PARTED_FOUND=yes
-  fi
-
-  if test "$PARTED_FOUND" = "yes" && test "x$PKG_CONFIG" != "x" ; then
-    PKG_CHECK_MODULES([LIBPARTED], [libparted >= $PARTED_REQUIRED], [],
-      [PARTED_FOUND=no])
-  fi
-
   if test "$with_storage_disk" = "yes" &&
      test "$PARTED_FOUND" != "yes"; then
     AC_MSG_ERROR([Need parted for disk storage driver])
@@ -1408,13 +1395,9 @@ if test "$with_storage_disk" = "yes" ||
   if test "$with_storage_disk" = "yes"; then
     AC_DEFINE_UNQUOTED([WITH_STORAGE_DISK], 1,
       [whether Disk backend for storage driver is enabled])
-    AC_DEFINE_UNQUOTED([PARTED],["$PARTED"],
-      [Location or name of the parted program])
   fi
 fi
 AM_CONDITIONAL([WITH_STORAGE_DISK], [test "$with_storage_disk" = "yes"])
-AC_SUBST([LIBPARTED_CFLAGS])
-AC_SUBST([LIBPARTED_LIBS])
 
 LIBVIRT_CHECK_DEVMAPPER
 

diff --git a/m4/virt-parted.m4 b/m4/virt-parted.m4
new file mode 100644 (file)
index 0000000..a233ed7
--- /dev/null
+++ b/m4/virt-parted.m4
@@ -0,0 +1,43 @@
+dnl The parted check
+dnl
+dnl Copyright (C) 2016 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_CHECK_LIBPARTED], [
+  PARTED_REQUIRED="1.8.0"
+  LIBPARTED_CFLAGS=
+  LIBPARTED_LIBS=
+
+  AC_PATH_PROG([PARTED], [parted], [], [$LIBVIRT_SBIN_PATH])
+  if test -z "$PARTED" ; then
+    PARTED_FOUND=no
+  else
+    PARTED_FOUND=yes
+  fi
+
+  if test "$PARTED_FOUND" = "yes" && test "x$PKG_CONFIG" != "x" ; then
+    PKG_CHECK_MODULES([LIBPARTED], [libparted >= $PARTED_REQUIRED], [],
+                      [PARTED_FOUND=no])
+  fi
+
+  if test "$PARTED_FOUND" = "yes"; then
+    AC_DEFINE_UNQUOTED([PARTED], ["$PARTED"],
+                       [Location or name of the parted program])
+  fi
+  AC_SUBST([LIBPARTED_CFLAGS])
+  AC_SUBST([LIBPARTED_LIBS])
+])