Diff of /trunk/configure

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

revision 118 by harbaum, Mon Mar 9 14:28:35 2009 UTC revision 200 by harbaum, Thu Jul 9 11:44:27 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.8.13.  # Generated by GNU Autoconf 2.61 for OSM2Go 0.7.8.
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.8.13'  PACKAGE_VERSION='0.7.8'
578  PACKAGE_STRING='OSM2Go 0.8.13'  PACKAGE_STRING='OSM2Go 0.7.8'
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 632  SET_MAKE Line 632  SET_MAKE
632  PKG_CONFIG  PKG_CONFIG
633  libcurl_CFLAGS  libcurl_CFLAGS
634  libcurl_LIBS  libcurl_LIBS
635    libsoup_CFLAGS
636    libsoup_LIBS
637  goocanvas_CFLAGS  goocanvas_CFLAGS
638  goocanvas_LIBS  goocanvas_LIBS
639  gnome_vfs_module_CFLAGS  gnome_vfs_module_CFLAGS
# Line 644  osso_CFLAGS Line 646  osso_CFLAGS
646  osso_LIBS  osso_LIBS
647  hildon_fm_2_CFLAGS  hildon_fm_2_CFLAGS
648  hildon_fm_2_LIBS  hildon_fm_2_LIBS
 liblocation_CFLAGS  
 liblocation_LIBS  
649  gpsbt_CFLAGS  gpsbt_CFLAGS
650  gpsbt_LIBS  gpsbt_LIBS
651    liblocation_CFLAGS
652    liblocation_LIBS
653  EXTRA_OBJS  EXTRA_OBJS
654  INSTALL_PLATTFORM  INSTALL_PLATTFORM
655  gtk_CFLAGS  gtk_CFLAGS
# Line 668  CPPFLAGS Line 670  CPPFLAGS
670  PKG_CONFIG  PKG_CONFIG
671  libcurl_CFLAGS  libcurl_CFLAGS
672  libcurl_LIBS  libcurl_LIBS
673    libsoup_CFLAGS
674    libsoup_LIBS
675  goocanvas_CFLAGS  goocanvas_CFLAGS
676  goocanvas_LIBS  goocanvas_LIBS
677  gnome_vfs_module_CFLAGS  gnome_vfs_module_CFLAGS
# Line 680  osso_CFLAGS Line 684  osso_CFLAGS
684  osso_LIBS  osso_LIBS
685  hildon_fm_2_CFLAGS  hildon_fm_2_CFLAGS
686  hildon_fm_2_LIBS  hildon_fm_2_LIBS
 liblocation_CFLAGS  
 liblocation_LIBS  
