Diff of /trunk/configure

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

revision 183 by harbaum, Tue Jun 23 19:37:02 2009 UTC revision 209 by harbaum, Fri Jul 10 19:45:31 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.7.6.  # Generated by GNU Autoconf 2.61 for OSM2Go 0.7.9.
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.7.6'  PACKAGE_VERSION='0.7.9'
578  PACKAGE_STRING='OSM2Go 0.7.6'  PACKAGE_STRING='OSM2Go 0.7.9'
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 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 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.7.6 to adapt to many kinds of systems.  \`configure' configures OSM2Go 0.7.9 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.7.6:";;       short | recursive ) echo "Configuration of OSM2Go 0.7.9:";;
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 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.7.6  OSM2Go configure 0.7.9
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.7.6, which was  It was created by OSM2Go $as_me 0.7.9, 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: WARNING: libsoup-2.4 missing, disabling internal map" >&5
3106    echo "$as_me: WARNING: libsoup-2.4 missing, disabling internal map" >&6;}
3107    elif test $pkg_failed = untried; then
3108            { echo "$as_me:$LINENO: WARNING: libsoup-2.4 missing, disabling internal map" >&5
3109    echo "$as_me: WARNING: libsoup-2.4 missing, disabling internal map" >&6;}
3110    else
3111            libsoup_CFLAGS=$pkg_cv_libsoup_CFLAGS
3112            libsoup_LIBS=$pkg_cv_libsoup_LIBS
3113            { echo "$as_me:$LINENO: result: yes" >&5
3114    echo "${ECHO_T}yes" >&6; }
3115    
3116      EXTRA_OBJS="$EXTRA_OBJS  converter.o osm-gps-map.o"
3117      CFLAGS="$CFLAGS $libsoup_CFLAGS -DENABLE_OSM_GPS_MAP"
3118      LIBS="$LIBS $libsoup_LIBS"
3119    
3120    fi
3121    
3122  # check for goocanvas  # check for goocanvas
3123    
3124  pkg_failed=no  pkg_failed=no
# Line 3812  echo "$as_me: error: maemo-version not f Line 3899  echo "$as_me: error: maemo-version not f
3899  fi  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="$EXTRA_OBJS dbus.o"
3903    
3904    
3905    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
# Line 4417  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.7.6, which was  This file was extended by OSM2Go $as_me 0.7.9, 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 4460  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.7.6  OSM2Go config.status 0.7.9
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 4675  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 4701  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.183  
changed lines
  Added in v.209