Check for geoclue or gpsd only if requested

diff --git a/configure.ac b/configure.ac
index 524fcf1b4a0b97abccdd1aafc5206da7ed736dd3..7c7350133622edb7e90a9907fd30a3c2f2bbed45 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -57,6 +57,12 @@ AC_ARG_ENABLE([itbtdbus],AS_HELP_STRING([--enable-itbtdbus],[Use IT D-Bus Blueto
 AC_ARG_ENABLE([btdbus],AS_HELP_STRING([--enable-btdbus],[Use D-Bus bluez interface]),
               [enable_btdbus=$enableval], [enable_btdbus=no])
 
+AC_ARG_ENABLE([gpsd],AS_HELP_STRING([--enable-gpsd],[Use gpsd]),
+              [enable_gpsd=$enableval], [enable_gpsd=no])
+
+AC_ARG_ENABLE([geoclue],AS_HELP_STRING([--enable-geoclue],[Use geoclue]),
+              [enable_geoclue=$enableval], [enable_geoclue=no])
+
 if test "x$enable_770" = "xno" ; then
   WITH_DEVICE_770=no
 else
@@ -185,19 +191,22 @@ fi
 AM_CONDITIONAL(WITH_HILDON, test "x$HAVE_HILDON" = "xyes")
 AM_CONDITIONAL(WITH_OSSO, test "x$HAVE_OSSO" = "xyes")
 
+if test "x$enable_gpsd" = "xyes" ; then
 AC_CHECK_HEADERS([gps.h], [ac_cv_gps_h=yes])
 AC_CHECK_LIB(gps, gps_open,[ac_cv_libgps=yes] )
 if test "x$ac_cv_libgps" = xyes; then
        AC_DEFINE(WITH_LIBGPS, 1, [build with gpsd])
 fi
+fi
 
+if test "x$enable_geoclue" = "xyes" ; then
 PKG_CHECK_MODULES(GEOCLUE, geoclue, HAVE_GEOCLUE=yes, HAVE_GEOCLUE=no)
-
 if test "x$HAVE_GEOCLUE" = "xyes"; then
  AC_DEFINE(WITH_GEOCLUE, 1, [build with Geoclue])
  AC_SUBST(GEOCLUE_CFLAGS)
  AC_SUBST(GEOCLUE_LIBS)
 fi
+fi
 
 PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= 2.8.4.11 gnome-vfs-module-2.0 >= 2.8.4.11)
 AC_SUBST(GNOME_VFS_LIBS)