提交 3a524a2b 编写于 作者: D Diego Elio Pettenò 提交者: Daniel Veillard

Don't make it possible to define HAVE_HAL but not enable it in automake

* configure.in: 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.
上级 3b734b78
...@@ -1723,9 +1723,6 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then ...@@ -1723,9 +1723,6 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then
fi fi
]) ])
if test "x$with_hal" = "xyes" ; then if test "x$with_hal" = "xyes" ; then
AC_DEFINE_UNQUOTED([HAVE_HAL], 1,
[use HAL for host device enumeration])
old_CFLAGS=$CFLAGS old_CFLAGS=$CFLAGS
old_LDFLAGS=$LDFLAGS old_LDFLAGS=$LDFLAGS
CFLAGS="$CFLAGS $HAL_CFLAGS" CFLAGS="$CFLAGS $HAL_CFLAGS"
...@@ -1735,6 +1732,10 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then ...@@ -1735,6 +1732,10 @@ if test "x$with_hal" = "xyes" -o "x$with_hal" = "xcheck"; then
CFLAGS="$old_CFLAGS" CFLAGS="$old_CFLAGS"
LDFLAGS="$old_LDFLAGS" LDFLAGS="$old_LDFLAGS"
fi fi
if test "x$with_hal" = "xyes" ; then
AC_DEFINE_UNQUOTED([HAVE_HAL], 1,
[use HAL for host device enumeration])
fi
fi fi
AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"]) AM_CONDITIONAL([HAVE_HAL], [test "x$with_hal" = "xyes"])
AC_SUBST([HAL_CFLAGS]) AC_SUBST([HAL_CFLAGS])
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册