X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=04ba0f8697313bcfc2888d60daa53e7b80b48862;hb=8ab4382617ae4627c7d680e0a8a4eae030f59c7f;hp=d9bca160fc8fb3152740f0365d6b59b2265040f4;hpb=e8993811715b8d505a176e1f34985ac2b63791a2;p=collectd.git

diff --git a/configure.in b/configure.in
index d9bca160..04ba0f86 100644
--- a/configure.in
+++ b/configure.in
@@ -698,6 +698,8 @@ AC_ARG_WITH(rrdtool, [AS_HELP_STRING([--with-rrdtool@<:@=PREFIX@:>@], [Path to r
 		librrd_cflags="-I$withval/include"
 		librrd_ldflags="-L$withval/lib"
 		with_rrdtool="yes"
+	else
+		with_rrdtool="$withval"
 	fi
 ], [with_rrdtool="yes"])
 if test "x$with_rrdtool" = "xyes"
@@ -900,6 +902,8 @@ AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [P
 		LDFLAGS="$LDFLAGS -L$withval/lib"
 		CPPFLAGS="$CPPFLAGS -I$withval/include"
 		with_libstatgrab="yes"
+	else
+		with_libstatgrab="$withval"
 	fi
 ],
 [
@@ -1138,7 +1142,10 @@ AC_ARG_WITH(liboping, [AS_HELP_STRING([--with-liboping@<:@=PREFIX@:>@], [Path to
 	then
 		with_liboping="no"
 		with_own_liboping="no"
-	fi
+	else if test "x$withval" = "xyes"
+	then
+		with_liboping="yes"
+	fi; fi
 ],
 [
 	with_liboping="yes"
@@ -1172,6 +1179,8 @@ AC_ARG_WITH(libpcap, [AS_HELP_STRING([--with-libpcap@<:@=PREFIX@:>@], [Path to l
 		LDFLAGS="$LDFLAGS -L$withval/lib"
 		CPPFLAGS="$CPPFLAGS -I$withval/include"
 		with_libpcap="yes"
+	else
+		with_libpcap="$withval"
 	fi
 ],
 [
@@ -1210,6 +1219,8 @@ AC_ARG_WITH(libperl, [AS_HELP_STRING([--with-libperl@<:@=PREFIX@:>@], [Path to l
 		CPPFLAGS="$CPPFLAGS -I$withval/include"
 		perl_interpreter="$withval/bin/perl"
 		with_libperl="yes"
+	else
+		with_libperl="$withval"
 	fi
 ],
 [
@@ -1303,6 +1314,8 @@ AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to l
 		LDFLAGS="$LDFLAGS -L$withval/lib"
 		CPPFLAGS="$CPPFLAGS -I$withval/include"
 		with_libiptc="yes"
+	else
+		with_libiptc="$withval"
 	fi
 ],
 [
@@ -2084,6 +2097,9 @@ AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@
 	then
 		PERL_BINDINGS_OPTIONS="$withval"
 		with_perl_bindings="yes"
+	else
+		PERL_BINDINGS_OPTIONS=""
+		with_perl_bindings="$withval"
 	fi
 ],
 [
@@ -2101,6 +2117,11 @@ AC_SUBST(PERL_BINDINGS_OPTIONS)
 
 AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
 
+if test "x$with_rrdtool" = "xyes" -a "x$librrd_threadsafe" != "xyes"
+then
+	with_rrdtool="yes (warning: librrd is not thread-safe)"
+fi
+
 if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes"
 then
 	with_liboping="yes (shipped version)"