Diff of /trunk/configure

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

revision 197 by harbaum, Wed Jul 8 15:45:38 2009 UTC revision 200 by harbaum, Thu Jul 9 11:44:27 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
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 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 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: error: libsoup-2.4 missing" >&5
3106    echo "$as_me: error: libsoup-2.4 missing" >&2;}
3107       { (exit 1); exit 1; }; }
3108    elif test $pkg_failed = untried; then
3109            { { echo "$as_me:$LINENO: error: libsoup-2.4 missing" >&5
3110    echo "$as_me: error: libsoup-2.4 missing" >&2;}
3111       { (exit 1); exit 1; }; }
3112    else
3113            libsoup_CFLAGS=$pkg_cv_libsoup_CFLAGS
3114            libsoup_LIBS=$pkg_cv_libsoup_LIBS
3115            { echo "$as_me:$LINENO: result: yes" >&5
3116    echo "${ECHO_T}yes" >&6; }
3117            :
3118    fi
3119    CFLAGS="$CFLAGS $libsoup_CFLAGS"
3120    LIBS="$LIBS $libsoup_LIBS"
3121    
3122  # check for goocanvas  # check for goocanvas
3123    
3124  pkg_failed=no  pkg_failed=no
# 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.197  
changed lines
  Added in v.200