upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-15 22:00:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

uriparser: do not reset flags if already set

Browse source
This commit is contained in:
Sven Nierlein 2018-10-23 17:01:44 +02:00
parent fd588dd2fa
commit 7501ba9f8a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
m4/uriparser.m4
View file

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