diff options
author | Sven Nierlein <sven@nierlein.de> | 2018-10-23 15:01:44 (GMT) |
---|---|---|
committer | Sven Nierlein <sven@nierlein.de> | 2018-10-23 15:01:44 (GMT) |
commit | 7501ba9f8a34413147281bed0b32b89da1ce2cb7 (patch) | |
tree | c8e6199c80d8d00f0dd814eff57234be4697fb1e /m4 | |
parent | fd588dd2fa4106475b10cac5fea966d370d8c74d (diff) | |
download | monitoring-plugins-7501ba9.tar.gz |
uriparser: do not reset flags if already set
Diffstat (limited to 'm4')
-rw-r--r-- | m4/uriparser.m4 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/m4/uriparser.m4 b/m4/uriparser.m4 index c77f764..dbb8a55 100644 --- a/m4/uriparser.m4 +++ b/m4/uriparser.m4 | |||
@@ -31,7 +31,9 @@ AC_DEFUN([URIPARSER_CHECK], | |||
31 | 31 | ||
32 | AC_CHECK_PROG(PKGCONFIG,pkg-config,pkg-config,no) | 32 | AC_CHECK_PROG(PKGCONFIG,pkg-config,pkg-config,no) |
33 | 33 | ||
34 | if test -d "$_uriparser_with" ; then | 34 | if test "x$URIPARSER" != "x" || test "x$URIPARSER_CPPFLAGS" != "x"; then |
35 | : | ||
36 | elif test -d "$_uriparser_with" ; then | ||
35 | URIPARSER_CPPFLAGS="-I$withval/include" | 37 | URIPARSER_CPPFLAGS="-I$withval/include" |
36 | _uriparser_ldflags="-L$withval/lib" | 38 | _uriparser_ldflags="-L$withval/lib" |
37 | 39 | ||
@@ -73,14 +75,14 @@ AC_DEFUN([URIPARSER_CHECK], | |||
73 | 75 | ||
74 | unset _uriparser_wanted | 76 | unset _uriparser_wanted |
75 | else | 77 | else |
76 | dnl no pkg-config, ok, to our best and set some defaults | 78 | dnl no pkg-config, ok, do our best and set some defaults |
77 | URIPARSER_CPPFLAGS="-I/usr/include" | 79 | URIPARSER_CPPFLAGS="-I/usr/include" |
78 | URIPARSER="-luriparser -L/usr/lib -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/lib/i686-linux-gnu" | 80 | URIPARSER="-luriparser -L/usr/lib -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/lib/i686-linux-gnu" |
79 | fi | 81 | fi |
80 | 82 | ||
81 | if test $_uriparser_try_link = yes ; then | 83 | if test $_uriparser_try_link = yes ; then |
82 | 84 | ||
83 | # we didn't find curl-config, so let's see if the user-supplied | 85 | # let's see if the user-supplied |
84 | # link line (or failing that, "-luriparser") is enough. | 86 | # link line (or failing that, "-luriparser") is enough. |
85 | URIPARSER=${URIPARSER-"$_uriparser_ldflags -luriparser"} | 87 | URIPARSER=${URIPARSER-"$_uriparser_ldflags -luriparser"} |
86 | 88 | ||