--- trunk/configure	2009/06/25 19:08:48	8
+++ trunk/configure	2009/06/25 19:09:32	9
@@ -648,6 +648,8 @@
 sqlite3_LIBS
 hildon_help_CFLAGS
 hildon_help_LIBS
+gpsbt_CFLAGS
+gpsbt_LIBS
 liblocation_CFLAGS
 liblocation_LIBS
 EXTRA_OBJS
@@ -686,6 +688,8 @@
 sqlite3_LIBS
 hildon_help_CFLAGS
 hildon_help_LIBS
+gpsbt_CFLAGS
+gpsbt_LIBS
 liblocation_CFLAGS
 liblocation_LIBS
 gtk_CFLAGS
@@ -1301,6 +1305,9 @@
               C compiler flags for hildon_help, overriding pkg-config
   hildon_help_LIBS
               linker flags for hildon_help, overriding pkg-config
+  gpsbt_CFLAGS
+              C compiler flags for gpsbt, overriding pkg-config
+  gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config
   liblocation_CFLAGS
               C compiler flags for liblocation, overriding pkg-config
   liblocation_LIBS
@@ -3767,11 +3774,129 @@
 
   # prefer gpsbt over liblocation as we got complaints regarding liblocation
   # stability
-#  PKG_CHECK_EXISTS(gpsbt, [
-#    PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
-#    CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
-#    LIBS="$LIBS $gpsbt_LIBS"
-#  ], [
+  if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+
+
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for gpsbt" >&5
+echo $ECHO_N "checking for gpsbt... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$gpsbt_CFLAGS"; then
+        pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$gpsbt_LIBS"; then
+        pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
+  ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        gpsbt_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gpsbt"`
+        else
+	        gpsbt_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gpsbt"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$gpsbt_PKG_ERRORS" >&5
+
+	{ { echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:
+
+$gpsbt_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables gpsbt_CFLAGS
+and gpsbt_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (gpsbt) were not met:
+
+$gpsbt_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables gpsbt_CFLAGS
+and gpsbt_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+   { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables gpsbt_CFLAGS
+and gpsbt_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables gpsbt_CFLAGS
+and gpsbt_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }
+else
+	gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS
+	gpsbt_LIBS=$pkg_cv_gpsbt_LIBS
+        { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+	:
+fi
+    CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
+    LIBS="$LIBS $gpsbt_LIBS"
+
+else
+
     { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5
 echo "$as_me: gpsbt not found, trying liblocation" >&6;}
 
@@ -3902,7 +4027,8 @@
 echo "$as_me: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&6;}
 
 fi
-#  ])
+
+fi
 
   if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tablet-browser-interface\"") >&5
@@ -4820,6 +4946,8 @@
 sqlite3_LIBS!$sqlite3_LIBS$ac_delim
 hildon_help_CFLAGS!$hildon_help_CFLAGS$ac_delim
 hildon_help_LIBS!$hildon_help_LIBS$ac_delim
+gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
+gpsbt_LIBS!$gpsbt_LIBS$ac_delim
 liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
 liblocation_LIBS!$liblocation_LIBS$ac_delim
 EXTRA_OBJS!$EXTRA_OBJS$ac_delim
@@ -4832,7 +4960,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5