Cleanups

[mapper] / configure.ac

diff --git a/configure.ac b/configure.ac
index a8b894e5bb26788e76e5c90c74359a743b46c48c..f6998edd3373a5215145406d7d211ce4cade57b3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,10 +26,26 @@ AC_CONFIG_HEADERS(src/config.h)
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
 
+dnl Debugging options to enable debug macros
+DEBUG_FLAGS=
+AC_ARG_ENABLE(debug,     [  --enable-debug                compile with DEBUG],,enable_debug=no)
+
+if test "x$enable_debug" = "xyes"; then
+    DEBUG_FLAGS="$DEBUG_FLAGS -DDEBUG -g -fno-omit-frame-pointer"
+else
+    DEBUG_FLAGS="$DEBUG_FLAGS -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
+fi
+
+CFLAGS="$CFLAGS $DEBUG_FLAGS -Wall -std=c99 -Wmissing-prototypes -Wmissing-declarations"
+
 PKG_CHECK_MODULES(GTK, gtk+-2.0)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(GTK_CFLAGS)
 
+PKG_CHECK_MODULES(GLIB, glib-2.0)
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_CFLAGS)
+
 dnl Ckeck for hildon-libs
 PKG_CHECK_MODULES(HILDON, hildon-libs libosso, HAVE_HILDON=yes, HAVE_HILDON=no)
 
@@ -53,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)
@@ -83,6 +109,25 @@ PKG_CHECK_MODULES(SQLITE, sqlite3)
 AC_SUBST(SQLITE_LIBS)
 AC_SUBST(SQLITE_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)
+EXPAT_LIBS="-lexpat"
+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`