From: Steve Brokenshire Date: Wed, 22 Feb 2017 20:56:03 +0000 (+0000) Subject: configure: used CURL instead of cURL X-Git-Tag: release-0.18~20 X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=2783a4a86de853d9c4883bde7e04dbbf42f3d4a9;p=xestiaab%2F.git configure: used CURL instead of cURL --- diff --git a/source/configure b/source/configure index 12f4636..3bff162 100755 --- a/source/configure +++ b/source/configure @@ -642,8 +642,8 @@ FOUND_FILE FOUND_CURLCONFIG_RES_FALSE FOUND_CURLCONFIG_RES_TRUE FOUND_CURLCONFIG -cURL_LIBS -cURL_CFLAGS +CURL_LIBS +CURL_CFLAGS SFML_LIBS SFML_CFLAGS PKG_CONFIG_LIBDIR @@ -744,8 +744,8 @@ PKG_CONFIG_PATH PKG_CONFIG_LIBDIR SFML_CFLAGS SFML_LIBS -cURL_CFLAGS -cURL_LIBS' +CURL_CFLAGS +CURL_LIBS' # Initialize some variables set by options. @@ -1386,8 +1386,8 @@ Some influential environment variables: path overriding pkg-config's built-in search path SFML_CFLAGS C compiler flags for SFML, overriding pkg-config SFML_LIBS linker flags for SFML, overriding pkg-config - cURL_CFLAGS C compiler flags for cURL, overriding pkg-config - cURL_LIBS linker flags for cURL, overriding pkg-config + CURL_CFLAGS C compiler flags for CURL, overriding pkg-config + CURL_LIBS linker flags for CURL, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -4623,11 +4623,11 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cURL" >&5 -$as_echo_n "checking for cURL... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5 +$as_echo_n "checking for CURL... " >&6; } -if test -n "$cURL_CFLAGS"; then - pkg_cv_cURL_CFLAGS="$cURL_CFLAGS" +if test -n "$CURL_CFLAGS"; then + pkg_cv_CURL_CFLAGS="$CURL_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.52.0\""; } >&5 @@ -4635,7 +4635,7 @@ if test -n "$cURL_CFLAGS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_cURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.52.0" 2>/dev/null` + pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.52.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4643,8 +4643,8 @@ fi else pkg_failed=untried fi -if test -n "$cURL_LIBS"; then - pkg_cv_cURL_LIBS="$cURL_LIBS" +if test -n "$CURL_LIBS"; then + pkg_cv_CURL_LIBS="$CURL_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.52.0\""; } >&5 @@ -4652,7 +4652,7 @@ if test -n "$cURL_LIBS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_cURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.52.0" 2>/dev/null` + pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.52.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4673,22 +4673,22 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - cURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.52.0" 2>&1` + CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.52.0" 2>&1` else - cURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.52.0" 2>&1` + CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.52.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$cURL_PKG_ERRORS" >&5 + echo "$CURL_PKG_ERRORS" >&5 as_fn_error $? "Package requirements (libcurl >= 7.52.0) were not met: -$cURL_PKG_ERRORS +$CURL_PKG_ERRORS Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables cURL_CFLAGS -and cURL_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables CURL_CFLAGS +and CURL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -4699,15 +4699,15 @@ as_fn_error $? "The pkg-config script could not be found or is too old. Make su is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables cURL_CFLAGS -and cURL_LIBS to avoid the need to call pkg-config. +Alternatively, you may set the environment variables CURL_CFLAGS +and CURL_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . See \`config.log' for more details" "$LINENO" 5; } else - cURL_CFLAGS=$pkg_cv_cURL_CFLAGS - cURL_LIBS=$pkg_cv_cURL_LIBS + CURL_CFLAGS=$pkg_cv_CURL_CFLAGS + CURL_LIBS=$pkg_cv_CURL_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/source/configure.ac b/source/configure.ac index f35d2ed..4b88f57 100644 --- a/source/configure.ac +++ b/source/configure.ac @@ -97,7 +97,7 @@ AC_LANG_POP([C++]) # curl Library -PKG_CHECK_MODULES([cURL], [libcurl >= 7.52.0]) +PKG_CHECK_MODULES([CURL], [libcurl >= 7.52.0]) AC_CHECK_LIB([curl], [main], [], [echo "The cURL library must be installed on your system. Please check that this library is installed properly before