From: "Daniel P. Berrange" <berra...@redhat.com> Signed-off-by: Daniel P. Berrange <berra...@redhat.com> --- configure.ac | 4 ++-- src/Makefile.am | 2 +- src/node_device/node_device_driver.c | 6 +++--- src/node_device/node_device_driver.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/configure.ac b/configure.ac index 3172063..ac38918 100644 --- a/configure.ac +++ b/configure.ac @@ -2205,11 +2205,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 026aaea..bbf9e72 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1149,7 +1149,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 6759815..a3adcad 100644 --- 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 d1dc134..58d9af4 100644 --- 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 -- 1.7.11.4 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list