projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
690b449
..
7b2296d
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1925,30
+1925,33
@@
AC_ARG_WITH(libganglia, [AS_HELP_STRING([--with-libganglia@<:@=PREFIX@:>@], [Pat
GANGLIA_LDFLAGS="-L$withval/lib"
with_libganglia="yes"
else
GANGLIA_LDFLAGS="-L$withval/lib"
with_libganglia="yes"
else
- with_libganglia_config="ganglia-config"
with_libganglia="$withval"
fi; fi; fi
],
[
with_libganglia="$withval"
fi; fi; fi
],
[
- with_libganglia_config="ganglia-config"
with_libganglia="yes"
])
with_libganglia="yes"
])
-if test "x$with_libganglia" = "xyes"
&& test "x$with_libganglia_config" != "x"
+if test "x$with_libganglia" = "xyes"
then
then
- if test "x$
GANGLIA_CPPFLAGS"
= "x"
+ if test "x$
with_libganglia_config" !
= "x"
then
then
- GANGLIA_CPPFLAGS=`"$with_libganglia_config" --cflags 2>/dev/null`
- fi
+ if test "x$GANGLIA_CPPFLAGS" = "x"
+ then
+ GANGLIA_CPPFLAGS=`"$with_libganglia_config" --cflags 2>/dev/null`
+ fi
- if test "x$GANGLIA_LDFLAGS" = "x"
- then
- GANGLIA_LDFLAGS=`"$with_libganglia_config" --ldflags 2>/dev/null`
- fi
+
if test "x$GANGLIA_LDFLAGS" = "x"
+
then
+
GANGLIA_LDFLAGS=`"$with_libganglia_config" --ldflags 2>/dev/null`
+
fi
- if test "x$GANGLIA_LIBS" = "x"
- then
- GANGLIA_LIBS=`"$with_libganglia_config" --libs 2>/dev/null`
+ if test "x$GANGLIA_LIBS" = "x"
+ then
+ GANGLIA_LIBS=`"$with_libganglia_config" --libs 2>/dev/null`
+ fi
+ else
+ GANGLIA_LIBS="-lganglia"
fi
fi
fi
fi