upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-05-28 04:35:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

check_curl: do not use pkg-config if --with-uriparser was supplied by commandline

Browse source 
if we run configure with --with-uriparser=... it should use that path or fail.
This commit is contained in:
Sven Nierlein 2018-10-23 10:56:05 +02:00
parent ac45ad31c6
commit 70888d0f88
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
m4/uriparser.m4
View file

@ -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