Convert HAVE_HAL to WITH_HAL

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>

diff --git a/configure.ac b/configure.ac
index b96231c13b0fc35567b58d62d14fb99e77f775e5..efb0849217d9d09d848583389b057ffbca4571bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2291,11 +2291,11 @@ if test "x$with_hal" = "xyes" || test "x$with_hal" = "xcheck"; then
     LIBS="$old_LIBS"
   fi
   if test "x$with_hal" = "xyes" ; then
-    AC_DEFINE_UNQUOTED([HAVE_HAL], 1,
+    AC_DEFINE_UNQUOTED([WITH_HAL], 1,
       [use HAL for host device enumeration])
   fi
 fi
-AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"])
+AM_CONDITIONAL([WITH_HAL], [test "x$with_hal" = "xyes"])
 AC_SUBST([HAL_CFLAGS])
 AC_SUBST([HAL_LIBS])
 

diff --git a/src/Makefile.am b/src/Makefile.am
index e9f3fe3baf021810f4d0d14ad16f5542fe9d881c..c9e87e14b9935fb59cf1a72e673bba860c34ed9a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1217,7 +1217,7 @@ libvirt_driver_nodedev_la_CFLAGS = \
 libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS)
 libvirt_driver_nodedev_la_LIBADD =
 
-if HAVE_HAL
+if WITH_HAL
 libvirt_driver_nodedev_la_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
 libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS)
 libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS)

diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
index 9c305a8c14320c987fc470d8ba61408c0cd205c1..2b460417e1b6b0768562e164f5d55fb4cacec483 100644 (file)
--- a/src/node_device/node_device_driver.c
+++ b/src/node_device/node_device_driver.c
@@ -58,7 +58,7 @@ static int update_caps(virNodeDeviceObjPtr dev)
 }
 
 
-#if defined (__linux__) && defined (HAVE_HAL)
+#if defined (__linux__) && defined (WITH_HAL)
 /* Under libudev changes to the driver name should be picked up as
  * "change" events, so we don't call update driver name unless we're
  * using the HAL backend. */
@@ -681,13 +681,13 @@ out:
 }
 
 int nodedevRegister(void) {
-#if defined(HAVE_HAL) && defined(WITH_UDEV)
+#if defined(WITH_HAL) && defined(WITH_UDEV)
     /* Register only one of these two - they conflict */
     if (udevNodeRegister() == -1)
         return halNodeRegister();
     return 0;
 #else
-# ifdef HAVE_HAL
+# ifdef WITH_HAL
     return halNodeRegister();
 # endif
 # ifdef WITH_UDEV

diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h
index fa7bde1ccf41760aac94120592b5579cdaf93a9c..5520740dcd000230a5195f97575126b1523e8756 100644 (file)
--- a/src/node_device/node_device_driver.h
+++ b/src/node_device/node_device_driver.h
@@ -39,7 +39,7 @@
 
 # define LINUX_NEW_DEVICE_WAIT_TIME 60
 
-# ifdef HAVE_HAL
+# ifdef WITH_HAL
 int halNodeRegister(void);
 # endif
 # ifdef WITH_UDEV