Cleanups

[mapper] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6266d6b15336ad192374089f44fdd3152bf8de70..f6998edd3373a5215145406d7d211ce4cade57b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -69,10 +69,20 @@ if test "x$HAVE_HILDON" = "xyes"; then
  PKG_CHECK_MODULES(HILDON, hildon-libs >= 0.9.50 hildon-fm)
  AC_SUBST(HILDON_LIBS)
  AC_SUBST(HILDON_CFLAGS)
-else
- PKG_CHECK_MODULES(BLUEZ, bluez)
- AC_SUBST(BLUEZ_LIBS)
- AC_SUBST(BLUEZ_CFLAGS)
+fi
+
+PKG_CHECK_MODULES(BLUEZ, bluez)
+AC_SUBST(BLUEZ_LIBS)
+AC_SUBST(BLUEZ_CFLAGS)
+
+PKG_CHECK_MODULES(GEOCLUE, geoclue, HAVE_GEOCLUE=yes, HAVE_GEOCLUE=no)
+
+AM_CONDITIONAL(WITH_HILDON, test "x$HAVE_HILDON" = "xyes")
+
+if test "x$HAVE_GEOCLUE" = "xyes"; then
+ AC_DEFINE(WITH_GEOCLUE, 1, [build with Geoclue])
+ AC_SUBST(GEOCLUE_CFLAGS)
+ AC_SUBST(GEOCLUE_LIBS)
 fi
 
 PKG_CHECK_MODULES(GNOME_VFS, gnome-vfs-2.0 >= 2.8.4.11 gnome-vfs-module-2.0 >= 2.8.4.11)
@@ -99,9 +109,12 @@ PKG_CHECK_MODULES(SQLITE, sqlite3)
 AC_SUBST(SQLITE_LIBS)
 AC_SUBST(SQLITE_CFLAGS)
 
-PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10)
-AC_SUBST(GSTREAMER_LIBS)
-AC_SUBST(GSTREAMER_CFLAGS)
+PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.10, HAVE_GST=yes, HAVE_GST=no)
+if test "x$HAVE_GST" = "xyes"; then
+ AC_DEFINE(WITH_GST, 1, [build with Gstreamer])
+ AC_SUBST(GSTREAMER_LIBS)
+ AC_SUBST(GSTREAMER_CFLAGS)
+fi
 
 # XXX: Check for expat
 AC_CHECK_HEADER(expat.h)
@@ -110,6 +123,11 @@ EXPAT_CFLAGS="-I/usr/include"
 AC_SUBST(EXPAT_CFLAGS)
 AC_SUBST(EXPAT_LIBS)
 
+AC_CHECK_LIB([expat], [XML_ParserCreate],
+  AC_DEFINE(HAVE_LIBEXPAT, 1, [Defined if you have libexpat])
+  AC_SUBST(EXPAT_LIB)
+)
+
 # Localisation
 if test "x$HAVE_HILDON" = "xyes"; then
  localedir=`$PKG_CONFIG osso-af-settings --variable=localedir`