[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 16/28] Convert HAL check to use LIBVIRT_CHECK_PKG



From: "Daniel P. Berrange" <berrange redhat com>

Signed-off-by: Daniel P. Berrange <berrange redhat com>
---
 configure.ac   | 47 ++---------------------------------------------
 m4/virt-hal.m4 | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 45 deletions(-)
 create mode 100644 m4/virt-hal.m4

diff --git a/configure.ac b/configure.ac
index efb0849..ede25ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,6 @@ GNUTLS_REQUIRED="1.0.25"
 POLKIT_REQUIRED="0.6"
 PARTED_REQUIRED="1.8.0"
 XMLRPC_REQUIRED=1.14.0
-HAL_REQUIRED=0.5.0
 DEVMAPPER_REQUIRED=1.0.0
 LIBCURL_REQUIRED="7.18.0"
 OPENWSMAN_REQUIRED="2.2.3"
@@ -155,6 +154,7 @@ LIBVIRT_CHECK_AUDIT
 LIBVIRT_CHECK_AVAHI
 LIBVIRT_CHECK_CAPNG
 LIBVIRT_CHECK_DBUS
+LIBVIRT_CHECK_HAL
 LIBVIRT_CHECK_NETCF
 LIBVIRT_CHECK_NUMACTL
 LIBVIRT_CHECK_PCIACCESS
@@ -2260,45 +2260,6 @@ test "$enable_shared" = no && lt_cv_objdir=.
 LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.}
 AC_SUBST([LV_LIBTOOL_OBJDIR])
 
-dnl HAL library check for host device enumeration
-HAL_CFLAGS=
-HAL_LIBS=
-AC_ARG_WITH([hal],
-  AC_HELP_STRING([--with-hal], [use HAL for host device enumeration @<:@default=check@:>@]),
-  [],
-  [with_hal=check])
-
-if test "$with_libvirtd" = "no" ; then
-  with_hal=no
-fi
-if test "x$with_hal" = "xyes" || test "x$with_hal" = "xcheck"; then
-  PKG_CHECK_MODULES(HAL, hal >= $HAL_REQUIRED,
-    [with_hal=yes], [
-    if test "x$with_hal" = "xcheck" ; then
-       with_hal=no
-    else
-       AC_MSG_ERROR(
-         [You must install hal-devel >= $HAL_REQUIRED to compile libvirt])
-    fi
-  ])
-  if test "x$with_hal" = "xyes" ; then
-    old_CFLAGS=$CFLAGS
-    old_LIBS=$LIBS
-    CFLAGS="$CFLAGS $HAL_CFLAGS"
-    LIBS="$LIBS $HAL_LIBS"
-    AC_CHECK_FUNCS([libhal_get_all_devices],,[with_hal=no])
-    CFLAGS="$old_CFLAGS"
-    LIBS="$old_LIBS"
-  fi
-  if test "x$with_hal" = "xyes" ; then
-    AC_DEFINE_UNQUOTED([WITH_HAL], 1,
-      [use HAL for host device enumeration])
-  fi
-fi
-AM_CONDITIONAL([WITH_HAL], [test "x$with_hal" = "xyes"])
-AC_SUBST([HAL_CFLAGS])
-AC_SUBST([HAL_LIBS])
-
 
 with_nodedev=no;
 if test "$with_hal" = "yes" || test "$with_udev" = "yes";
@@ -2618,6 +2579,7 @@ LIBVIRT_RESULT_AUDIT
 LIBVIRT_RESULT_AVAHI
 LIBVIRT_RESULT_CAPNG
 LIBVIRT_RESULT_DBUS
+LIBVIRT_RESULT_HAL
 LIBVIRT_RESULT_NETCF
 LIBVIRT_RESULT_NUMACTL
 LIBVIRT_RESULT_PCIACCESS
@@ -2678,11 +2640,6 @@ AC_MSG_NOTICE([xenlight: $LIBXL_CFLAGS $LIBXL_LIBS])
 else
 AC_MSG_NOTICE([xenlight: no])
 fi
-if test "$with_hal" = "yes" ; then
-AC_MSG_NOTICE([     hal: $HAL_CFLAGS $HAL_LIBS])
-else
-AC_MSG_NOTICE([     hal: no])
-fi
 if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then
 AC_MSG_NOTICE([    pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS])
 else
diff --git a/m4/virt-hal.m4 b/m4/virt-hal.m4
new file mode 100644
index 0000000..49a8430
--- /dev/null
+++ b/m4/virt-hal.m4
@@ -0,0 +1,26 @@
+dnl The libhal.so library
+dnl
+dnl Copyright (C) 2012-2013 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_HAL],[
+  LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0])
+])
+
+AC_DEFUN([LIBVIRT_RESULT_HAL],[
+  LIBVIRT_RESULT_LIB([HAL])
+])
-- 
1.7.11.7


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]