diff options
| author | Werner Koch <wk@gnupg.org> | 2013-08-06 10:31:54 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-03-07 09:54:43 +0100 |
| commit | 5ca482d5f949444ffd453de158ee186ab07fc9b6 (patch) | |
| tree | d6b5f9fa18784602e476ab06910e882611bf6c84 | |
| parent | gpg: Remove legacy keyserver examples from the template conf file. (diff) | |
| download | gnupg2-5ca482d5f949444ffd453de158ee186ab07fc9b6.tar.xz gnupg2-5ca482d5f949444ffd453de158ee186ab07fc9b6.zip | |
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)
| -rw-r--r-- | m4/libcurl.m4 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index 7d1dbd302..f6a631bc2 100644 --- a/m4/libcurl.m4 +++ b/m4/libcurl.m4 @@ -71,7 +71,11 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], if test -d "$_libcurl_with" ; then LIBCURL_CPPFLAGS="-I$withval/include" _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 AC_PATH_PROG([_libcurl_config],[curl-config]) fi |