From fb71367524083f90db7c0b4a246d2db6b2b3c737 Mon Sep 17 00:00:00 2001
From: Sebastian Harl <sh@tokkee.org>
Date: Wed, 6 Feb 2008 00:00:49 +0100
Subject: [PATCH] configure: Correctly handle all cases when using
 AC_ARG_WITH().

In a lot of cases only "$withval" != "yes" and "no" had been handled when the
option had been given. Therefore, the option had been ignored if no argument
had been passed to the option, making --with-<option> and / or
--without-<option> a no-op. This patch fixes this issue.

Signed-off-by: Sebastian Harl <sh@tokkee.org>
Signed-off-by: Florian Forster <octo@huhu.verplant.org>
---
 configure.in | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 284dff05..1dcae708 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"
@@ -761,6 +763,8 @@ AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Pa
 		then
 			with_libpthread="no (disabled)"
 		fi
+	else
+		with_libpthread="$withval"
 	fi
 ], [with_libpthread="yes"])
 if test "x$with_libpthread" = "xyes"
@@ -900,6 +904,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 +1144,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 +1181,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 +1221,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 +1316,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 +2099,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
 ],
 [
-- 
2.11.0