687  gpsbt_CFLAGS  gpsbt_CFLAGS
688  gpsbt_LIBS  gpsbt_LIBS
689    liblocation_CFLAGS
690    liblocation_LIBS
691  gtk_CFLAGS  gtk_CFLAGS
692  gtk_LIBS  gtk_LIBS
693  gnome2_CFLAGS  gnome2_CFLAGS
# Line 1190  if test "$ac_init_help" = "long"; then Line 1194  if test "$ac_init_help" = "long"; then
1194    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1195    # 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.
1196    cat <<_ACEOF    cat <<_ACEOF
1197  \`configure' configures OSM2Go 0.8.13 to adapt to many kinds of systems.  \`configure' configures OSM2Go 0.7.8 to adapt to many kinds of systems.
1198    
1199  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1200    
# Line 1251  fi Line 1255  fi
1255    
1256  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1257    case $ac_init_help in    case $ac_init_help in
1258       short | recursive ) echo "Configuration of OSM2Go 0.8.13:";;       short | recursive ) echo "Configuration of OSM2Go 0.7.8:";;
1259     esac     esac
1260    cat <<\_ACEOF    cat <<\_ACEOF
1261    
# Line 1268  Some influential environment variables: Line 1272  Some influential environment variables:
1272                C compiler flags for libcurl, overriding pkg-config                C compiler flags for libcurl, overriding pkg-config
1273    libcurl_LIBS    libcurl_LIBS
1274                linker flags for libcurl, overriding pkg-config                linker flags for libcurl, overriding pkg-config
1275      libsoup_CFLAGS
1276                  C compiler flags for libsoup, overriding pkg-config
1277      libsoup_LIBS
1278                  linker flags for libsoup, overriding pkg-config
1279    goocanvas_CFLAGS    goocanvas_CFLAGS
1280                C compiler flags for goocanvas, overriding pkg-config                C compiler flags for goocanvas, overriding pkg-config
1281    goocanvas_LIBS    goocanvas_LIBS
# Line 1289  Some influential environment variables: Line 1297  Some influential environment variables:
1297                C compiler flags for hildon_fm_2, overriding pkg-config                C compiler flags for hildon_fm_2, overriding pkg-config
1298    hildon_fm_2_LIBS    hildon_fm_2_LIBS
1299                linker flags for hildon_fm_2, overriding pkg-config                linker flags for hildon_fm_2, overriding pkg-config
1300      gpsbt_CFLAGS
1301                  C compiler flags for gpsbt, overriding pkg-config
1302      gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config
1303    liblocation_CFLAGS    liblocation_CFLAGS
1304                C compiler flags for liblocation, overriding pkg-config                C compiler flags for liblocation, overriding pkg-config
1305    liblocation_LIBS    liblocation_LIBS
1306                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  
1307    gtk_CFLAGS  C compiler flags for gtk, overriding pkg-config    gtk_CFLAGS  C compiler flags for gtk, overriding pkg-config
1308    gtk_LIBS    linker flags for gtk, overriding pkg-config    gtk_LIBS    linker flags for gtk, overriding pkg-config
1309    gnome2_CFLAGS    gnome2_CFLAGS
# Line 1366  fi Line 1374  fi
1374  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1375  if $ac_init_version; then  if $ac_init_version; then
1376    cat <<\_ACEOF    cat <<\_ACEOF
1377  OSM2Go configure 0.8.13  OSM2Go configure 0.7.8
1378  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1379    
1380  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 1388  cat >config.log <<_ACEOF
1388  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1389  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1390    
1391  It was created by OSM2Go $as_me 0.8.13, which was  It was created by OSM2Go $as_me 0.7.8, which was
1392  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1393    
1394    $ $0 $@    $ $0 $@
# Line 3032  fi Line 3040  fi
3040  CFLAGS="$CFLAGS $libcurl_CFLAGS"  CFLAGS="$CFLAGS $libcurl_CFLAGS"
3041  LIBS="$LIBS $libcurl_LIBS"  LIBS="$LIBS $libcurl_LIBS"
3042    
3043    # check for libsoup
3044    
3045    pkg_failed=no
3046    { echo "$as_me:$LINENO: checking for libsoup" >&5
3047    echo $ECHO_N "checking for libsoup... $ECHO_C" >&6; }
3048    
3049    if test -n "$PKG_CONFIG"; then
3050        if test -n "$libsoup_CFLAGS"; then
3051            pkg_cv_libsoup_CFLAGS="$libsoup_CFLAGS"
3052        else
3053            if test -n "$PKG_CONFIG" && \
3054        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
3055      ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
3056      ac_status=$?
3057      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3058      (exit $ac_status); }; then
3059      pkg_cv_libsoup_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
3060    else
3061      pkg_failed=yes
3062    fi
3063        fi
3064    else
3065            pkg_failed=untried
3066    fi
3067    if test -n "$PKG_CONFIG"; then
3068        if test -n "$libsoup_LIBS"; then
3069            pkg_cv_libsoup_LIBS="$libsoup_LIBS"
3070        else
3071            if test -n "$PKG_CONFIG" && \
3072        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
3073      ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
3074      ac_status=$?
3075      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3076      (exit $ac_status); }; then
3077      pkg_cv_libsoup_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
3078    else
3079      pkg_failed=yes
3080    fi
3081        fi
3082    else
3083            pkg_failed=untried
3084    fi
3085    
3086    
3087    
3088    if test $pkg_failed = yes; then
3089    
3090    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3091            _pkg_short_errors_supported=yes
3092    else
3093            _pkg_short_errors_supported=no
3094    fi
3095            if test $_pkg_short_errors_supported = yes; then
3096                    libsoup_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
3097            else
3098                    libsoup_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
3099            fi
3100            # Put the nasty error message in config.log where it belongs
3101            echo "$libsoup_PKG_ERRORS" >&5
3102    
3103            { echo "$as_me:$LINENO: result: no" >&5
3104    echo "${ECHO_T}no" >&6; }
3105                    { { echo "$as_me:$LINENO: error: libsoup-2.4 missing" >&5
3106    echo "$as_me: error: libsoup-2.4 missing" >&2;}
3107       { (exit 1); exit 1; }; }
3108    elif test $pkg_failed = untried; then
3109            { { echo "$as_me:$LINENO: error: libsoup-2.4 missing" >&5
3110    echo "$as_me: error: libsoup-2.4 missing" >&2;}
3111       { (exit 1); exit 1; }; }
3112    else
3113            libsoup_CFLAGS=$pkg_cv_libsoup_CFLAGS
3114            libsoup_LIBS=$pkg_cv_libsoup_LIBS
3115            { echo "$as_me:$LINENO: result: yes" >&5
3116    echo "${ECHO_T}yes" >&6; }
3117            :
3118    fi
3119    CFLAGS="$CFLAGS $libsoup_CFLAGS"
3120    LIBS="$LIBS $libsoup_LIBS"
3121    
3122  # check for goocanvas  # check for goocanvas
3123    
3124  pkg_failed=no  pkg_failed=no
# Line 3517  fi Line 3604  fi
3604    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"
3605    LIBS="$LIBS $hildon_fm_2_LIBS"    LIBS="$LIBS $hildon_fm_2_LIBS"
3606    
3607    # prefer liblocation over gpsbt to control gps    # prefer gpsbt over liblocation as we got complaints regarding liblocation
3608      # stability
3609    if test -n "$PKG_CONFIG" && \    if test -n "$PKG_CONFIG" && \
3610      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3611    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3612    ac_status=$?    ac_status=$?
3613    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3614    (exit $ac_status); }; then    (exit $ac_status); }; then
3615    
3616    
3617  pkg_failed=no  pkg_failed=no
3618  { echo "$as_me:$LINENO: checking for liblocation" >&5  { echo "$as_me:$LINENO: checking for gpsbt" >&5
3619  echo $ECHO_N "checking for liblocation... $ECHO_C" >&6; }  echo $ECHO_N "checking for gpsbt... $ECHO_C" >&6; }
3620    
3621  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3622      if test -n "$liblocation_CFLAGS"; then      if test -n "$gpsbt_CFLAGS"; then
3623          pkg_cv_liblocation_CFLAGS="$liblocation_CFLAGS"          pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"
3624      else      else
3625          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3626      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3627    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3628    ac_status=$?    ac_status=$?
3629    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3630    (exit $ac_status); }; then    (exit $ac_status); }; then
3631    pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`    pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`
3632  else  else
3633    pkg_failed=yes    pkg_failed=yes
3634  fi  fi
# Line 3549  else Line 3637  else
3637          pkg_failed=untried          pkg_failed=untried
3638  fi  fi
3639  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3640      if test -n "$liblocation_LIBS"; then      if test -n "$gpsbt_LIBS"; then
3641          pkg_cv_liblocation_LIBS="$liblocation_LIBS"          pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"
3642      else      else
3643          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3644      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3645    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3646    ac_status=$?    ac_status=$?
3647    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3648    (exit $ac_status); }; then    (exit $ac_status); }; then
3649    pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`    pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`
3650  else  else
3651    pkg_failed=yes    pkg_failed=yes
3652  fi  fi
# Line 3577  else Line 3665  else
3665          _pkg_short_errors_supported=no          _pkg_short_errors_supported=no
3666  fi  fi
3667          if test $_pkg_short_errors_supported = yes; then          if test $_pkg_short_errors_supported = yes; then
3668                  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"`
3669          else          else
3670                  liblocation_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liblocation"`                  gpsbt_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gpsbt"`
3671          fi          fi
3672          # Put the nasty error message in config.log where it belongs          # Put the nasty error message in config.log where it belongs
3673          echo "$liblocation_PKG_ERRORS" >&5          echo "$gpsbt_PKG_ERRORS" >&5
3674    
3675          { { echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:          { { echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:
3676    
3677  $liblocation_PKG_ERRORS  $gpsbt_PKG_ERRORS
3678    
3679  Consider adjusting the PKG_CONFIG_PATH environment variable if you  Consider adjusting the PKG_CONFIG_PATH environment variable if you
3680  installed software in a non-standard prefix.  installed software in a non-standard prefix.
3681    
3682  Alternatively, you may set the environment variables liblocation_CFLAGS  Alternatively, you may set the environment variables gpsbt_CFLAGS
3683  and liblocation_LIBS to avoid the need to call pkg-config.  and gpsbt_LIBS to avoid the need to call pkg-config.
3684  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3685  " >&5  " >&5
3686  echo "$as_me: error: Package requirements (liblocation) were not met:  echo "$as_me: error: Package requirements (gpsbt) were not met:
3687    
3688  $liblocation_PKG_ERRORS  $gpsbt_PKG_ERRORS
3689    
3690  Consider adjusting the PKG_CONFIG_PATH environment variable if you  Consider adjusting the PKG_CONFIG_PATH environment variable if you
3691  installed software in a non-standard prefix.  installed software in a non-standard prefix.
3692    
3693  Alternatively, you may set the environment variables liblocation_CFLAGS  Alternatively, you may set the environment variables gpsbt_CFLAGS
3694  and liblocation_LIBS to avoid the need to call pkg-config.  and gpsbt_LIBS to avoid the need to call pkg-config.
3695  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3696  " >&2;}  " >&2;}
3697     { (exit 1); exit 1; }; }     { (exit 1); exit 1; }; }
# Line 3612  elif test $pkg_failed = untried; then Line 3700  elif test $pkg_failed = untried; then
3700  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
3701  path to pkg-config.  path to pkg-config.
3702    
3703  Alternatively, you may set the environment variables liblocation_CFLAGS  Alternatively, you may set the environment variables gpsbt_CFLAGS
3704  and liblocation_LIBS to avoid the need to call pkg-config.  and gpsbt_LIBS to avoid the need to call pkg-config.
3705  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3706    
3707  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 3710  echo "$as_me: error: The pkg-config scri
3710  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
3711  path to pkg-config.  path to pkg-config.
3712    
3713  Alternatively, you may set the environment variables liblocation_CFLAGS  Alternatively, you may set the environment variables gpsbt_CFLAGS
3714  and liblocation_LIBS to avoid the need to call pkg-config.  and gpsbt_LIBS to avoid the need to call pkg-config.
3715  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3716    
3717  To get pkg-config, see <http://pkg-config.freedesktop.org/>.  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3718  See \`config.log' for more details." >&2;}  See \`config.log' for more details." >&2;}
3719     { (exit 1); exit 1; }; }     { (exit 1); exit 1; }; }
3720  else  else
3721          liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS          gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS
3722          liblocation_LIBS=$pkg_cv_liblocation_LIBS          gpsbt_LIBS=$pkg_cv_gpsbt_LIBS
3723          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3724  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3725          :          :
3726  fi  fi
3727      CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
3728      LIBS="$LIBS $liblocation_LIBS"      LIBS="$LIBS $gpsbt_LIBS"
3729    
3730  else  else
3731    
3732      { echo "$as_me:$LINENO: WARNING: liblocation not found, trying deprecated gpsbt" >&5      { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5
3733  echo "$as_me: WARNING: liblocation not found, trying deprecated gpsbt" >&6;}  echo "$as_me: gpsbt not found, trying liblocation" >&6;}
3734    
3735      if test -n "$PKG_CONFIG" && \      if test -n "$PKG_CONFIG" && \
3736      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3737    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3738    ac_status=$?    ac_status=$?
3739    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3740    (exit $ac_status); }; then    (exit $ac_status); }; then
3741    
3742    
3743  pkg_failed=no  pkg_failed=no
3744  { echo "$as_me:$LINENO: checking for gpsbt" >&5  { echo "$as_me:$LINENO: checking for liblocation" >&5
3745  echo $ECHO_N "checking for gpsbt... $ECHO_C" >&6; }  echo $ECHO_N "checking for liblocation... $ECHO_C" >&6; }
3746    
3747  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3748      if test -n "$gpsbt_CFLAGS"; then      if test -n "$liblocation_CFLAGS"; then
3749          pkg_cv_gpsbt_CFLAGS="$gpsbt_CFLAGS"          pkg_cv_liblocation_CFLAGS="$liblocation_CFLAGS"
3750      else      else
3751          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3752      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3753    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3754    ac_status=$?    ac_status=$?
3755    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3756    (exit $ac_status); }; then    (exit $ac_status); }; then
3757    pkg_cv_gpsbt_CFLAGS=`$PKG_CONFIG --cflags "gpsbt" 2>/dev/null`    pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`
3758  else  else
3759    pkg_failed=yes    pkg_failed=yes
3760  fi  fi
# Line 3675  else Line 3763  else
3763          pkg_failed=untried          pkg_failed=untried
3764  fi  fi
3765  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3766      if test -n "$gpsbt_LIBS"; then      if test -n "$liblocation_LIBS"; then
3767          pkg_cv_gpsbt_LIBS="$gpsbt_LIBS"          pkg_cv_liblocation_LIBS="$liblocation_LIBS"
3768      else      else
3769          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3770      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3771    ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3772    ac_status=$?    ac_status=$?
3773    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3774    (exit $ac_status); }; then    (exit $ac_status); }; then
3775    pkg_cv_gpsbt_LIBS=`$PKG_CONFIG --libs "gpsbt" 2>/dev/null`    pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`
3776  else  else
3777    pkg_failed=yes    pkg_failed=yes
3778  fi  fi
# Line 3703  else Line 3791  else
3791          _pkg_short_errors_supported=no          _pkg_short_errors_supported=no
3792  fi  fi
3793          if test $_pkg_short_errors_supported = yes; then          if test $_pkg_short_errors_supported = yes; then
3794                  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"`
3795          else          else
3796                  gpsbt_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gpsbt"`                  liblocation_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liblocation"`
3797          fi          fi
3798          # Put the nasty error message in config.log where it belongs          # Put the nasty error message in config.log where it belongs
3799          echo "$gpsbt_PKG_ERRORS" >&5          echo "$liblocation_PKG_ERRORS" >&5
3800    
3801          { { echo "$as_me:$LINENO: error: Package requirements (gpsbt) were not met:          { { echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:
3802    
3803  $gpsbt_PKG_ERRORS  $liblocation_PKG_ERRORS
3804    
3805  Consider adjusting the PKG_CONFIG_PATH environment variable if you  Consider adjusting the PKG_CONFIG_PATH environment variable if you
3806  installed software in a non-standard prefix.  installed software in a non-standard prefix.
3807    
3808  Alternatively, you may set the environment variables gpsbt_CFLAGS  Alternatively, you may set the environment variables liblocation_CFLAGS
3809  and gpsbt_LIBS to avoid the need to call pkg-config.  and liblocation_LIBS to avoid the need to call pkg-config.
3810  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3811  " >&5  " >&5
3812  echo "$as_me: error: Package requirements (gpsbt) were not met:  echo "$as_me: error: Package requirements (liblocation) were not met:
3813    
3814  $gpsbt_PKG_ERRORS  $liblocation_PKG_ERRORS
3815    
3816  Consider adjusting the PKG_CONFIG_PATH environment variable if you  Consider adjusting the PKG_CONFIG_PATH environment variable if you
3817  installed software in a non-standard prefix.  installed software in a non-standard prefix.
3818    
3819  Alternatively, you may set the environment variables gpsbt_CFLAGS  Alternatively, you may set the environment variables liblocation_CFLAGS
3820  and gpsbt_LIBS to avoid the need to call pkg-config.  and liblocation_LIBS to avoid the need to call pkg-config.
3821  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3822  " >&2;}  " >&2;}
3823     { (exit 1); exit 1; }; }     { (exit 1); exit 1; }; }
# Line 3738  elif test $pkg_failed = untried; then Line 3826  elif test $pkg_failed = untried; then
3826  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
3827  path to pkg-config.  path to pkg-config.
3828    
3829  Alternatively, you may set the environment variables gpsbt_CFLAGS  Alternatively, you may set the environment variables liblocation_CFLAGS
3830  and gpsbt_LIBS to avoid the need to call pkg-config.  and liblocation_LIBS to avoid the need to call pkg-config.
3831  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3832    
3833  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 3836  echo "$as_me: error: The pkg-config scri
3836  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
3837  path to pkg-config.  path to pkg-config.
3838    
3839  Alternatively, you may set the environment variables gpsbt_CFLAGS  Alternatively, you may set the environment variables liblocation_CFLAGS
3840  and gpsbt_LIBS to avoid the need to call pkg-config.  and liblocation_LIBS to avoid the need to call pkg-config.
3841  See the pkg-config man page for more details.  See the pkg-config man page for more details.
3842    
3843  To get pkg-config, see <http://pkg-config.freedesktop.org/>.  To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3844  See \`config.log' for more details." >&2;}  See \`config.log' for more details." >&2;}
3845     { (exit 1); exit 1; }; }     { (exit 1); exit 1; }; }
3846  else  else
3847          gpsbt_CFLAGS=$pkg_cv_gpsbt_CFLAGS          liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS
3848          gpsbt_LIBS=$pkg_cv_gpsbt_LIBS          liblocation_LIBS=$pkg_cv_liblocation_LIBS
3849          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3850  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3851          :          :
3852  fi  fi
3853        CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"        CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
3854        LIBS="$LIBS $gpsbt_LIBS"        LIBS="$LIBS $liblocation_LIBS"
3855    
3856  else  else
3857    { echo "$as_me:$LINENO: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&5  
3858          { echo "$as_me:$LINENO: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&5
3859  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;}
3860    
3861  fi  fi
3862    
3863  fi  fi
# Line 3786  else Line 3876  else
3876  echo "$as_me: WARNING: No tablet-browser-interface found, disabling microb interface!" >&6;}  echo "$as_me: WARNING: No tablet-browser-interface found, disabling microb interface!" >&6;}
3877  fi  fi
3878    
3879      if test -n "$PKG_CONFIG" && \
3880        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"maemo-version\"") >&5
3881      ($PKG_CONFIG --exists --print-errors "maemo-version") 2>&5
3882      ac_status=$?
3883      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3884      (exit $ac_status); }; then
3885    
3886        VERSION=`pkg-config --modversion maemo-version`
3887        { echo "$as_me:$LINENO: Configuring for Maemo $VERSION" >&5
3888    echo "$as_me: Configuring for Maemo $VERSION" >&6;}
3889        CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
3890        MAJOR=`echo $VERSION | cut -b1 -`
3891        CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
3892    
3893    else
3894    
3895        { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
3896    echo "$as_me: error: maemo-version not found" >&2;}
3897       { (exit 1); exit 1; }; }
3898    
3899    fi
3900    
3901    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
3902    EXTRA_OBJS="dbus.o"    EXTRA_OBJS="dbus.o"
3903    
# Line 3954  else Line 4066  else
4066  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
4067          :          :
4068  fi  fi
4069    CFLAGS="$CFLAGS $gnome2_CFLAGS"    CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
4070    LIBS="$LIBS $gnome2_LIBS -DENABLE_BROWSER_INTERFACE"    LIBS="$LIBS $gnome2_LIBS"
4071    
4072    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
4073    
# Line 4392  exec 6>&1 Line 4504  exec 6>&1
4504  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4505  # values after options handling.  # values after options handling.
4506  ac_log="  ac_log="
4507  This file was extended by OSM2Go $as_me 0.8.13, which was  This file was extended by OSM2Go $as_me 0.7.8, which was
4508  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4509    
4510    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4435  Report bugs to <bug-autoconf@gnu.org>." Line 4547  Report bugs to <bug-autoconf@gnu.org>."
4547  _ACEOF  _ACEOF
4548  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
4549  ac_cs_version="\\  ac_cs_version="\\
4550  OSM2Go config.status 0.8.13  OSM2Go config.status 0.7.8
4551  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
4552    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
4553    
# Line 4650  SET_MAKE!$SET_MAKE$ac_delim Line 4762  SET_MAKE!$SET_MAKE$ac_delim
4762  PKG_CONFIG!$PKG_CONFIG$ac_delim  PKG_CONFIG!$PKG_CONFIG$ac_delim
4763  libcurl_CFLAGS!$libcurl_CFLAGS$ac_delim  libcurl_CFLAGS!$libcurl_CFLAGS$ac_delim
4764  libcurl_LIBS!$libcurl_LIBS$ac_delim  libcurl_LIBS!$libcurl_LIBS$ac_delim
4765    libsoup_CFLAGS!$libsoup_CFLAGS$ac_delim
4766    libsoup_LIBS!$libsoup_LIBS$ac_delim
4767  goocanvas_CFLAGS!$goocanvas_CFLAGS$ac_delim  goocanvas_CFLAGS!$goocanvas_CFLAGS$ac_delim
4768  goocanvas_LIBS!$goocanvas_LIBS$ac_delim  goocanvas_LIBS!$goocanvas_LIBS$ac_delim
4769  gnome_vfs_module_CFLAGS!$gnome_vfs_module_CFLAGS$ac_delim  gnome_vfs_module_CFLAGS!$gnome_vfs_module_CFLAGS$ac_delim
# Line 4662  osso_CFLAGS!$osso_CFLAGS$ac_delim Line 4776  osso_CFLAGS!$osso_CFLAGS$ac_delim
4776  osso_LIBS!$osso_LIBS$ac_delim  osso_LIBS!$osso_LIBS$ac_delim
4777  hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$ac_delim  hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$ac_delim
4778  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  
4779  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
4780  gpsbt_LIBS!$gpsbt_LIBS$ac_delim  gpsbt_LIBS!$gpsbt_LIBS$ac_delim
4781    liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
4782    liblocation_LIBS!$liblocation_LIBS$ac_delim
4783  EXTRA_OBJS!$EXTRA_OBJS$ac_delim  EXTRA_OBJS!$EXTRA_OBJS$ac_delim
4784  INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim  INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim
4785  gtk_CFLAGS!$gtk_CFLAGS$ac_delim  gtk_CFLAGS!$gtk_CFLAGS$ac_delim
# Line 4676  LIBOBJS!$LIBOBJS$ac_delim Line 4790  LIBOBJS!$LIBOBJS$ac_delim
4790  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
4791  _ACEOF  _ACEOF
4792    
4793    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
4794      break      break
4795    elif $ac_last_try; then    elif $ac_last_try; then
4796      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Legend:
Removed from v.118  
changed lines
  Added in v.200