[liboobs] HAL support disabled by default
- From: Milan Bouchet-Valat <milanbv src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [liboobs] HAL support disabled by default
- Date: Mon, 8 Feb 2010 23:02:03 +0000 (UTC)
commit 48db8c4105bd4f99d89c3a0301163e398bbd8064
Author: Javier Jardón <jjardon gnome org>
Date: Mon Feb 8 20:57:07 2010 +0100
HAL support disabled by default
The HAL support can be enabled with the --with-hal=yes option
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=609358
configure.in | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 1905bf6..29c8f1e 100644
--- a/configure.in
+++ b/configure.in
@@ -65,8 +65,22 @@ dnl HAL detection
dnl =====================================================
PKG_CHECK_MODULES(HAL, hal >= $HAL_REQUIRED, have_hal=yes, have_hal=no)
-if test "$have_hal" = "yes"; then
- AC_DEFINE(HAVE_HAL, [1], [whether HAL was found])
+AC_ARG_WITH([hal],
+ [AS_HELP_STRING([--with-hal],
+ [Enable HAL support.])],
+ [with_hal="$withval"],[with_hal="no"])
+
+if test x"$have_hal" = x"yes" && test x"$with_hal" = x"yes"; then
+ AC_DEFINE(WITH_HAL,,"Using HAL")
+else
+ if test x"$with_hal" = x"yes"; then
+ AC_MSG_ERROR([HAL Library requirements ($HAL_REQUIRED)
+not met; consider using --with-hal=no option, or adjusting the PKG_CONFIG_PATH
+environment variable if your libraries are in a nonstandard prefix so pkg-config
+can find them.])
+ else
+ AC_MSG_WARN([HAL Library requirements ($HAL_REQUIRED) not met; disabling HAL support.])
+ fi
fi
AC_SUBST(HAL_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]