Diff of /trunk/configure

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

revision 209 by harbaum, Fri Jul 10 19:45:31 2009 UTC revision 212 by harbaum, Sat Jul 11 11:59:58 2009 UTC
# Line 3102  fi Line 3102  fi
3102    
3103          { echo "$as_me:$LINENO: result: no" >&5          { echo "$as_me:$LINENO: result: no" >&5
3104  echo "${ECHO_T}no" >&6; }  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    pkg_failed=no
3108    { echo "$as_me:$LINENO: checking for libsoup" >&5
3109    echo $ECHO_N "checking for libsoup... $ECHO_C" >&6; }
3110    
3111    if test -n "$PKG_CONFIG"; then
3112        if test -n "$libsoup_CFLAGS"; then
3113            pkg_cv_libsoup_CFLAGS="$libsoup_CFLAGS"
3114        else
3115            if test -n "$PKG_CONFIG" && \
3116        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3117      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3118      ac_status=$?
3119      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3120      (exit $ac_status); }; then
3121      pkg_cv_libsoup_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
3122    else
3123      pkg_failed=yes
3124    fi
3125        fi
3126    else
3127            pkg_failed=untried
3128    fi
3129    if test -n "$PKG_CONFIG"; then
3130        if test -n "$libsoup_LIBS"; then
3131            pkg_cv_libsoup_LIBS="$libsoup_LIBS"
3132        else
3133            if test -n "$PKG_CONFIG" && \
3134        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3135      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3136      ac_status=$?
3137      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3138      (exit $ac_status); }; then
3139      pkg_cv_libsoup_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
3140    else
3141      pkg_failed=yes
3142    fi
3143        fi
3144    else
3145            pkg_failed=untried
3146    fi
3147    
3148    
3149    
3150    if test $pkg_failed = yes; then
3151    
3152    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3153            _pkg_short_errors_supported=yes
3154    else
3155            _pkg_short_errors_supported=no
3156    fi
3157            if test $_pkg_short_errors_supported = yes; then
3158                    libsoup_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2"`
3159            else
3160                    libsoup_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2"`
3161            fi
3162            # Put the nasty error message in config.log where it belongs
3163            echo "$libsoup_PKG_ERRORS" >&5
3164    
3165            { echo "$as_me:$LINENO: result: no" >&5
3166    echo "${ECHO_T}no" >&6; }
3167    
3168        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3169    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3170    
3171    elif test $pkg_failed = untried; then
3172    
3173        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3174    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3175    
3176    else
3177            libsoup_CFLAGS=$pkg_cv_libsoup_CFLAGS
3178            libsoup_LIBS=$pkg_cv_libsoup_LIBS
3179            { echo "$as_me:$LINENO: result: yes" >&5
3180    echo "${ECHO_T}yes" >&6; }
3181    
3182        EXTRA_OBJS="$EXTRA_OBJS  converter.o osm-gps-map.o"
3183        CFLAGS="$CFLAGS $libsoup_CFLAGS -DSOUP22 -DENABLE_OSM_GPS_MAP"
3184        LIBS="$LIBS $libsoup_LIBS"
3185    
3186    fi
3187    
3188  elif test $pkg_failed = untried; then  elif test $pkg_failed = untried; then
3189          { echo "$as_me:$LINENO: WARNING: libsoup-2.4 missing, disabling internal map" >&5  
3190  echo "$as_me: WARNING: libsoup-2.4 missing, disabling internal map" >&6;}  
3191    pkg_failed=no
3192    { echo "$as_me:$LINENO: checking for libsoup" >&5
3193    echo $ECHO_N "checking for libsoup... $ECHO_C" >&6; }
3194    
3195    if test -n "$PKG_CONFIG"; then
3196        if test -n "$libsoup_CFLAGS"; then
3197            pkg_cv_libsoup_CFLAGS="$libsoup_CFLAGS"
3198        else
3199            if test -n "$PKG_CONFIG" && \
3200        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3201      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3202      ac_status=$?
3203      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3204      (exit $ac_status); }; then
3205      pkg_cv_libsoup_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
3206    else
3207      pkg_failed=yes
3208    fi
3209        fi
3210    else
3211            pkg_failed=untried
3212    fi
3213    if test -n "$PKG_CONFIG"; then
3214        if test -n "$libsoup_LIBS"; then
3215            pkg_cv_libsoup_LIBS="$libsoup_LIBS"
3216        else
3217            if test -n "$PKG_CONFIG" && \
3218        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3219      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3220      ac_status=$?
3221      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3222      (exit $ac_status); }; then
3223      pkg_cv_libsoup_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
3224    else
3225      pkg_failed=yes
3226    fi
3227        fi
3228    else
3229            pkg_failed=untried
3230    fi
3231    
3232    
3233    
3234    if test $pkg_failed = yes; then
3235    
3236    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3237            _pkg_short_errors_supported=yes
3238    else
3239            _pkg_short_errors_supported=no
3240    fi
3241            if test $_pkg_short_errors_supported = yes; then
3242                    libsoup_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2"`
3243            else
3244                    libsoup_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2"`
3245            fi
3246            # Put the nasty error message in config.log where it belongs
3247            echo "$libsoup_PKG_ERRORS" >&5
3248    
3249            { echo "$as_me:$LINENO: result: no" >&5
3250    echo "${ECHO_T}no" >&6; }
3251    
3252        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3253    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3254    
3255    elif test $pkg_failed = untried; then
3256    
3257        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3258    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3259    
3260    else
3261            libsoup_CFLAGS=$pkg_cv_libsoup_CFLAGS
3262            libsoup_LIBS=$pkg_cv_libsoup_LIBS
3263            { echo "$as_me:$LINENO: result: yes" >&5
3264    echo "${ECHO_T}yes" >&6; }
3265    
3266        EXTRA_OBJS="$EXTRA_OBJS  converter.o osm-gps-map.o"
3267        CFLAGS="$CFLAGS $libsoup_CFLAGS -DSOUP22 -DENABLE_OSM_GPS_MAP"
3268        LIBS="$LIBS $libsoup_LIBS"
3269    
3270    fi
3271    
3272  else  else
3273          libsoup_CFLAGS=$pkg_cv_libsoup_CFLAGS          libsoup_CFLAGS=$pkg_cv_libsoup_CFLAGS
3274          libsoup_LIBS=$pkg_cv_libsoup_LIBS          libsoup_LIBS=$pkg_cv_libsoup_LIBS
Legend:
Removed from v.209  
changed lines
  Added in v.212