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 214 by harbaum, Sun Jul 12 11:28:15 2009 UTC
# 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  libsoup24_CFLAGS
636  libsoup_LIBS  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 670  CPPFLAGS Line 672  CPPFLAGS
672  PKG_CONFIG  PKG_CONFIG
673  libcurl_CFLAGS  libcurl_CFLAGS
674  libcurl_LIBS  libcurl_LIBS
675  libsoup_CFLAGS  libsoup24_CFLAGS
676  libsoup_LIBS  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 1272  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    libsoup_CFLAGS    libsoup24_CFLAGS
1280                C compiler flags for libsoup, overriding pkg-config                C compiler flags for libsoup24, overriding pkg-config
1281    libsoup_LIBS    libsoup24_LIBS
1282                linker flags for libsoup, overriding pkg-config                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 3043  LIBS="$LIBS $libcurl_LIBS" Line 3051  LIBS="$LIBS $libcurl_LIBS"
3051  # check for libsoup  # check for libsoup
3052    
3053  pkg_failed=no  pkg_failed=no
3054  { echo "$as_me:$LINENO: checking for libsoup" >&5  { echo "$as_me:$LINENO: checking for libsoup24" >&5
3055  echo $ECHO_N "checking for libsoup... $ECHO_C" >&6; }  echo $ECHO_N "checking for libsoup24... $ECHO_C" >&6; }
3056    
3057  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3058      if test -n "$libsoup_CFLAGS"; then      if test -n "$libsoup24_CFLAGS"; then
3059          pkg_cv_libsoup_CFLAGS="$libsoup_CFLAGS"          pkg_cv_libsoup24_CFLAGS="$libsoup24_CFLAGS"
3060      else      else
3061          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3062      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
# Line 3056  if test -n "$PKG_CONFIG"; then Line 3064  if test -n "$PKG_CONFIG"; then
3064    ac_status=$?    ac_status=$?
3065    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3066    (exit $ac_status); }; then    (exit $ac_status); }; then
3067    pkg_cv_libsoup_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`    pkg_cv_libsoup24_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4" 2>/dev/null`
3068  else  else
3069    pkg_failed=yes    pkg_failed=yes
3070  fi  fi
# Line 3065  else Line 3073  else
3073          pkg_failed=untried          pkg_failed=untried
3074  fi  fi
3075  if test -n "$PKG_CONFIG"; then  if test -n "$PKG_CONFIG"; then
3076      if test -n "$libsoup_LIBS"; then      if test -n "$libsoup24_LIBS"; then
3077          pkg_cv_libsoup_LIBS="$libsoup_LIBS"          pkg_cv_libsoup24_LIBS="$libsoup24_LIBS"
3078      else      else
3079          if test -n "$PKG_CONFIG" && \          if test -n "$PKG_CONFIG" && \
3080      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5      { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4\"") >&5
# Line 3074  if test -n "$PKG_CONFIG"; then Line 3082  if test -n "$PKG_CONFIG"; then
3082    ac_status=$?    ac_status=$?
3083    echo "$as_me:$LINENO: \$? = $ac_status" >&5    echo "$as_me:$LINENO: \$? = $ac_status" >&5
3084    (exit $ac_status); }; then    (exit $ac_status); }; then
3085    pkg_cv_libsoup_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`    pkg_cv_libsoup24_LIBS=`$PKG_CONFIG --libs "libsoup-2.4" 2>/dev/null`
3086  else  else
3087    pkg_failed=yes    pkg_failed=yes
3088  fi  fi
# Line 3093  else Line 3101  else
3101          _pkg_short_errors_supported=no          _pkg_short_errors_supported=no
3102  fi  fi
3103          if test $_pkg_short_errors_supported = yes; then          if test $_pkg_short_errors_supported = yes; then
3104                  libsoup_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`                  libsoup24_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4"`
3105          else          else
3106                  libsoup_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`                  libsoup24_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4"`
3107          fi          fi
3108          # Put the nasty error message in config.log where it belongs          # Put the nasty error message in config.log where it belongs
3109          echo "$libsoup_PKG_ERRORS" >&5          echo "$libsoup24_PKG_ERRORS" >&5
3110    
3111          { echo "$as_me:$LINENO: result: no" >&5          { echo "$as_me:$LINENO: result: no" >&5
3112  echo "${ECHO_T}no" >&6; }  echo "${ECHO_T}no" >&6; }
3113                  { echo "$as_me:$LINENO: WARNING: libsoup-2.4 missing, disabling internal map" >&5  
3114  echo "$as_me: WARNING: libsoup-2.4 missing, disabling internal map" >&6;}  
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  elif test $pkg_failed = untried; then
3197          { echo "$as_me:$LINENO: WARNING: libsoup-2.4 missing, disabling internal map" >&5  
3198  echo "$as_me: WARNING: libsoup-2.4 missing, disabling internal map" >&6;}  
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  else
3281          libsoup_CFLAGS=$pkg_cv_libsoup_CFLAGS          libsoup24_CFLAGS=$pkg_cv_libsoup24_CFLAGS
3282          libsoup_LIBS=$pkg_cv_libsoup_LIBS          libsoup24_LIBS=$pkg_cv_libsoup24_LIBS
3283          { echo "$as_me:$LINENO: result: yes" >&5          { echo "$as_me:$LINENO: result: yes" >&5
3284  echo "${ECHO_T}yes" >&6; }  echo "${ECHO_T}yes" >&6; }
3285    
3286    EXTRA_OBJS="$EXTRA_OBJS  converter.o osm-gps-map.o"    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o"
3287    CFLAGS="$CFLAGS $libsoup_CFLAGS -DENABLE_OSM_GPS_MAP"    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
3288    LIBS="$LIBS $libsoup_LIBS"    LIBS="$LIBS $libsoup24_LIBS"
3289    
3290  fi  fi
3291    
# Line 4762  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  libsoup_CFLAGS!$libsoup_CFLAGS$ac_delim  libsoup24_CFLAGS!$libsoup24_CFLAGS$ac_delim
4936  libsoup_LIBS!$libsoup_LIBS$ac_delim  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 4790  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` = 79; 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.209  
changed lines
  Added in v.214