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 215 by harbaum, Sun Jul 12 20:01:14 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.10.
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.10'
578  PACKAGE_STRING='OSM2Go 0.7.6'  PACKAGE_STRING='OSM2Go 0.7.10'
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    libsoup24_CFLAGS
636    libsoup24_LIBS
637    libsoup22_CFLAGS
638    libsoup22_LIBS
639  goocanvas_CFLAGS  goocanvas_CFLAGS
640  goocanvas_LIBS  goocanvas_LIBS
641  gnome_vfs_module_CFLAGS  gnome_vfs_module_CFLAGS
# Line 668  CPPFLAGS Line 672  CPPFLAGS
672  PKG_CONFIG  PKG_CONFIG
673  libcurl_CFLAGS  libcurl_CFLAGS
674  libcurl_LIBS  libcurl_LIBS
675    libsoup24_CFLAGS
676    libsoup24_LIBS
677    libsoup22_CFLAGS
678    libsoup22_LIBS
679  goocanvas_CFLAGS  goocanvas_CFLAGS
680  goocanvas_LIBS  goocanvas_LIBS
681  gnome_vfs_module_CFLAGS  gnome_vfs_module_CFLAGS
# Line 1190  if test "$ac_init_help" = "long"; then Line 1198  if test "$ac_init_help" = "long"; then
1198    # Omit some internal or obsolete options to make the list less imposing.    # Omit some internal or obsolete options to make the list less imposing.
1199    # 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.
1200    cat <<_ACEOF    cat <<_ACEOF
1201  \`configure' configures OSM2Go 0.7.6 to adapt to many kinds of systems.  \`configure' configures OSM2Go 0.7.10 to adapt to many kinds of systems.
1202    
1203  Usage: $0 [OPTION]... [VAR=VALUE]...  Usage: $0 [OPTION]... [VAR=VALUE]...
1204    
# Line 1251  fi Line 1259  fi
1259    
1260  if test -n "$ac_init_help"; then  if test -n "$ac_init_help"; then
1261    case $ac_init_help in    case $ac_init_help in
1262       short | recursive ) echo "Configuration of OSM2Go 0.7.6:";;       short | recursive ) echo "Configuration of OSM2Go 0.7.10:";;
1263     esac     esac
1264    cat <<\_ACEOF    cat <<\_ACEOF
1265    
# Line 1268  Some influential environment variables: Line 1276  Some influential environment variables:
1276                C compiler flags for libcurl, overriding pkg-config                C compiler flags for libcurl, overriding pkg-config
1277    libcurl_LIBS    libcurl_LIBS
1278                linker flags for libcurl, overriding pkg-config                linker flags for libcurl, overriding pkg-config
1279      libsoup24_CFLAGS
1280                  C compiler flags for libsoup24, overriding pkg-config
1281      libsoup24_LIBS
1282                  linker flags for libsoup24, overriding pkg-config
1283      libsoup22_CFLAGS
1284                  C compiler flags for libsoup22, overriding pkg-config
1285      libsoup22_LIBS
1286                  linker flags for libsoup22, overriding pkg-config
1287    goocanvas_CFLAGS    goocanvas_CFLAGS
1288                C compiler flags for goocanvas, overriding pkg-config                C compiler flags for goocanvas, overriding pkg-config
1289    goocanvas_LIBS    goocanvas_LIBS
# Line 1366  fi Line 1382  fi
1382  test -n "$ac_init_help" && exit $ac_status  test -n "$ac_init_help" && exit $ac_status
1383  if $ac_init_version; then  if $ac_init_version; then
1384    cat <<\_ACEOF    cat <<\_ACEOF
1385  OSM2Go configure 0.7.6  OSM2Go configure 0.7.10
1386  generated by GNU Autoconf 2.61  generated by GNU Autoconf 2.61
1387    
1388  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 1396  cat >config.log <<_ACEOF
1396  This file contains any messages produced by compilers while  This file contains any messages produced by compilers while
1397  running configure, to aid debugging if configure makes a mistake.  running configure, to aid debugging if configure makes a mistake.
1398    
1399  It was created by OSM2Go $as_me 0.7.6, which was  It was created by OSM2Go $as_me 0.7.10, which was
1400  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
1401    
1402    $ $0 $@    $ $0 $@
# Line 3032  fi Line 3048  fi
3048  CFLAGS="$CFLAGS $libcurl_CFLAGS"  CFLAGS="$CFLAGS $libcurl_CFLAGS"
3049  LIBS="$LIBS $libcurl_LIBS"  LIBS="$LIBS $libcurl_LIBS"
3050    
3051    # check for libsoup
3052    
3053    pkg_failed=no
3054    { echo "$as_me:$LINENO: checking for libsoup24" >&5
3055    echo $ECHO_N "checking for libsoup24... $ECHO_C" >&6; }
3056    
3057    if test -n "$PKG_CONFIG"; then
3058        if test -n "$libsoup24_CFLAGS"; then
3059            pkg_cv_libsoup24_CFLAGS="$libsoup24_CFLAGS"
3060        else
3061            if test -n "$PKG_CONFIG" && \
3062        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
3063      ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
3064      ac_status=$?
3065      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3066      (exit $ac_status); }; then
3067      pkg_cv_libsoup24_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
3068    else
3069      pkg_failed=yes
3070    fi
3071        fi
3072    else
3073            pkg_failed=untried
3074    fi
3075    if test -n "$PKG_CONFIG"; then
3076        if test -n "$libsoup24_LIBS"; then
3077            pkg_cv_libsoup24_LIBS="$libsoup24_LIBS"
3078        else
3079            if test -n "$PKG_CONFIG" && \
3080        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
3081      ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
3082      ac_status=$?
3083      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3084      (exit $ac_status); }; then
3085      pkg_cv_libsoup24_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
3086    else
3087      pkg_failed=yes
3088    fi
3089        fi
3090    else
3091            pkg_failed=untried
3092    fi
3093    
3094    
3095    
3096    if test $pkg_failed = yes; then
3097    
3098    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3099            _pkg_short_errors_supported=yes
3100    else
3101            _pkg_short_errors_supported=no
3102    fi
3103            if test $_pkg_short_errors_supported = yes; then
3104                    libsoup24_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
3105            else
3106                    libsoup24_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
3107            fi
3108            # Put the nasty error message in config.log where it belongs
3109            echo "$libsoup24_PKG_ERRORS" >&5
3110    
3111            { echo "$as_me:$LINENO: result: no" >&5
3112    echo "${ECHO_T}no" >&6; }
3113    
3114    
3115    pkg_failed=no
3116    { echo "$as_me:$LINENO: checking for libsoup22" >&5
3117    echo $ECHO_N "checking for libsoup22... $ECHO_C" >&6; }
3118    
3119    if test -n "$PKG_CONFIG"; then
3120        if test -n "$libsoup22_CFLAGS"; then
3121            pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
3122        else
3123            if test -n "$PKG_CONFIG" && \
3124        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3125      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3126      ac_status=$?
3127      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3128      (exit $ac_status); }; then
3129      pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
3130    else
3131      pkg_failed=yes
3132    fi
3133        fi
3134    else
3135            pkg_failed=untried
3136    fi
3137    if test -n "$PKG_CONFIG"; then
3138        if test -n "$libsoup22_LIBS"; then
3139            pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
3140        else
3141            if test -n "$PKG_CONFIG" && \
3142        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3143      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3144      ac_status=$?
3145      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3146      (exit $ac_status); }; then
3147      pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
3148    else
3149      pkg_failed=yes
3150    fi
3151        fi
3152    else
3153            pkg_failed=untried
3154    fi
3155    
3156    
3157    
3158    if test $pkg_failed = yes; then
3159    
3160    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3161            _pkg_short_errors_supported=yes
3162    else
3163            _pkg_short_errors_supported=no
3164    fi
3165            if test $_pkg_short_errors_supported = yes; then
3166                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2"`
3167            else
3168                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2"`
3169            fi
3170            # Put the nasty error message in config.log where it belongs
3171            echo "$libsoup22_PKG_ERRORS" >&5
3172    
3173            { echo "$as_me:$LINENO: result: no" >&5
3174    echo "${ECHO_T}no" >&6; }
3175    
3176        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3177    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3178    
3179    elif test $pkg_failed = untried; then
3180    
3181        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3182    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3183    
3184    else
3185            libsoup22_CFLAGS=$pkg_cv_libsoup22_CFLAGS
3186            libsoup22_LIBS=$pkg_cv_libsoup22_LIBS
3187            { echo "$as_me:$LINENO: result: yes" >&5
3188    echo "${ECHO_T}yes" >&6; }
3189    
3190        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o"
3191        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3192        LIBS="$LIBS $libsoup22_LIBS"
3193    
3194    fi
3195    
3196    elif test $pkg_failed = untried; then
3197    
3198    
3199    pkg_failed=no
3200    { echo "$as_me:$LINENO: checking for libsoup22" >&5
3201    echo $ECHO_N "checking for libsoup22... $ECHO_C" >&6; }
3202    
3203    if test -n "$PKG_CONFIG"; then
3204        if test -n "$libsoup22_CFLAGS"; then
3205            pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
3206        else
3207            if test -n "$PKG_CONFIG" && \
3208        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3209      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3210      ac_status=$?
3211      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3212      (exit $ac_status); }; then
3213      pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
3214    else
3215      pkg_failed=yes
3216    fi
3217        fi
3218    else
3219            pkg_failed=untried
3220    fi
3221    if test -n "$PKG_CONFIG"; then
3222        if test -n "$libsoup22_LIBS"; then
3223            pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
3224        else
3225            if test -n "$PKG_CONFIG" && \
3226        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3227      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3228      ac_status=$?
3229      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3230      (exit $ac_status); }; then
3231      pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
3232    else
3233      pkg_failed=yes
3234    fi
3235        fi
3236    else
3237            pkg_failed=untried
3238    fi
3239    
3240    
3241    
3242    if test $pkg_failed = yes; then
3243    
3244    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3245            _pkg_short_errors_supported=yes
3246    else
3247            _pkg_short_errors_supported=no
3248    fi
3249            if test $_pkg_short_errors_supported = yes; then
3250                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2"`
3251            else
3252                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2"`
3253            fi
3254            # Put the nasty error message in config.log where it belongs
3255            echo "$libsoup22_PKG_ERRORS" >&5
3256    
3257            { echo "$as_me:$LINENO: result: no" >&5
3258    echo "${ECHO_T}no" >&6; }
3259    
3260        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3261    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3262    
3263    elif test $pkg_failed = untried; then
3264    
3265        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3266    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3267    
3268    else
3269            libsoup22_CFLAGS=$pkg_cv_libsoup22_CFLAGS
3270            libsoup22_LIBS=$pkg_cv_libsoup22_LIBS
3271            { echo "$as_me:$LINENO: result: yes" >&5
3272    echo "${ECHO_T}yes" >&6; }
3273    
3274        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o"
3275        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3276        LIBS="$LIBS $libsoup22_LIBS"
3277    
3278    fi
3279    
3280    else
3281            libsoup24_CFLAGS=$pkg_cv_libsoup24_CFLAGS
3282            libsoup24_LIBS=$pkg_cv_libsoup24_LIBS
3283            { echo "$as_me:$LINENO: result: yes" >&5
3284    echo "${ECHO_T}yes" >&6; }
3285    
3286      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o"
3287      CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
3288      LIBS="$LIBS $libsoup24_LIBS"
3289    
3290    fi
3291    
3292  # check for goocanvas  # check for goocanvas
3293    
3294  pkg_failed=no  pkg_failed=no
# Line 3812  echo "$as_me: error: maemo-version not f Line 4069  echo "$as_me: error: maemo-version not f
4069  fi  fi
4070    
4071    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
4072    EXTRA_OBJS="dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
4073    
4074    
4075    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
# Line 4417  exec 6>&1 Line 4674  exec 6>&1
4674  # report actual input values of CONFIG_FILES etc. instead of their  # report actual input values of CONFIG_FILES etc. instead of their
4675  # values after options handling.  # values after options handling.
4676  ac_log="  ac_log="
4677  This file was extended by OSM2Go $as_me 0.7.6, which was  This file was extended by OSM2Go $as_me 0.7.10, which was
4678  generated by GNU Autoconf 2.61.  Invocation command line was  generated by GNU Autoconf 2.61.  Invocation command line was
4679    
4680    CONFIG_FILES    = $CONFIG_FILES    CONFIG_FILES    = $CONFIG_FILES
# Line 4460  Report bugs to <bug-autoconf@gnu.org>." Line 4717  Report bugs to <bug-autoconf@gnu.org>."
4717  _ACEOF  _ACEOF
4718  cat >>$CONFIG_STATUS <<_ACEOF  cat >>$CONFIG_STATUS <<_ACEOF
4719  ac_cs_version="\\  ac_cs_version="\\
4720  OSM2Go config.status 0.7.6  OSM2Go config.status 0.7.10
4721  configured by $0, generated by GNU Autoconf 2.61,  configured by $0, generated by GNU Autoconf 2.61,
4722    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"    with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
4723    
# Line 4675  SET_MAKE!$SET_MAKE$ac_delim Line 4932  SET_MAKE!$SET_MAKE$ac_delim
4932  PKG_CONFIG!$PKG_CONFIG$ac_delim  PKG_CONFIG!$PKG_CONFIG$ac_delim
4933  libcurl_CFLAGS!$libcurl_CFLAGS$ac_delim  libcurl_CFLAGS!$libcurl_CFLAGS$ac_delim
4934  libcurl_LIBS!$libcurl_LIBS$ac_delim  libcurl_LIBS!$libcurl_LIBS$ac_delim
4935    libsoup24_CFLAGS!$libsoup24_CFLAGS$ac_delim
4936    libsoup24_LIBS!$libsoup24_LIBS$ac_delim
4937    libsoup22_CFLAGS!$libsoup22_CFLAGS$ac_delim
4938    libsoup22_LIBS!$libsoup22_LIBS$ac_delim
4939  goocanvas_CFLAGS!$goocanvas_CFLAGS$ac_delim  goocanvas_CFLAGS!$goocanvas_CFLAGS$ac_delim
4940  goocanvas_LIBS!$goocanvas_LIBS$ac_delim  goocanvas_LIBS!$goocanvas_LIBS$ac_delim
4941  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 4962  LIBOBJS!$LIBOBJS$ac_delim
4962  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
4963  _ACEOF  _ACEOF
4964    
4965    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` = 81; then
4966      break      break
4967    elif $ac_last_try; then    elif $ac_last_try; then
4968      { { 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.215