Diff of /trunk/configure

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

revision 30 by harbaum, Fri Jul 24 19:24:42 2009 UTC revision 32 by harbaum, Tue Jul 28 13:21:22 2009 UTC
# Line 634  gnome_vfs_module_CFLAGS Line 634  gnome_vfs_module_CFLAGS
634  gnome_vfs_module_LIBS  gnome_vfs_module_LIBS
635  libxml2_CFLAGS  libxml2_CFLAGS
636  libxml2_LIBS  libxml2_LIBS
637    libsoup24_CFLAGS
638    libsoup24_LIBS
639    libsoup22_CFLAGS
640    libsoup22_LIBS
641  libgtkhtml3_14_CFLAGS  libgtkhtml3_14_CFLAGS
642  libgtkhtml3_14_LIBS  libgtkhtml3_14_LIBS
643  libgtkhtml3_8_CFLAGS  libgtkhtml3_8_CFLAGS
# Line 674  gnome_vfs_module_CFLAGS Line 678  gnome_vfs_module_CFLAGS
678  gnome_vfs_module_LIBS  gnome_vfs_module_LIBS
679  libxml2_CFLAGS  libxml2_CFLAGS
680  libxml2_LIBS  libxml2_LIBS
681    libsoup24_CFLAGS
682    libsoup24_LIBS
683    libsoup22_CFLAGS
684    libsoup22_LIBS
685  libgtkhtml3_14_CFLAGS  libgtkhtml3_14_CFLAGS
686  libgtkhtml3_14_LIBS  libgtkhtml3_14_LIBS
687  libgtkhtml3_8_CFLAGS  libgtkhtml3_8_CFLAGS
# Line 1280  Some influential environment variables: Line 1288  Some influential environment variables:
1288                C compiler flags for libxml2, overriding pkg-config                C compiler flags for libxml2, overriding pkg-config
1289    libxml2_LIBS    libxml2_LIBS
1290                linker flags for libxml2, overriding pkg-config                linker flags for libxml2, overriding pkg-config
1291      libsoup24_CFLAGS
1292                  C compiler flags for libsoup24, overriding pkg-config
1293      libsoup24_LIBS
1294                  linker flags for libsoup24, overriding pkg-config
1295      libsoup22_CFLAGS
1296                  C compiler flags for libsoup22, overriding pkg-config
1297      libsoup22_LIBS
1298                  linker flags for libsoup22, overriding pkg-config
1299    libgtkhtml3_14_CFLAGS    libgtkhtml3_14_CFLAGS
1300                C compiler flags for libgtkhtml3_14, overriding pkg-config                C compiler flags for libgtkhtml3_14, overriding pkg-config
1301    libgtkhtml3_14_LIBS    libgtkhtml3_14_LIBS
# Line 3126  echo "${ECHO_T}yes" >&6; } Line 3142  echo "${ECHO_T}yes" >&6; }
3142  fi  fi
3143  CFLAGS="$CFLAGS $libxml2_CFLAGS"  CFLAGS="$CFLAGS $libxml2_CFLAGS"
3144  LIBS="$LIBS $libxml2_LIBS"  LIBS="$LIBS $libxml2_LIBS"
3145    # check for libsoup
3146    
3147    pkg_failed=no
3148    { echo "$as_me:$LINENO: checking for libsoup24" >&5
3149    echo $ECHO_N "checking for libsoup24... $ECHO_C" >&6; }
3150    
3151    if test -n "$PKG_CONFIG"; then
3152        if test -n "$libsoup24_CFLAGS"; then
3153            pkg_cv_libsoup24_CFLAGS="$libsoup24_CFLAGS"
3154        else
3155            if test -n "$PKG_CONFIG" && \
3156        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
3157      ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
3158      ac_status=$?
3159      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3160      (exit $ac_status); }; then
3161      pkg_cv_libsoup24_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
3162    else
3163      pkg_failed=yes
3164    fi
3165        fi
3166    else
3167            pkg_failed=untried
3168    fi
3169    if test -n "$PKG_CONFIG"; then
3170        if test -n "$libsoup24_LIBS"; then
3171            pkg_cv_libsoup24_LIBS="$libsoup24_LIBS"
3172        else
3173            if test -n "$PKG_CONFIG" && \
3174        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
3175      ($PKG_CONFIG --exists --print-errors "libsoup-2.4") 2>&5
3176      ac_status=$?
3177      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3178      (exit $ac_status); }; then
3179      pkg_cv_libsoup24_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
3180    else
3181      pkg_failed=yes
3182    fi
3183        fi
3184    else
3185            pkg_failed=untried
3186    fi
3187    
3188    
3189    
3190    if test $pkg_failed = yes; then
3191    
3192    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3193            _pkg_short_errors_supported=yes
3194    else
3195            _pkg_short_errors_supported=no
3196    fi
3197            if test $_pkg_short_errors_supported = yes; then
3198                    libsoup24_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
3199            else
3200                    libsoup24_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
3201            fi
3202            # Put the nasty error message in config.log where it belongs
3203            echo "$libsoup24_PKG_ERRORS" >&5
3204    
3205            { echo "$as_me:$LINENO: result: no" >&5
3206    echo "${ECHO_T}no" >&6; }
3207    
3208    
3209    pkg_failed=no
3210    { echo "$as_me:$LINENO: checking for libsoup22" >&5
3211    echo $ECHO_N "checking for libsoup22... $ECHO_C" >&6; }
3212    
3213    if test -n "$PKG_CONFIG"; then
3214        if test -n "$libsoup22_CFLAGS"; then
3215            pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
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_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "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    if test -n "$PKG_CONFIG"; then
3232        if test -n "$libsoup22_LIBS"; then
3233            pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
3234        else
3235            if test -n "$PKG_CONFIG" && \
3236        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3237      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3238      ac_status=$?
3239      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3240      (exit $ac_status); }; then
3241      pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
3242    else
3243      pkg_failed=yes
3244    fi
3245        fi
3246    else
3247            pkg_failed=untried
3248    fi
3249    
3250    
3251    
3252    if test $pkg_failed = yes; then
3253    
3254    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3255            _pkg_short_errors_supported=yes
3256    else
3257            _pkg_short_errors_supported=no
3258    fi
3259            if test $_pkg_short_errors_supported = yes; then
3260                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2"`
3261            else
3262                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2"`
3263            fi
3264            # Put the nasty error message in config.log where it belongs
3265            echo "$libsoup22_PKG_ERRORS" >&5
3266    
3267            { echo "$as_me:$LINENO: result: no" >&5
3268    echo "${ECHO_T}no" >&6; }
3269    
3270        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3271    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3272    
3273    elif test $pkg_failed = untried; then
3274    
3275        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3276    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3277    
3278    else
3279            libsoup22_CFLAGS=$pkg_cv_libsoup22_CFLAGS
3280            libsoup22_LIBS=$pkg_cv_libsoup22_LIBS
3281            { echo "$as_me:$LINENO: result: yes" >&5
3282    echo "${ECHO_T}yes" >&6; }
3283    
3284        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
3285        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3286        LIBS="$LIBS $libsoup22_LIBS"
3287    
3288    fi
3289    
3290    elif test $pkg_failed = untried; then
3291    
3292    
3293    pkg_failed=no
3294    { echo "$as_me:$LINENO: checking for libsoup22" >&5
3295    echo $ECHO_N "checking for libsoup22... $ECHO_C" >&6; }
3296    
3297    if test -n "$PKG_CONFIG"; then
3298        if test -n "$libsoup22_CFLAGS"; then
3299            pkg_cv_libsoup22_CFLAGS="$libsoup22_CFLAGS"
3300        else
3301            if test -n "$PKG_CONFIG" && \
3302        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3303      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3304      ac_status=$?
3305      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3306      (exit $ac_status); }; then
3307      pkg_cv_libsoup22_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.2" 2>/dev/null`
3308    else
3309      pkg_failed=yes
3310    fi
3311        fi
3312    else
3313            pkg_failed=untried
3314    fi
3315    if test -n "$PKG_CONFIG"; then
3316        if test -n "$libsoup22_LIBS"; then
3317            pkg_cv_libsoup22_LIBS="$libsoup22_LIBS"
3318        else
3319            if test -n "$PKG_CONFIG" && \
3320        { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.2\"") >&5
3321      ($PKG_CONFIG --exists --print-errors "libsoup-2.2") 2>&5
3322      ac_status=$?
3323      echo "$as_me:$LINENO: \$? = $ac_status" >&5
3324      (exit $ac_status); }; then
3325      pkg_cv_libsoup22_LIBS=`$PKG_CONFIG --libs "libsoup-2.2" 2>/dev/null`
3326    else
3327      pkg_failed=yes
3328    fi
3329        fi
3330    else
3331            pkg_failed=untried
3332    fi
3333    
3334    
3335    
3336    if test $pkg_failed = yes; then
3337    
3338    if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
3339            _pkg_short_errors_supported=yes
3340    else
3341            _pkg_short_errors_supported=no
3342    fi
3343            if test $_pkg_short_errors_supported = yes; then
3344                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.2"`
3345            else
3346                    libsoup22_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.2"`
3347            fi
3348            # Put the nasty error message in config.log where it belongs
3349            echo "$libsoup22_PKG_ERRORS" >&5
3350    
3351            { echo "$as_me:$LINENO: result: no" >&5
3352    echo "${ECHO_T}no" >&6; }
3353    
3354        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3355    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3356    
3357    elif test $pkg_failed = untried; then
3358    
3359        { echo "$as_me:$LINENO: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&5
3360    echo "$as_me: WARNING: libsoup-2.4/2.2 missing, disabling internal map" >&6;}
3361    
3362    else
3363            libsoup22_CFLAGS=$pkg_cv_libsoup22_CFLAGS
3364            libsoup22_LIBS=$pkg_cv_libsoup22_LIBS
3365            { echo "$as_me:$LINENO: result: yes" >&5
3366    echo "${ECHO_T}yes" >&6; }
3367    
3368        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
3369        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
3370        LIBS="$LIBS $libsoup22_LIBS"
3371    
3372    fi
3373    
3374    else
3375            libsoup24_CFLAGS=$pkg_cv_libsoup24_CFLAGS
3376            libsoup24_LIBS=$pkg_cv_libsoup24_LIBS
3377            { echo "$as_me:$LINENO: result: yes" >&5
3378    echo "${ECHO_T}yes" >&6; }
3379    
3380      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
3381      CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
3382      LIBS="$LIBS $libsoup24_LIBS"
3383    
3384    fi
3385    
3386  # check for gtkhtml-3.14  # check for gtkhtml-3.14
3387    
# Line 4242  fi Line 4498  fi
4498    
4499  fi  fi
4500    
   
