Diff of /trunk/configure

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 143 by harbaum, Tue Mar 24 13:22:57 2009 UTC revision 165 by harbaum, Tue Apr 21 20:11:30 2009 UTC
# Line 1  Line 1 
1  #! /bin/sh  #! /bin/sh
2  # Guess values for system-dependent variables and create Makefiles.  # Guess values for system-dependent variables and create Makefiles.
3  # Generated by GNU Autoconf 2.61 for OSM2Go 0.6.14.  # Generated by GNU Autoconf 2.61 for OSM2Go 0.7.0.
4  #  #
5  # Report bugs to <osm2go-users@garage.maemo.org>.  # Report bugs to <osm2go-users@garage.maemo.org>.
6  #  #
# Line 574  SHELL=${CONFIG_SHELL-/bin/sh} Line 574  SHELL=${CONFIG_SHELL-/bin/sh}
574  # Identity of this package.  # Identity of this package.
575  PACKAGE_NAME='OSM2Go'  PACKAGE_NAME='OSM2Go'
576  PACKAGE_TARNAME='osm2go'  PACKAGE_TARNAME='osm2go'
577  PACKAGE_VERSION='0.6.14'  PACKAGE_VERSION='0.7.0'
578  PACKAGE_STRING='OSM2Go 0.6.14'  PACKAGE_STRING='OSM2Go 0.7.0'
579  PACKAGE_BUGREPORT='osm2go-users@garage.maemo.org'  PACKAGE_BUGREPORT='osm2go-users@garage.maemo.org'
580    
581  ac_unique_file="src/main.c"  ac_unique_file="src/main.c"
# Line 644  osso_CFLAGS Line 644  osso_CFLAGS
644  osso_LIBS  osso_LIBS
645  hildon_fm_2_CFLAGS  hildon_fm_2_CFLAGS
646  hildon_fm_2_LIBS  hildon_fm_2_LIBS
 liblocation_CFLAGS  
 liblocation_LIBS  
647  gpsbt_CFLAGS  gpsbt_CFLAGS
648  gpsbt_LIBS  gpsbt_LIBS
649    liblocation_CFLAGS
650    liblocation_LIBS
651  EXTRA_OBJS  EXTRA_OBJS
652  INSTALL_PLATTFORM  INSTALL_PLATTFORM
653  gtk_CFLAGS  gtk_CFLAGS
# Line 680  osso_CFLAGS Line 680  osso_CFLAGS
680  osso_LIBS  osso_LIBS
681  hildon_fm_2_CFLAGS  hildon_fm_2_CFLAGS
682  hildon_fm_2_LIBS  hildon_fm_2_LIBS
 liblocation_CFLAGS  
 liblocation_LIBS  
