Small configure fixes

diff --git a/configure.ac b/configure.ac
index deb236fdbe05aa023e1fd0248db319b3d4b57a89..1c8cf8d29153fce6802808bb385862c930cf59b5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -62,6 +62,22 @@ fi
 AC_SUBST(GTKHTML_LIBS)
 AC_SUBST(GTKHTML_CFLAGS)
 
+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)
+AC_SUBST(GNOME_VFS_CFLAGS)
+
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= 2.6.16)
+AC_SUBST(LIBXML2_LIBS)
+AC_SUBST(LIBXML2_CFLAGS)
+
+PKG_CHECK_MODULES(LIBCURL, libcurl)
+AC_SUBST(LIBCURL_LIBS)
+AC_SUBST(LIBCURL_CFLAGS)
+
+PKG_CHECK_MODULES(SQLITE, sqlite3)
+AC_SUBST(SQLITE_LIBS)
+AC_SUBST(SQLITE_CFLAGS)
+
 AC_ARG_ENABLE([770],AS_HELP_STRING([--enable-770],[Build for Nokia 770/N800]),
               [enable_770=$enableval], [enable_770=no])
 
@@ -102,16 +118,19 @@ else
   AC_DEFINE([WITH_HILDON_DBUS_BT], 1, [IT D-Bus bluetooth])
 fi
 
+PKG_CHECK_MODULES(BLUEZ, bluez, HAVE_BLUEZ=yes, HAVE_BLUEZ=no)
+if test "x$HAVE_BLUEZ" = "xyes"; then
+ AC_SUBST(BLUEZ_LIBS)
+ AC_SUBST(BLUEZ_CFLAGS)
+ WITH_BLUEZ=yes
+ AC_DEFINE([WITH_BLUEZ], 1, [Bluez RFCOMM])
+fi
+
 if test "x$enable_btdbus" = "xno" ; then
   WITH_BLUEZ_DBUS_BT=no
 else
   WITH_BLUEZ_DBUS_BT=yes
-  WITH_BLUEZ=yes
-  PKG_CHECK_MODULES(BLUEZ, bluez)
-  AC_SUBST(BLUEZ_LIBS)
-  AC_SUBST(BLUEZ_CFLAGS)
   AC_DEFINE([WITH_BLUEZ_DBUS_BT], 1, [bluez D-Bus bluetooth])
-  AC_DEFINE([WITH_BLUEZ], 1, [Bluez RFCOMM])
 fi
 
 AM_CONDITIONAL(HAVE_HILDON_DBUS_BT, [test "$enable_itbtdbus" = "yes"])
@@ -228,36 +247,26 @@ fi
 AM_CONDITIONAL(HAVE_GPSD, [test "$enable_gpsd" = "yes"])
 
 if test "x$enable_gypsy" = "xyes" ; then
-PKG_CHECK_MODULES(GYPSY, [gypsy]) AC_SUBST(GYPSY_CFLAGS) AC_SUBST(GYPSY_LIBS)
-AC_DEFINE(WITH_GYPSY, 1, [build with gypsy])
+ PKG_CHECK_MODULES(GYPSY, gypsy, HAVE_GYPSY=yes, HAVE_GYPSY=no)
+ if test "x$HAVE_GEOCLUE" = "xyes"; then
+  AC_DEFINE(WITH_GYPSY, 1, [build with gypsy])
+  AC_SUBST(GYPSY_CFLAGS)
+  AC_SUBST(GYPSY_LIBS)
+ fi
 fi
 AM_CONDITIONAL(HAVE_GYPSY, [test "$enable_gypsy" = "yes"])
 
+
 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
+ 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
-AM_CONDITIONAL(HAVE_GYPSY, [test "$enable_geoclue" = "yes"])
-
-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)
-AC_SUBST(GNOME_VFS_CFLAGS)
+AM_CONDITIONAL(HAVE_GEOCLUE, [test "$enable_geoclue" = "yes"])
 
-PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= 2.6.16)
-AC_SUBST(LIBXML2_LIBS)
-AC_SUBST(LIBXML2_CFLAGS)
-
-PKG_CHECK_MODULES(LIBCURL, libcurl)
-AC_SUBST(LIBCURL_LIBS)
-AC_SUBST(LIBCURL_CFLAGS)
-
-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
@@ -397,6 +406,10 @@ if test x$enable_itbtdbus = xyes; then
 AC_MSG_NOTICE([** Tablet bluetooth D-Bus support enabled])
 fi
 
+if test x$HAVE_BLUEZ = xyes; then
+AC_MSG_NOTICE([** Bluez support enabled])
+fi
+
 if test x$enable_btdbus = xyes; then
 AC_MSG_NOTICE([** Bluez D-Bus support enabled])
 fi