External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert HAVE_HAL to WITH_HAL

Browse Source 
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2012-09-20 15:38:35 +01:00
parent 04ac20df3f
commit 24120066a4
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -2291,11 +2291,11 @@ if test "x$with_hal" = "xyes" || test "x$with_hal" = "xcheck"; then
LIBS="$old_LIBS" LIBS="$old_LIBS"
fi fi
if test "x$with_hal" = "xyes" ; then 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]) [use HAL for host device enumeration])
fi fi
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_CFLAGS])
AC_SUBST([HAL_LIBS]) AC_SUBST([HAL_LIBS])

2
src/Makefile.am
View File

@ -1217,7 +1217,7 @@ libvirt_driver_nodedev_la_CFLAGS = \
libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS) libvirt_driver_nodedev_la_LDFLAGS = $(AM_LDFLAGS)
libvirt_driver_nodedev_la_LIBADD = 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_SOURCES += $(NODE_DEVICE_DRIVER_HAL_SOURCES)
libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS) libvirt_driver_nodedev_la_CFLAGS += $(HAL_CFLAGS)
libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS) libvirt_driver_nodedev_la_LIBADD += $(HAL_LIBS)

6
src/node_device/node_device_driver.c
View File

@ -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 /* 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 * "change" events, so we don't call update driver name unless we're
* using the HAL backend. */ * using the HAL backend. */
@ -681,13 +681,13 @@ out:
} }
int nodedevRegister(void) { 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 */ /* Register only one of these two - they conflict */
if (udevNodeRegister() == -1) if (udevNodeRegister() == -1)
return halNodeRegister(); return halNodeRegister();
return 0; return 0;
#else #else
# ifdef HAVE_HAL # ifdef WITH_HAL
return halNodeRegister(); return halNodeRegister();
# endif # endif
# ifdef WITH_UDEV # ifdef WITH_UDEV

2
src/node_device/node_device_driver.h
View File

@ -39,7 +39,7 @@
# define LINUX_NEW_DEVICE_WAIT_TIME 60 # define LINUX_NEW_DEVICE_WAIT_TIME 60
# ifdef HAVE_HAL # ifdef WITH_HAL
int halNodeRegister(void); int halNodeRegister(void);
# endif # endif
# ifdef WITH_UDEV # ifdef WITH_UDEV