summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2008-08-13 00:39:33 +0200
committerMarcel Holtmann <marcel@holtmann.org>2008-08-13 00:39:33 +0200
commiteff47b478f3af6d4501cafcf716b0895c319c9e5 (patch)
tree2b8aa1ba815b81e0788a32bde36bb042422d551e /configure.ac
parent80de79e829a572a49fabffc08988b835840b4cc6 (diff)
downloadconnman-eff47b478f3af6d4501cafcf716b0895c319c9e5.tar.gz
connman-eff47b478f3af6d4501cafcf716b0895c319c9e5.tar.bz2
connman-eff47b478f3af6d4501cafcf716b0895c319c9e5.zip
Make HAL requirement optional and check for PolicyKit
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 8 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 6508cd44..c9534a24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_PATH_PROG(DHCLIENT, [dhclient])
AC_PATH_PROG(WPASUPPLICANT, [wpa_supplicant])
PKG_CHECK_MODULES(GLIB, glib-2.0, dummy=yes,
- AC_MSG_ERROR(glib is required))
+ AC_MSG_ERROR(glib is required))
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
@@ -69,17 +69,19 @@ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes,
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
-PKG_CHECK_MODULES(HAL, hal >= 0.5.8, dummy=yes,
- AC_MSG_ERROR(libhal is required))
+PKG_CHECK_MODULES(HAL, hal >= 0.5.8, hal_found=yes, hal_found=no)
AC_SUBST(HAL_CFLAGS)
AC_SUBST(HAL_LIBS)
+AM_CONDITIONAL(HAL, test "${hal_found}" = "yes")
-PKG_CHECK_MODULES(SQLITE, sqlite3, dummy=yes,
- AC_MSG_ERROR(sqlite3 is required))
+PKG_CHECK_MODULES(POLKIT, polkit-dbus >= 0.7, polkit_found=yes, polkit_found=no)
+AC_SUBST(POLKIT_CFLAGS)
+AC_SUBST(POLKIT_LIBS)
+
+PKG_CHECK_MODULES(SQLITE, sqlite3, sqlite_found=yes, sqlite_found=no)
AC_SUBST(SQLITE_CFLAGS)
AC_SUBST(SQLITE_LIBS)
AC_OUTPUT(Makefile include/Makefile src/Makefile doc/Makefile
test/Makefile plugins/Makefile scripts/Makefile
scripts/connman src/connman.service connman.pc)
-