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 129 by achadwick, Sat Mar 21 02:11:55 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.6.14.
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.6.14'
578  PACKAGE_STRING='OSM2Go 0.8.13'  PACKAGE_STRING='OSM2Go 0.6.14'
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
647    liblocation_CFLAGS
648    liblocation_LIBS
649  gpsbt_CFLAGS  gpsbt_CFLAGS
650  gpsbt_LIBS  gpsbt_LIBS
651  EXTRA_OBJS  EXTRA_OBJS
# Line 678  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
683    liblocation_CFLAGS
684    liblocation_LIBS
685  gpsbt_CFLAGS  gpsbt_CFLAGS
686  gpsbt_LIBS  gpsbt_LIBS
687  gtk_CFLAGS  gtk_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.6.14 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.6.14:";;
1255     esac     esac
1256    cat <<\_ACEOF    cat <<\_ACEOF
1257    
# Line 1285  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      liblocation_CFLAGS
1293                  C compiler flags for liblocation, overriding pkg-config
1294      liblocation_LIBS
1295                  linker flags for liblocation, overriding pkg-config
1296    gpsbt_CFLAGS    gpsbt_CFLAGS
1297                C compiler flags for gpsbt, overriding pkg-config                C compiler flags for gpsbt, overriding pkg-config
1298    gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config    gpsbt_LIBS  linker flags for gpsbt, overriding pkg-config
# 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.6.14
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.6.14, 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 liblocation over gpsbt to control gps
3521    if test -n "$PKG_CONFIG" && \    if test -n "$PKG_CONFIG" && \
3522      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gps-bt\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3523    ($PKG_CONFIG --exists --print-errors "gps-bt") 2>&5    ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3524      ac_status=$?
3525      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3526      (exit $ac_status); }; then
3527    
3528    
3529    pkg_failed=no
3530    { echo "$as_me:$LINENO: checking for liblocation" >&5
3531    echo $ECHO_N "checking for liblocation... $ECHO_C" >&6; }
3532    
3533    if test -n "$PKG_CONFIG"; then
3534        if test -n "$liblocation_CFLAGS"; then
3535            pkg_cv_liblocation_CFLAGS="$liblocation_CFLAGS"
3536        else
3537            if test -n "$PKG_CONFIG" && \
3538        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3539      ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3540      ac_status=$?
3541      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3542      (exit $ac_status); }; then
3543      pkg_cv_liblocation_CFLAGS=`$PKG_CONFIG --cflags "liblocation" 2>/dev/null`
3544    else
3545      pkg_failed=yes
3546    fi
3547        fi
3548    else
3549            pkg_failed=untried
3550    fi
3551    if test -n "$PKG_CONFIG"; then
3552        if test -n "$liblocation_LIBS"; then
3553            pkg_cv_liblocation_LIBS="$liblocation_LIBS"
3554        else
3555            if test -n "$PKG_CONFIG" && \
3556        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"liblocation\"") >&5
3557      ($PKG_CONFIG --exists --print-errors "liblocation") 2>&5
3558      ac_status=$?
3559      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3560      (exit $ac_status); }; then
3561      pkg_cv_liblocation_LIBS=`$PKG_CONFIG --libs "liblocation" 2>/dev/null`
3562    else
3563      pkg_failed=yes
3564    fi
3565        fi
3566    else
3567            pkg_failed=untried
3568    fi
3569    
3570    
3571    
3572    if test $pkg_failed = yes; then
3573    
3574    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3575            _pkg_short_errors_supported=yes
3576    else
3577            _pkg_short_errors_supported=no
3578    fi
3579            if test $_pkg_short_errors_supported = yes; then
3580                    liblocation_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "liblocation"`
3581            else
3582                    liblocation_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "liblocation"`
3583            fi
3584            # Put the nasty error message in config.log where it belongs
3585            echo "$liblocation_PKG_ERRORS" >&5
3586    
3587            { { echo "$as_me:$LINENO: error: Package requirements (liblocation) were not met:
3588    
3589    $liblocation_PKG_ERRORS
3590    
3591    Consider adjusting the PKG_CONFIG_PATH environment variable if you
3592    installed software in a non-standard prefix.
3593    
3594    Alternatively, you may set the environment variables liblocation_CFLAGS
3595    and liblocation_LIBS to avoid the need to call pkg-config.
3596    See the pkg-config man page for more details.
3597    " >&5
3598    echo "$as_me: error: Package requirements (liblocation) were not met:
3599    
3600    $liblocation_PKG_ERRORS
3601    
3602    Consider adjusting the PKG_CONFIG_PATH environment variable if you
3603    installed software in a non-standard prefix.
3604    
3605    Alternatively, you may set the environment variables liblocation_CFLAGS
3606    and liblocation_LIBS to avoid the need to call pkg-config.
3607    See the pkg-config man page for more details.
3608    " >&2;}
3609       { (exit 1); exit 1; }; }
3610    elif test $pkg_failed = untried; then
3611            { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
3612    is in your PATH or set the PKG_CONFIG environment variable to the full
3613    path to pkg-config.
3614    
3615    Alternatively, you may set the environment variables liblocation_CFLAGS
3616    and liblocation_LIBS to avoid the need to call pkg-config.
3617    See the pkg-config man page for more details.
3618    
3619    To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3620    See \`config.log' for more details." >&5
3621    echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
3622    is in your PATH or set the PKG_CONFIG environment variable to the full
3623    path to pkg-config.
3624    
3625    Alternatively, you may set the environment variables liblocation_CFLAGS
3626    and liblocation_LIBS to avoid the need to call pkg-config.
3627    See the pkg-config man page for more details.
3628    
3629    To get pkg-config, see <http://pkg-config.freedesktop.org/>.
3630    See \`config.log' for more details." >&2;}
3631       { (exit 1); exit 1; }; }
3632    else
3633            liblocation_CFLAGS=$pkg_cv_liblocation_CFLAGS
3634            liblocation_LIBS=$pkg_cv_liblocation_LIBS
3635            { echo "$as_me:$LINENO: result: yes" >&5
3636    echo "${ECHO_T}yes" >&6; }
3637            :
3638    fi
3639        CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
3640        LIBS="$LIBS $liblocation_LIBS"
3641    
3642    else
3643    
3644        { echo "$as_me:$LINENO: WARNING: liblocation not found, trying deprecated gpsbt" >&5
3645    echo "$as_me: WARNING: liblocation not found, trying deprecated gpsbt" >&6;}
3646    
3647        if test -n "$PKG_CONFIG" && \
3648        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gpsbt\"") >&5
3649      ($PKG_CONFIG --exists --print-errors "gpsbt") 2>&5
3650    ac_status=$?    ac_status=$?
3651    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3652    (exit $ac_status); }; then    (exit $ac_status); }; then
# Line 3627  else Line 3762  else
3762  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3763          :          :
3764  fi  fi
3765      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"        CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
3766      LIBS="$LIBS $gpsbt_LIBS"        LIBS="$LIBS $gpsbt_LIBS"
3767    
3768  else  else
3769    { echo "$as_me:$LINENO: WARNING: No gpsbt found, disabling gps auto start!" >&5    { echo "$as_me:$LINENO: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&5
3770  echo "$as_me: WARNING: No gpsbt found, disabling gps auto start!" >&6;}  echo "$as_me: WARNING: No liblocation nor gpsbt found, disabling gps auto start!" >&6;}
3771    fi
3772    
3773  fi  fi
3774    
3775    if test -n "$PKG_CONFIG" && \    if test -n "$PKG_CONFIG" && \
3776      { (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
3777    ($PKG_CONFIG --exists --print-errors "tablet_browser_interface") 2>&5    ($PKG_CONFIG --exists --print-errors "tablet-browser-interface") 2>&5
3778    ac_status=$?    ac_status=$?
3779    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3780    (exit $ac_status); }; then    (exit $ac_status); }; then
# Line 3645  fi Line 3782  fi
3782      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
3783    
3784  else  else
3785    { 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
3786  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;}
3787    fi
3788    
3789      if test -n "$PKG_CONFIG" && \
3790        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"maemo-version\"") >&5
3791      ($PKG_CONFIG --exists --print-errors "maemo-version") 2>&5
3792      ac_status=$?
3793      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3794      (exit $ac_status); }; then
3795    
3796        VERSION=`pkg-config --modversion maemo-version`
3797        { echo "$as_me:$LINENO: Configuring for Maemo $VERSION" >&5
3798    echo "$as_me: Configuring for Maemo $VERSION" >&6;}
3799        CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
3800        MAJOR=`echo $VERSION | cut -b1 -`
3801        CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
3802    
3803    else
3804    
3805        { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
3806    echo "$as_me: error: maemo-version not found" >&2;}
3807       { (exit 1); exit 1; }; }
3808    
3809  fi  fi
3810    
3811    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
# Line 4255  exec 6>&1 Line 4414  exec 6>&1
4414  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4415  # values after options handling.  # values after options handling.
4416  ac_log="  ac_log="
4417  This file was extended by OSM2Go $as_me 0.8.13, which was  This file was extended by OSM2Go $as_me 0.6.14, which was
4418  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4419    
4420    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4298  Report bugs to <bug-autoconf@gnu.org>." Line 4457  Report bugs to <bug-autoconf@gnu.org>."
4457  _ACEOF  _ACEOF
4458  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
4459  ac_cs_version="\\  ac_cs_version="\\
4460  OSM2Go config.status 0.8.13  OSM2Go config.status 0.6.14
4461  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
4462    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
4463    
# Line 4525  osso_CFLAGS!$osso_CFLAGS$ac_delim Line 4684  osso_CFLAGS!$osso_CFLAGS$ac_delim
4684  osso_LIBS!$osso_LIBS$ac_delim  osso_LIBS!$osso_LIBS$ac_delim
4685  hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$ac_delim  hildon_fm_2_CFLAGS!$hildon_fm_2_CFLAGS$ac_delim
4686  hildon_fm_2_LIBS!$hildon_fm_2_LIBS$ac_delim  hildon_fm_2_LIBS!$hildon_fm_2_LIBS$ac_delim
4687    liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
4688    liblocation_LIBS!$liblocation_LIBS$ac_delim
4689  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim  gpsbt_CFLAGS!$gpsbt_CFLAGS$ac_delim
4690  gpsbt_LIBS!$gpsbt_LIBS$ac_delim  gpsbt_LIBS!$gpsbt_LIBS$ac_delim
4691  EXTRA_OBJS!$EXTRA_OBJS$ac_delim  EXTRA_OBJS!$EXTRA_OBJS$ac_delim
# Line 4537  LIBOBJS!$LIBOBJS$ac_delim Line 4698  LIBOBJS!$LIBOBJS$ac_delim
4698  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
4699  _ACEOF  _ACEOF
4700    
4701    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
4702      break      break
4703    elif $ac_last_try; then    elif $ac_last_try; then
4704      { { 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.129