4501  ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile"  ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile"
4502    
4503    
# Line 4932  gnome_vfs_module_CFLAGS!$gnome_vfs_modul Line 5187  gnome_vfs_module_CFLAGS!$gnome_vfs_modul
5187  gnome_vfs_module_LIBS!$gnome_vfs_module_LIBS$ac_delim  gnome_vfs_module_LIBS!$gnome_vfs_module_LIBS$ac_delim
5188  libxml2_CFLAGS!$libxml2_CFLAGS$ac_delim  libxml2_CFLAGS!$libxml2_CFLAGS$ac_delim
5189  libxml2_LIBS!$libxml2_LIBS$ac_delim  libxml2_LIBS!$libxml2_LIBS$ac_delim
5190    libsoup24_CFLAGS!$libsoup24_CFLAGS$ac_delim
5191    libsoup24_LIBS!$libsoup24_LIBS$ac_delim
5192    libsoup22_CFLAGS!$libsoup22_CFLAGS$ac_delim
5193    libsoup22_LIBS!$libsoup22_LIBS$ac_delim
5194  libgtkhtml3_14_CFLAGS!$libgtkhtml3_14_CFLAGS$ac_delim  libgtkhtml3_14_CFLAGS!$libgtkhtml3_14_CFLAGS$ac_delim
5195  libgtkhtml3_14_LIBS!$libgtkhtml3_14_LIBS$ac_delim  libgtkhtml3_14_LIBS!$libgtkhtml3_14_LIBS$ac_delim
5196  libgtkhtml3_8_CFLAGS!$libgtkhtml3_8_CFLAGS$ac_delim  libgtkhtml3_8_CFLAGS!$libgtkhtml3_8_CFLAGS$ac_delim
# Line 4960  LIBOBJS!$LIBOBJS$ac_delim Line 5219  LIBOBJS!$LIBOBJS$ac_delim
5219  LTLIBOBJS!$LTLIBOBJS$ac_delim  LTLIBOBJS!$LTLIBOBJS$ac_delim
5220  _ACEOF  _ACEOF
5221    
5222    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
5223      break      break
5224    elif $ac_last_try; then    elif $ac_last_try; then
5225      { { 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.30  
changed lines
  Added in v.32