diff options
| author |  Sven Nierlein <sven@nierlein.de>
| 2018-10-23 17:01:44 +0200 |
|---|---|---|
| committer | Sven Nierlein <sven@nierlein.de>
| 2018-10-23 17:01:44 +0200 |
| commit | 7501ba9f8a34413147281bed0b32b89da1ce2cb7 (patch) | |
| tree | c8e6199c80d8d00f0dd814eff57234be4697fb1e /m4 | |
| parent | fd588dd2fa4106475b10cac5fea966d370d8c74d (diff) | |
| download | monitoring-plugins-7501ba9f8a34413147281bed0b32b89da1ce2cb7.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 c77f7649..dbb8a551 100644 --- a/m4/uriparser.m4 +++ b/m4/uriparser.m4 @@ -31,7 +31,9 @@ AC_DEFUN([URIPARSER_CHECK], AC_CHECK_PROG(PKGCONFIG,pkg-config,pkg-config,no) - if test -d "$_uriparser_with" ; then + if test "x$URIPARSER" != "x" || test "x$URIPARSER_CPPFLAGS" != "x"; then + : + elif test -d "$_uriparser_with" ; then URIPARSER_CPPFLAGS="-I$withval/include" _uriparser_ldflags="-L$withval/lib" @@ -73,14 +75,14 @@ AC_DEFUN([URIPARSER_CHECK], unset _uriparser_wanted else - dnl no pkg-config, ok, to our best and set some defaults + dnl no pkg-config, ok, do our best and set some defaults URIPARSER_CPPFLAGS="-I/usr/include" URIPARSER="-luriparser -L/usr/lib -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -L/usr/lib/i686-linux-gnu" fi if test $_uriparser_try_link = yes ; then - # we didn't find curl-config, so let's see if the user-supplied + # let's see if the user-supplied # link line (or failing that, "-luriparser") is enough. URIPARSER=${URIPARSER-"$_uriparser_ldflags -luriparser"} |