--- trunk/configure 2009/06/27 19:18:40 14 +++ trunk/configure 2009/07/05 17:38:06 21 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for GPXView 0.7.0. +# Generated by GNU Autoconf 2.61 for GPXView 0.7.1. # # Report bugs to . # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='GPXView' PACKAGE_TARNAME='gpxview' -PACKAGE_VERSION='0.7.0' -PACKAGE_STRING='GPXView 0.7.0' +PACKAGE_VERSION='0.7.1' +PACKAGE_STRING='GPXView 0.7.1' PACKAGE_BUGREPORT='till@harbaum.org' ac_unique_file="src/main.c" @@ -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 @@ -1194,7 +1198,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GPXView 0.7.0 to adapt to many kinds of systems. +\`configure' configures GPXView 0.7.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1255,7 +1259,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GPXView 0.7.0:";; + short | recursive ) echo "Configuration of GPXView 0.7.1:";; esac cat <<\_ACEOF @@ -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 @@ -1375,7 +1382,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GPXView configure 0.7.0 +GPXView configure 0.7.1 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1389,7 +1396,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GPXView $as_me 0.7.0, which was +It was created by GPXView $as_me 0.7.1, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -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 . +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 . +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 @@ -4546,7 +4672,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GPXView $as_me 0.7.0, which was +This file was extended by GPXView $as_me 0.7.1, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4589,7 +4715,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -GPXView config.status 0.7.0 +GPXView config.status 0.7.1 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -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