1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

Improve libcurl detection.

* m4/libcurl.m4: Do not use AC_PATH_PROG if --with-libcurl as been
given.  Suggested by John Marshall.
--

GnuPG-bug-id: 1510
(cherry picked from commit 110b52fffa77b339e6d59eba939408f7e87e7138)
This commit is contained in:
Werner Koch 2013-08-06 10:31:54 +02:00
parent 0ab752cc2d
commit 5ca482d5f9

View File

@ -71,7 +71,11 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
if test -d "$_libcurl_with" ; then if test -d "$_libcurl_with" ; then
LIBCURL_CPPFLAGS="-I$withval/include" LIBCURL_CPPFLAGS="-I$withval/include"
_libcurl_ldflags="-L$withval/lib" _libcurl_ldflags="-L$withval/lib"
AC_PATH_PROG([_libcurl_config],["$withval/bin/curl-config"]) if test -x "$withval/bin/curl-config" ; then
_libcurl_config="$withval/bin/curl-config"
else
_libcurl_config=
fi
else else
AC_PATH_PROG([_libcurl_config],[curl-config]) AC_PATH_PROG([_libcurl_config],[curl-config])
fi fi