[libvirt] [PATCH 1/2] Don't make it possible to define HAVE_HAL but not enable it in automake.

With the previous logic, if libhal_get_all_devices function was not found, HAVE_HAL would be defined for the preprocessor but it wouldn't be enabled in automake conditionals, causing the final link to fail with missing references to HAL entries. --- configure.in | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index c86ee97..e2a0b00 100644 --- a/configure.in +++ b/configure.in @@ -1703,9 +1703,6 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then fi ]) if test "x$with_hal" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_HAL], 1, - [use HAL for host device enumeration]) - old_CFLAGS=$CFLAGS old_LDFLAGS=$LDFLAGS CFLAGS="$CFLAGS $HAL_CFLAGS" @@ -1715,6 +1712,10 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then CFLAGS="$old_CFLAGS" LDFLAGS="$old_LDFLAGS" fi + if test "x$with_hal" = "xyes" ; then + AC_DEFINE_UNQUOTED([HAVE_HAL], 1, + [use HAL for host device enumeration]) + fi fi AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"]) AC_SUBST([HAL_CFLAGS]) -- 1.6.6.rc3