gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 08:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use pkg-config to detect libcurl on MinGW and Windows

Browse source
This commit is contained in:
Hugo Melder 2022-08-24 01:08:44 -07:00
parent 6dc2d4a360
commit 05495a0206
2 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
configure vendored
View file

@ -13686,11 +13686,16 @@ if test "$with_curl" != ""; then
fi fi
HAVE_LIBCURL=0 HAVE_LIBCURL=0
SKIP_CURL_CONFIG=0
curl_all=no curl_all=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl" >&5
$as_echo_n "checking for libcurl... " >&6; } $as_echo_n "checking for libcurl... " >&6; }
if eval $CURL_CONFIG --version 2>/dev/null >/dev/null; then case "$target_os" in
mingw*|windows) SKIP_CURL_CONFIG=1;;
esac
if eval $CURL_CONFIG --version 2>/dev/null >/dev/null && test "$SKIP_CURL_CONFIG" == "0"; then
curl_ver=`$CURL_CONFIG --version | sed -e "s/libcurl //g"` curl_ver=`$CURL_CONFIG --version | sed -e "s/libcurl //g"`
curl_maj=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\1/"` curl_maj=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\1/"`
curl_min=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\2/"` curl_min=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\2/"`
@ -13726,12 +13731,6 @@ done
else else
if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG"; then
if pkg-config --exists libcurl; then if pkg-config --exists libcurl; then
HAVE_LIBCURL=1
CURLCFLAGS=`$PKG_CONFIG --cflags libcurl`
CURLLIBS=`$PKG_CONFIG --libs libcurl`
CFLAGS="$CFLAGS $CURLCFLAGS"
LIBS="$LIBS $CURLLIBS"
if $PKG_CONFIG --atleast-version 2.66.0 libcurl; then if $PKG_CONFIG --atleast-version 2.66.0 libcurl; then
for ac_header in curl/curl.h for ac_header in curl/curl.h
do : do :
@ -13748,6 +13747,11 @@ fi
done done
if test "$curl_ok" = yes; then if test "$curl_ok" = yes; then
HAVE_LIBCURL=1
CURLCFLAGS=`$PKG_CONFIG --cflags libcurl`
CURLLIBS=`$PKG_CONFIG --libs libcurl`
CFLAGS="$CFLAGS $CURLCFLAGS"
LIBS="$LIBS $CURLLIBS"
curl_all=yes curl_all=yes
fi fi
else else
@ -13755,6 +13759,10 @@ done
$as_echo "FAILED (version too old to use" >&6; } $as_echo "FAILED (version too old to use" >&6; }
curl_all=no curl_all=no
fi fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED (libcurl not found via pkg-config)" >&5
$as_echo "FAILED (libcurl not found via pkg-config)" >&6; }
curl_all=no
fi fi
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED (curl-config and pkg-config not found)" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: FAILED (curl-config and pkg-config not found)" >&5

21
configure.ac
View file

@ -3623,10 +3623,15 @@ if test "$with_curl" != ""; then
fi fi
HAVE_LIBCURL=0 HAVE_LIBCURL=0
SKIP_CURL_CONFIG=0
curl_all=no curl_all=no
AC_MSG_CHECKING([for libcurl]) AC_MSG_CHECKING([for libcurl])
if eval $CURL_CONFIG --version 2>/dev/null >/dev/null; then case "$target_os" in
mingw*|windows) SKIP_CURL_CONFIG=1;;
esac
if eval $CURL_CONFIG --version 2>/dev/null >/dev/null && test "$SKIP_CURL_CONFIG" == "0"; then
curl_ver=`$CURL_CONFIG --version | sed -e "s/libcurl //g"` curl_ver=`$CURL_CONFIG --version | sed -e "s/libcurl //g"`
curl_maj=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\1/"` curl_maj=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\1/"`
curl_min=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\2/"` curl_min=`echo $curl_ver | sed -e "s/^\(.*\)\.\(.*\)\.\(.*\)$/\2/"`
@ -3647,21 +3652,23 @@ if eval $CURL_CONFIG --version 2>/dev/null >/dev/null; then
else else
if test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG"; then
if pkg-config --exists libcurl; then if pkg-config --exists libcurl; then
HAVE_LIBCURL=1
CURLCFLAGS=`$PKG_CONFIG --cflags libcurl`
CURLLIBS=`$PKG_CONFIG --libs libcurl`
CFLAGS="$CFLAGS $CURLCFLAGS"
LIBS="$LIBS $CURLLIBS"
if $PKG_CONFIG --atleast-version 2.66.0 libcurl; then if $PKG_CONFIG --atleast-version 2.66.0 libcurl; then
AC_CHECK_HEADERS(curl/curl.h, curl_ok=yes, curl_ok=no) AC_CHECK_HEADERS(curl/curl.h, curl_ok=yes, curl_ok=no)
if test "$curl_ok" = yes; then if test "$curl_ok" = yes; then
HAVE_LIBCURL=1
CURLCFLAGS=`$PKG_CONFIG --cflags libcurl`
CURLLIBS=`$PKG_CONFIG --libs libcurl`
CFLAGS="$CFLAGS $CURLCFLAGS"
LIBS="$LIBS $CURLLIBS"
curl_all=yes curl_all=yes
fi fi
else else
AC_MSG_RESULT([FAILED (version too old to use]) AC_MSG_RESULT([FAILED (version too old to use])
curl_all=no curl_all=no
fi fi
else
AC_MSG_RESULT([FAILED (libcurl not found via pkg-config)])
curl_all=no
fi fi
else else
AC_MSG_RESULT([FAILED (curl-config and pkg-config not found)]) AC_MSG_RESULT([FAILED (curl-config and pkg-config not found)])