Diff of /trunk/configure

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

revision 112 by harbaum, Fri Mar 6 13:41:08 2009 UTC revision 183 by harbaum, Tue Jun 23 19:37:02 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.6.
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.6'
578  PACKAGE_STRING='OSM2Go 0.8.13'  PACKAGE_STRING='OSM2Go 0.7.6'
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 646  hildon_fm_2_CFLAGS Line 646  hildon_fm_2_CFLAGS
646  hildon_fm_2_LIBS  hildon_fm_2_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  hildon_fm_2_CFLAGS Line 682  hildon_fm_2_CFLAGS
682  hildon_fm_2_LIBS  hildon_fm_2_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 1186  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.8.13 to adapt to many kinds of systems.  \`configure' configures OSM2Go 0.7.6 to adapt to many kinds of systems.
1194    
1195  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1196    
# Line 1247  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.8.13:";;       short | recursive ) echo "Configuration of OSM2Go 0.7.6:";;
1255     esac     esac
1256    cat <<\_ACEOF    cat <<\_ACEOF
1257    
# Line 1288  Some influential environment variables: Line 1292  Some influential environment variables:
1292    gpsbt_CFLAGS    gpsbt_CFLAGS
1293                C compiler flags for gpsbt, overriding pkg-config                C compiler flags for gpsbt, overriding pkg-config
1294    gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config    gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config
1295      liblocation_CFLAGS
1296                  C compiler flags for liblocation, overriding pkg-config
1297      liblocation_LIBS
1298                  linker flags for liblocation, 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 1358  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.8.13  OSM2Go configure 0.7.6
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 1372  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.8.13, which was  It was created by OSM2Go $as_me 0.7.6, 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 3509  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 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 \"gps-bt\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3524    ($PKG_CONFIG --exists --print-errors "gps-bt") 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
# Line 3631  fi Line 3641  fi
3641      LIBS="$LIBS $gpsbt_LIBS"      LIBS="$LIBS $gpsbt_LIBS"
3642    
3643  else  else
3644    { echo "$as_me:$LINENO: WARNING: No gpsbt found, disabling gps auto start!" >&5  
3645  echo "$as_me: WARNING: No gpsbt found, disabling gps auto start!" >&6;}      { echo "$as_me:$LINENO: gpsbt not found, trying liblocation" >&5
3646    echo "$as_me: gpsbt not found, trying liblocation" >&6;}
3647    
3648        if test -n "$PKG_CONFIG" && \
3649        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3650      ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3651      ac_status=$?
3652      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3653      (exit $ac_status); }; then
3654    
3655    
3656    pkg_failed=no
3657    { echo "$as_me:$LINENO: checking for liblocation" >&5
3658    echo $ECHO_N "checking for liblocation... $ECHO_C" >&6; }
3659    
3660    if test -n "$PKG_CONFIG"; then
3661        if test -n "$liblocation_CFLAGS"; then
3662            pkg_cv_liblocation_CFLAGS="$liblocation_CFLAGS"
3663        else
3664            if test -n "$PKG_CONFIG" && \
3665        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3666      ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3667      ac_status=$?
3668      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3669      (exit $ac_status); }; then
3670      pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`
3671    else
3672      pkg_failed=yes
3673    fi
3674        fi
3675    else
3676            pkg_failed=untried
3677    fi
3678    if test -n "$PKG_CONFIG"; then
3679        if test -n "$liblocation_LIBS"; then
3680            pkg_cv_liblocation_LIBS="$liblocation_LIBS"
3681        else
3682            if test -n "$PKG_CONFIG" && \
3683        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3684      ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3685      ac_status=$?
3686      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3687      (exit $ac_status); }; then
3688      pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`
3689    else
3690      pkg_failed=yes
3691    fi
3692        fi
3693    else
3694            pkg_failed=untried
3695    fi
3696    
3697    
3698    
3699    if test $pkg_failed = yes; then
3700    
3701    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3702            _pkg_short_errors_supported=yes
3703    else
3704            _pkg_short_errors_supported=no
3705    fi
3706            if test $_pkg_short_errors_supported = yes; then
3707                    liblocation_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "liblocation"`
3708            else
3709                    liblocation_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liblocation"`
3710            fi
3711            # Put the nasty error message in config.log where it belongs
3712            echo "$liblocation_PKG_ERRORS" >&5
3713    
3714            { { echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:
3715    
3716    $liblocation_PKG_ERRORS
3717    
3718    Consider adjusting the PKG_CONFIG_PATH environment variable if you
3719    installed software in a non-standard prefix.
3720    
3721    Alternatively, you may set the environment variables liblocation_CFLAGS
3722    and liblocation_LIBS to avoid the need to call pkg-config.
3723    See the pkg-config man page for more details.
3724    " >&5
3725    echo "$as_me: error: Package requirements (liblocation) were not met:
3726    
3727    $liblocation_PKG_ERRORS
3728    
3729    Consider adjusting the PKG_CONFIG_PATH environment variable if you
3730    installed software in a non-standard prefix.
3731    
3732    Alternatively, you may set the environment variables liblocation_CFLAGS
3733    and liblocation_LIBS to avoid the need to call pkg-config.
3734    See the pkg-config man page for more details.
3735    " >&2;}
3736       { (exit 1); exit 1; }; }
3737    elif test $pkg_failed = untried; then
3738            { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
3739    is in your PATH or set the PKG_CONFIG environment variable to the full
3740    path to pkg-config.
3741    
3742    Alternatively, you may set the environment variables liblocation_CFLAGS
3743    and liblocation_LIBS to avoid the need to call pkg-config.
3744    See the pkg-config man page for more details.
3745    
3746    To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3747    See \`config.log' for more details." >&5
3748    echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
3749    is in your PATH or set the PKG_CONFIG environment variable to the full
3750    path to pkg-config.
3751    
3752    Alternatively, you may set the environment variables liblocation_CFLAGS
3753    and liblocation_LIBS to avoid the need to call pkg-config.
3754    See the pkg-config man page for more details.
3755    
3756    To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3757    See \`config.log' for more details." >&2;}
3758       { (exit 1); exit 1; }; }
3759    else
3760            liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS
3761            liblocation_LIBS=$pkg_cv_liblocation_LIBS
3762            { echo "$as_me:$LINENO: result: yes" >&5
3763    echo "${ECHO_T}yes" >&6; }
3764            :
3765    fi
3766          CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
3767          LIBS="$LIBS $liblocation_LIBS"
3768    
3769    else
3770    
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;}
3773    
3774    fi
3775    
3776  fi  fi
3777    
3778    if test -n "$PKG_CONFIG" && \    if test -n "$PKG_CONFIG" && \
3779      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tablet_browser_interface\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tablet-browser-interface\"") >&5
3780    ($PKG_CONFIG --exists --print-errors "tablet_browser_interface") 2>&5    ($PKG_CONFIG --exists --print-errors "tablet-browser-interface") 2>&5
3781    ac_status=$?    ac_status=$?
3782    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3783    (exit $ac_status); }; then    (exit $ac_status); }; then
# Line 3645  fi Line 3785  fi
3785      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
3786    
3787  else  else
3788    { echo "$as_me:$LINENO: WARNING: No table-browser-interface found, disabling microb interface!" >&5    { echo "$as_me:$LINENO: WARNING: No tablet-browser-interface found, disabling microb interface!" >&5
3789  echo "$as_me: WARNING: No table-browser-interface found, disabling microb interface!" >&6;}  echo "$as_me: WARNING: No tablet-browser-interface found, disabling microb interface!" >&6;}
3790    fi
3791    
3792      if test -n "$PKG_CONFIG" && \
3793        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"maemo-version\"") >&5
3794      ($PKG_CONFIG --exists --print-errors "maemo-version") 2>&5
3795      ac_status=$?
3796      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3797      (exit $ac_status); }; then
3798    
3799        VERSION=`pkg-config --modversion maemo-version`
3800        { echo "$as_me:$LINENO: Configuring for Maemo $VERSION" >&5
3801    echo "$as_me: Configuring for Maemo $VERSION" >&6;}
3802        CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
3803        MAJOR=`echo $VERSION | cut -b1 -`
3804        CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
3805    
3806    else
3807    
3808        { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
3809    echo "$as_me: error: maemo-version not found" >&2;}
3810       { (exit 1); exit 1; }; }
3811    
3812  fi  fi
3813    
3814    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
# Line 3817  else Line 3979  else
3979  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3980          :          :
3981  fi  fi
3982    CFLAGS="$CFLAGS $gnome2_CFLAGS"    CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
3983    LIBS="$LIBS $gnome2_LIBS -DENABLE_BROWSER_INTERFACE"    LIBS="$LIBS $gnome2_LIBS"
3984    
3985    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
3986    
# Line 4255  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.8.13, which was  This file was extended by OSM2Go $as_me 0.7.6, 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 4298  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.8.13  OSM2Go config.status 0.7.6
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 4527  hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$a Line 4689  hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$a
4689  hildon_fm_2_LIBS!$hildon_fm_2_LIBS$ac_delim  hildon_fm_2_LIBS!$hildon_fm_2_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
# Line 4537  LIBOBJS!$LIBOBJS$ac_delim Line 4701  LIBOBJS!$LIBOBJS$ac_delim
4701  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
4702  _ACEOF  _ACEOF
4703    
4704    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 75; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
4705      break      break
4706    elif $ac_last_try; then    elif $ac_last_try; then
4707      { { 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.112  
changed lines
  Added in v.183