summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Nierlein <sven@nierlein.de>2018-10-23 08:56:05 (GMT)
committerSven Nierlein <sven@nierlein.de>2018-10-23 08:56:05 (GMT)
commit70888d0f880362a8c8671df93d55428b144dbce1 (patch)
treed8eef2c223248f2a29e60afabcbccf2dc865febb
parentac45ad31c6b45a64bc8592c8e049bab1ff47bd1a (diff)
downloadmonitoring-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.m411
1 files changed, 4 insertions, 7 deletions
diff --git a/m4/uriparser.m4 b/m4/uriparser.m4
index dc40473..c77f764 100644
--- a/m4/uriparser.m4
+++ b/m4/uriparser.m4
@@ -29,14 +29,13 @@ AC_DEFUN([URIPARSER_CHECK],
29 29
30 _uriparser_try_link=yes 30 _uriparser_try_link=yes
31 31
32 AC_CHECK_PROG(PKGCONFIG,pkg-config,pkg-config,no)
33
32 if test -d "$_uriparser_with" ; then 34 if test -d "$_uriparser_with" ; then
33 URIPARSER_CPPFLAGS="-I$withval/include" 35 URIPARSER_CPPFLAGS="-I$withval/include"
34 _uriparser_ldflags="-L$withval/lib" 36 _uriparser_ldflags="-L$withval/lib"
35 fi
36 37
37 AC_CHECK_PROG(PKGCONFIG,pkg-config,pkg-config,no) 38 elif test x$PKGCONFIG != xno; then
38
39 if test x$PKGCONFIG != xno; then
40 39
41 AC_CACHE_CHECK([for the version of uriparser], 40 AC_CACHE_CHECK([for the version of uriparser],
42 [uriparser_cv_uriparser_version], 41 [uriparser_cv_uriparser_version],
@@ -83,7 +82,7 @@ AC_DEFUN([URIPARSER_CHECK],
83 82
84 # we didn't find curl-config, so let's see if the user-supplied 83 # we didn't find curl-config, so let's see if the user-supplied
85 # link line (or failing that, "-luriparser") is enough. 84 # link line (or failing that, "-luriparser") is enough.
86 URIPARSERLIBS=${URIPARSERLIBS-"$_uriparser_ldflags -luriparser"} 85 URIPARSER=${URIPARSER-"$_uriparser_ldflags -luriparser"}
87 86
88 AC_CACHE_CHECK([whether uriparser is usable], 87 AC_CACHE_CHECK([whether uriparser is usable],
89 [uriparser_cv_lib_uriparser_usable], 88 [uriparser_cv_lib_uriparser_usable],
@@ -137,5 +136,3 @@ if (x == URI_SUCCESS) {;}
137 136
138 unset _uriparser_with 137 unset _uriparser_with
139])dnl 138])dnl
140
141