Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 499988 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.ac (-26 / +8 lines)
Lines 8606-8644 Link Here
8606
    AC_MSG_RESULT([external])
8606
    AC_MSG_RESULT([external])
8607
    SYSTEM_CURL=YES
8607
    SYSTEM_CURL=YES
8608
8608
8609
    curl_version=""
8609
    AC_MSG_CHECKING([whether libcurl is >= 7.19.4])
8610
    if test "$cross_compiling" = "yes"; then
8610
8611
        dnl At least the OBS mingw32-libcurl-devel package
8611
    # First try PKGCONFIG and then fall back
8612
        dnl comes with a proper .pc file
8612
    PKG_CHECK_MODULES(CURL, libcurl >= 7.19.4,, [:])
8613
        PKG_CHECK_MODULES(CURL, libcurl,, [:])
8613
8614
        if test -n "$CURL_PKG_ERRORS"; then
8614
    if test -n "$CURL_PKG_ERRORS"; then
8615
            AC_MSG_RESULT([no])
8616
        else
8617
            curl_version=`$PKG_CONFIG --modversion libcurl`
8618
        fi
8619
    fi
8620
    if test -z "$curl_version"; then
8621
        AC_PATH_PROG(CURLCONFIG, curl-config)
8615
        AC_PATH_PROG(CURLCONFIG, curl-config)
8622
        if test -z "$CURLCONFIG"; then
8616
        if test -z "$CURLCONFIG"; then
8623
            AC_MSG_ERROR([install the libcurl development package])
8617
            AC_MSG_ERROR([curl developement files not found])
8624
        fi
8618
        fi
8625
        CURL_LIBS=`$CURLCONFIG --libs`
8619
        CURL_LIBS=`$CURLCONFIG --libs`
8626
        CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g")
8620
        CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g")
8627
        curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
8621
        curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
8628
    fi
8622
    fi
8629
8623
    AC_MSG_RESULT([yes])
8630
    AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
8631
8632
    case $curl_version in
8633
    dnl brackets doubled below because Autoconf uses them as m4 quote characters,
8634
    dnl so they need to be doubled to end up in the configure script
8635
    7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
8636
        AC_MSG_RESULT([yes, you have $curl_version])
8637
        ;;
8638
    *)
8639
        AC_MSG_ERROR([no, you have $curl_version])
8640
        ;;
8641
    esac
8642
8624
8643
    libo_MINGW_CHECK_DLL([libcurl])
8625
    libo_MINGW_CHECK_DLL([libcurl])
8644
    libo_MINGW_TRY_DLL([libintl])
8626
    libo_MINGW_TRY_DLL([libintl])

Return to bug 499988