From: Sebastian Harl <sh@tokkee.org>
Date: Sat, 8 Feb 2014 11:14:10 +0000 (+0100)
Subject: configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
X-Git-Tag: collectd-5.4.2~24^2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=5bdc5d3ede2e1fad94dd7ebf6f76103201c39c3c;p=collectd.git

configure: Fixed check for libsigrok and AM_PATH_GLIB_2_0.
---

diff --git a/configure.ac b/configure.ac
index 7029e1e4..990c530e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3825,18 +3825,20 @@ AC_ARG_WITH(libsigrok, [AS_HELP_STRING([--with-libsigrok@<:@=PREFIX@:>@], [Path
 			with_libsigrok_ldflags="-L$withval/lib"
 		fi
 	fi
-],[])
+],[with_libsigrok="yes"])
 
 # libsigrok has a glib dependency
 if test "x$with_libsigrok" = "xyes"
 then
-	if test -z "m4_ifdef([AM_PATH_GLIB_2_0], [yes], [])"
-	then
-		with_libsigrok="no (glib not available)"
-	else
-		AM_PATH_GLIB_2_0([2.28.0],
-			[with_libsigrok_cflags="$with_libsigrok_cflags $GLIB_CFLAGS"; with_libsigrok_ldflags="$with_libsigrok_ldflags $GLIB_LIBS"])
-	fi
+m4_ifdef([AM_PATH_GLIB_2_0],
+	[
+	 AM_PATH_GLIB_2_0([2.28.0],
+	 	[with_libsigrok_cflags="$with_libsigrok_cflags $GLIB_CFLAGS"; with_libsigrok_ldflags="$with_libsigrok_ldflags $GLIB_LIBS"])
+	],
+	[
+	 with_libsigrok="no (glib not available)"
+	]
+)
 fi
 
 # libsigrok headers