diff options
| author |  Sven Nierlein <sven@nierlein.de>
| 2018-10-23 10:56:05 +0200 |
|---|---|---|
| committer | Sven Nierlein <sven@nierlein.de>
| 2018-10-23 10:56:05 +0200 |
| commit | 70888d0f880362a8c8671df93d55428b144dbce1 (patch) | |
| tree | d8eef2c223248f2a29e60afabcbccf2dc865febb | |
| parent | ac45ad31c6b45a64bc8592c8e049bab1ff47bd1a (diff) | |
| download | monitoring-plugins-70888d0f880362a8c8671df93d55428b144dbce1.tar.gz | |
check_curl: do not use pkg-config if --with-uriparser was supplied by commandline
if we run configure with --with-uriparser=... it should use that path or fail.
| -rw-r--r-- | m4/uriparser.m4 | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/m4/uriparser.m4 b/m4/uriparser.m4 index dc404738..c77f7649 100644 --- a/m4/uriparser.m4 +++ b/m4/uriparser.m4 @@ -29,14 +29,13 @@ AC_DEFUN([URIPARSER_CHECK], _uriparser_try_link=yes + AC_CHECK_PROG(PKGCONFIG,pkg-config,pkg-config,no) + if test -d "$_uriparser_with" ; then URIPARSER_CPPFLAGS="-I$withval/include" _uriparser_ldflags="-L$withval/lib" - fi - AC_CHECK_PROG(PKGCONFIG,pkg-config,pkg-config,no) - - if test x$PKGCONFIG != xno; then + elif test x$PKGCONFIG != xno; then AC_CACHE_CHECK([for the version of uriparser], [uriparser_cv_uriparser_version], @@ -83,7 +82,7 @@ AC_DEFUN([URIPARSER_CHECK], # we didn't find curl-config, so let's see if the user-supplied # link line (or failing that, "-luriparser") is enough. - URIPARSERLIBS=${URIPARSERLIBS-"$_uriparser_ldflags -luriparser"} + URIPARSER=${URIPARSER-"$_uriparser_ldflags -luriparser"} AC_CACHE_CHECK([whether uriparser is usable], [uriparser_cv_lib_uriparser_usable], @@ -137,5 +136,3 @@ if (x == URI_SUCCESS) {;} unset _uriparser_with ])dnl - - |