683  gpsbt_CFLAGS  gpsbt_CFLAGS
684  gpsbt_LIBS  gpsbt_LIBS
685    liblocation_CFLAGS
686    liblocation_LIBS
687  gtk_CFLAGS  gtk_CFLAGS
688  gtk_LIBS  gtk_LIBS
689  gnome2_CFLAGS  gnome2_CFLAGS
# Line 1190  if test "$ac_init_help" = "long"; then Line 1190  if test "$ac_init_help" = "long"; then
1190    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1191    # This message is too long to be a string in the A/UX 3.1 sh.    # This message is too long to be a string in the A/UX 3.1 sh.
1192    cat <<_ACEOF    cat <<_ACEOF
1193  \`configure' configures OSM2Go 0.6.14 to adapt to many kinds of systems.  \`configure' configures OSM2Go 0.7.0 to adapt to many kinds of systems.
1194    
1195  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1196    
# Line 1251  fi Line 1251  fi
1251    
1252  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1253    case $ac_init_help in    case $ac_init_help in
1254       short | recursive ) echo "Configuration of OSM2Go 0.6.14:";;       short | recursive ) echo "Configuration of OSM2Go 0.7.0:";;
1255     esac     esac
1256    cat <<\_ACEOF    cat <<\_ACEOF
1257    
# Line 1289  Some influential environment variables: Line 1289  Some influential environment variables:
1289                C compiler flags for hildon_fm_2, overriding pkg-config                C compiler flags for hildon_fm_2, overriding pkg-config
1290    hildon_fm_2_LIBS    hildon_fm_2_LIBS
1291                linker flags for hildon_fm_2, overriding pkg-config                linker flags for hildon_fm_2, overriding pkg-config
1292      gpsbt_CFLAGS
1293                  C compiler flags for gpsbt, overriding pkg-config
1294      gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config
1295    liblocation_CFLAGS    liblocation_CFLAGS
1296                C compiler flags for liblocation, overriding pkg-config                C compiler flags for liblocation, overriding pkg-config
1297    liblocation_LIBS    liblocation_LIBS
1298                linker flags for liblocation, overriding pkg-config                linker flags for liblocation, overriding pkg-config
   gpsbt_CFLAGS  
               C compiler flags for gpsbt, overriding pkg-config  
   gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config  
1299    gtk_CFLAGS  C compiler flags for gtk, overriding pkg-config    gtk_CFLAGS  C compiler flags for gtk, overriding pkg-config
1300    gtk_LIBS    linker flags for gtk, overriding pkg-config    gtk_LIBS    linker flags for gtk, overriding pkg-config
1301    gnome2_CFLAGS    gnome2_CFLAGS
# Line 1366  fi Line 1366  fi
1366  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1367  if $ac_init_version; then  if $ac_init_version; then
1368    cat <<\_ACEOF    cat <<\_ACEOF
1369  OSM2Go configure 0.6.14  OSM2Go configure 0.7.0
1370  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1371    
1372  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# Line 1380  cat >config.log <<_ACEOF Line 1380  cat >config.log <<_ACEOF
1380  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1381  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1382    
1383  It was created by OSM2Go $as_me 0.6.14, which was  It was created by OSM2Go $as_me 0.7.0, which was
1384  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1385    
1386    $ $0 $@    $ $0 $@
# Line 3517  fi Line 3517  fi
3517    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"
3518    LIBS="$LIBS $hildon_fm_2_LIBS"    LIBS="$LIBS $hildon_fm_2_LIBS"
3519    
3520    # prefer liblocation over gpsbt to control gps    # prefer gpsbt over liblocation as we got complaints regarding liblocation
3521      # stability
3522    if test -n "$PKG_CONFIG" && \    if test -n "$PKG_CONFIG" && \
3523      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3524    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3525    ac_status=$?    ac_status=$?
3526    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3527    (exit $ac_status); }; then    (exit $ac_status); }; then
3528    
3529    
3530  pkg_failed=no  pkg_failed=no
3531  { echo "$as_me:$LINENO: checking for liblocation" >&5  { echo "$as_me:$LINENO: checking for gpsbt" >&5
3532  echo $ECHO_N "checking for liblocation... $ECHO_C" >&6; }  echo $ECHO_N "checking for gpsbt... $ECHO_C" >&6; }
3533    
3534  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3535      if test -n "$liblocation_CFLAGS"; then      if test -n "$gpsbt_CFLAGS"; then
3536          pkg_cv_liblocation_CFLAGS="$liblocation_CFLAGS"          pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"
3537      else      else
3538          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3539      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3540    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3541    ac_status=$?    ac_status=$?
3542    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3543    (exit $ac_status); }; then    (exit $ac_status); }; then
3544    pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`    pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`
3545  else  else
3546    pkg_failed=yes    pkg_failed=yes
3547  fi  fi
# Line 3549  else Line 3550  else
3550          pkg_failed=untried          pkg_failed=untried
3551  fi  fi
3552  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3553      if test -n "$liblocation_LIBS"; then      if test -n "$gpsbt_LIBS"; then
3554          pkg_cv_liblocation_LIBS="$liblocation_LIBS"          pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"
3555      else      else
3556          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3557      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3558    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3559    ac_status=$?    ac_status=$?
3560    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3561    (exit $ac_status); }; then    (exit $ac_status); }; then
3562    pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`    pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`
3563  else  else
3564    pkg_failed=yes    pkg_failed=yes
3565  fi  fi
# Line 3577  else Line 3578  else
3578          _pkg_short_errors_supported=no          _pkg_short_errors_supported=no
3579  fi  fi
3580          if test $_pkg_short_errors_supported = yes; then          if test $_pkg_short_errors_supported = yes; then
3581                  liblocation_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "liblocation"`                  gpsbt_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gpsbt"`
3582          else          else
3583                  liblocation_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liblocation"`                  gpsbt_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gpsbt"`
3584          fi          fi
3585          # Put the nasty error message in config.log where it belongs          # Put the nasty error message in config.log where it belongs
3586          echo "$liblocation_PKG_ERRORS" >&5          echo "$gpsbt_PKG_ERRORS" >&5
3587    
3588          { { echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:          { { echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:
3589    
3590  $liblocation_PKG_ERRORS  $gpsbt_PKG_ERRORS
3591    
3592  Consider adjusting the PKG_CONFIG_PATH environment variable if you  Consider adjusting the PKG_CONFIG_PATH environment variable if you
3593  installed software in a non-standard prefix.  installed software in a non-standard prefix.
3594    
3595  Alternatively, you may set the environment variables liblocation_CFLAGS  Alternatively, you may set the environment variables gpsbt_CFLAGS
3596  and liblocation_LIBS to avoid the need to call pkg-config.  and gpsbt_LIBS to avoid the need to call pkg-config.
3597  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3598  " >&5  " >&5
3599  echo "$as_me: error: Package requirements (liblocation) were not met:  echo "$as_me: error: Package requirements (gpsbt) were not met:
3600    
3601  $liblocation_PKG_ERRORS  $gpsbt_PKG_ERRORS
3602    
3603  Consider adjusting the PKG_CONFIG_PATH environment variable if you  Consider adjusting the PKG_CONFIG_PATH environment variable if you
3604  installed software in a non-standard prefix.  installed software in a non-standard prefix.
3605    
3606  Alternatively, you may set the environment variables liblocation_CFLAGS  Alternatively, you may set the environment variables gpsbt_CFLAGS
3607  and liblocation_LIBS to avoid the need to call pkg-config.  and gpsbt_LIBS to avoid the need to call pkg-config.
3608  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3609  " >&2;}  " >&2;}
3610     { (exit 1); exit 1; }; }     { (exit 1); exit 1; }; }
# Line 3612  elif test $pkg_failed = untried; then Line 3613  elif test $pkg_failed = untried; then
3613  is in your PATH or set the PKG_CONFIG environment variable to the full  is in your PATH or set the PKG_CONFIG environment variable to the full
3614  path to pkg-config.  path to pkg-config.
3615    
3616  Alternatively, you may set the environment variables liblocation_CFLAGS  Alternatively, you may set the environment variables gpsbt_CFLAGS
3617  and liblocation_LIBS to avoid the need to call pkg-config.  and gpsbt_LIBS to avoid the need to call pkg-config.
3618  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3619    
3620  To get pkg-config, see <http://pkg-config.freedesktop.org/>.  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
# Line 3622  echo "$as_me: error: The pkg-config scri Line 3623  echo "$as_me: error: The pkg-config scri
3623  is in your PATH or set the PKG_CONFIG environment variable to the full  is in your PATH or set the PKG_CONFIG environment variable to the full
3624  path to pkg-config.  path to pkg-config.
3625    
3626  Alternatively, you may set the environment variables liblocation_CFLAGS  Alternatively, you may set the environment variables gpsbt_CFLAGS
3627  and liblocation_LIBS to avoid the need to call pkg-config.  and gpsbt_LIBS to avoid the need to call pkg-config.
3628  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3629    
3630  To get pkg-config, see <http://pkg-config.freedesktop.org/>.  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3631  See \`config.log' for more details." >&2;}  See \`config.log' for more details." >&2;}
3632     { (exit 1); exit 1; }; }     { (exit 1); exit 1; }; }
3633  else  else
3634          liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS          gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS
3635          liblocation_LIBS=$pkg_cv_liblocation_LIBS          gpsbt_LIBS=$pkg_cv_gpsbt_LIBS
3636          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3637  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3638          :          :
3639  fi  fi
3640      CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
3641      LIBS="$LIBS $liblocation_LIBS"      LIBS="$LIBS $gpsbt_LIBS"
3642    
3643  else  else
3644    
3645      { echo "$as_me:$LINENO: WARNING: liblocation not found, trying deprecated gpsbt" >&5      { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5
3646  echo "$as_me: WARNING: liblocation not found, trying deprecated gpsbt" >&6;}  echo "$as_me: gpsbt not found, trying liblocation" >&6;}
3647    
3648      if test -n "$PKG_CONFIG" && \      if test -n "$PKG_CONFIG" && \
3649      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3650    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3651    ac_status=$?    ac_status=$?
3652    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3653    (exit $ac_status); }; then    (exit $ac_status); }; then
3654    
3655    
3656  pkg_failed=no  pkg_failed=no
3657  { echo "$as_me:$LINENO: checking for gpsbt" >&5  { echo "$as_me:$LINENO: checking for liblocation" >&5
3658  echo $ECHO_N "checking for gpsbt... $ECHO_C" >&6; }  echo $ECHO_N "checking for liblocation... $ECHO_C" >&6; }
3659    
3660  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3661      if test -n "$gpsbt_CFLAGS"; then      if test -n "$liblocation_CFLAGS"; then
3662          pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"          pkg_cv_liblocation_CFLAGS="$liblocation_CFLAGS"
3663      else      else
3664          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3665      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3666    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3667    ac_status=$?    ac_status=$?
3668    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3669    (exit $ac_status); }; then    (exit $ac_status); }; then
3670    pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`    pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`
3671  else  else
3672    pkg_failed=yes    pkg_failed=yes
3673  fi  fi
# Line 3675  else Line 3676  else
3676          pkg_failed=untried          pkg_failed=untried
3677  fi  fi
3678  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3679      if test -n "$gpsbt_LIBS"; then      if test -n "$liblocation_LIBS"; then
3680          pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"          pkg_cv_liblocation_LIBS="$liblocation_LIBS"
3681      else      else
3682          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3683      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3684    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3685    ac_status=$?    ac_status=$?
3686    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3687    (exit $ac_status); }; then    (exit $ac_status); }; then
3688    pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`    pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`
3689  else  else
3690    pkg_failed=yes    pkg_failed=yes
3691  fi  fi
# Line 3703  else Line 3704  else
3704          _pkg_short_errors_supported=no          _pkg_short_errors_supported=no
3705  fi  fi
3706          if test $_pkg_short_errors_supported = yes; then          if test $_pkg_short_errors_supported = yes; then
3707                  gpsbt_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gpsbt"`                  liblocation_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "liblocation"`
3708          else          else
3709                  gpsbt_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gpsbt"`                  liblocation_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liblocation"`
3710          fi          fi
3711          # Put the nasty error message in config.log where it belongs          # Put the nasty error message in config.log where it belongs
3712          echo "$gpsbt_PKG_ERRORS" >&5          echo "$liblocation_PKG_ERRORS" >&5
3713    
3714          { { echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:          { { echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:
3715    
3716  $gpsbt_PKG_ERRORS  $liblocation_PKG_ERRORS
3717    
3718  Consider adjusting the PKG_CONFIG_PATH environment variable if you  Consider adjusting the PKG_CONFIG_PATH environment variable if you
3719  installed software in a non-standard prefix.  installed software in a non-standard prefix.
3720    
3721  Alternatively, you may set the environment variables gpsbt_CFLAGS  Alternatively, you may set the environment variables liblocation_CFLAGS
3722  and gpsbt_LIBS to avoid the need to call pkg-config.  and liblocation_LIBS to avoid the need to call pkg-config.
3723  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3724  " >&5  " >&5
3725  echo "$as_me: error: Package requirements (gpsbt) were not met:  echo "$as_me: error: Package requirements (liblocation) were not met:
3726    
3727  $gpsbt_PKG_ERRORS  $liblocation_PKG_ERRORS
3728    
3729  Consider adjusting the PKG_CONFIG_PATH environment variable if you  Consider adjusting the PKG_CONFIG_PATH environment variable if you
3730  installed software in a non-standard prefix.  installed software in a non-standard prefix.
3731    
3732  Alternatively, you may set the environment variables gpsbt_CFLAGS  Alternatively, you may set the environment variables liblocation_CFLAGS
3733  and gpsbt_LIBS to avoid the need to call pkg-config.  and liblocation_LIBS to avoid the need to call pkg-config.
3734  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3735  " >&2;}  " >&2;}
3736     { (exit 1); exit 1; }; }     { (exit 1); exit 1; }; }
# Line 3738  elif test $pkg_failed = untried; then Line 3739  elif test $pkg_failed = untried; then
3739  is in your PATH or set the PKG_CONFIG environment variable to the full  is in your PATH or set the PKG_CONFIG environment variable to the full
3740  path to pkg-config.  path to pkg-config.
3741    
3742  Alternatively, you may set the environment variables gpsbt_CFLAGS  Alternatively, you may set the environment variables liblocation_CFLAGS
3743  and gpsbt_LIBS to avoid the need to call pkg-config.  and liblocation_LIBS to avoid the need to call pkg-config.
3744  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3745    
3746  To get pkg-config, see <http://pkg-config.freedesktop.org/>.  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
# Line 3748  echo "$as_me: error: The pkg-config scri Line 3749  echo "$as_me: error: The pkg-config scri
3749  is in your PATH or set the PKG_CONFIG environment variable to the full  is in your PATH or set the PKG_CONFIG environment variable to the full
3750  path to pkg-config.  path to pkg-config.
3751    
3752  Alternatively, you may set the environment variables gpsbt_CFLAGS  Alternatively, you may set the environment variables liblocation_CFLAGS
3753  and gpsbt_LIBS to avoid the need to call pkg-config.  and liblocation_LIBS to avoid the need to call pkg-config.
3754  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3755    
3756  To get pkg-config, see <http://pkg-config.freedesktop.org/>.  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3757  See \`config.log' for more details." >&2;}  See \`config.log' for more details." >&2;}
3758     { (exit 1); exit 1; }; }     { (exit 1); exit 1; }; }
3759  else  else
3760          gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS          liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS
3761          gpsbt_LIBS=$pkg_cv_gpsbt_LIBS          liblocation_LIBS=$pkg_cv_liblocation_LIBS
3762          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3763  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3764          :          :
3765  fi  fi
3766        CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"        CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
3767        LIBS="$LIBS $gpsbt_LIBS"        LIBS="$LIBS $liblocation_LIBS"
3768    
3769  else  else
3770    { echo "$as_me:$LINENO: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&5  
3771          { echo "$as_me:$LINENO: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&5
3772  echo "$as_me: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&6;}  echo "$as_me: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&6;}
3773    
3774  fi  fi
3775    
3776  fi  fi
# Line 4414  exec 6>&1 Line 4417  exec 6>&1
4417  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4418  # values after options handling.  # values after options handling.
4419  ac_log="  ac_log="
4420  This file was extended by OSM2Go $as_me 0.6.14, which was  This file was extended by OSM2Go $as_me 0.7.0, which was
4421  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4422    
4423    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4457  Report bugs to <bug-autoconf@gnu.org>." Line 4460  Report bugs to <bug-autoconf@gnu.org>."
4460  _ACEOF  _ACEOF
4461  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
4462  ac_cs_version="\\  ac_cs_version="\\
4463  OSM2Go config.status 0.6.14  OSM2Go config.status 0.7.0
4464  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
4465    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
4466    
# Line 4684  osso_CFLAGS!$osso_CFLAGS$ac_delim Line 4687  osso_CFLAGS!$osso_CFLAGS$ac_delim
4687  osso_LIBS!$osso_LIBS$ac_delim  osso_LIBS!$osso_LIBS$ac_delim
4688  hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$ac_delim  hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$ac_delim
4689  hildon_fm_2_LIBS!$hildon_fm_2_LIBS$ac_delim  hildon_fm_2_LIBS!$hildon_fm_2_LIBS$ac_delim
 liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim  
 liblocation_LIBS!$liblocation_LIBS$ac_delim  
4690  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
4691  gpsbt_LIBS!$gpsbt_LIBS$ac_delim  gpsbt_LIBS!$gpsbt_LIBS$ac_delim
4692    liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
4693    liblocation_LIBS!$liblocation_LIBS$ac_delim
4694  EXTRA_OBJS!$EXTRA_OBJS$ac_delim  EXTRA_OBJS!$EXTRA_OBJS$ac_delim
4695  INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim  INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim
4696  gtk_CFLAGS!$gtk_CFLAGS$ac_delim  gtk_CFLAGS!$gtk_CFLAGS$ac_delim
Legend:
Removed from v.143  
changed lines
  Added in v.165