summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c517ec5)
raw | patch | inline | side by side (parent: c517ec5)
author | Sebastian Harl <sh@tokkee.org> | |
Sat, 8 Feb 2014 11:14:10 +0000 (12:14 +0100) | ||
committer | Sebastian Harl <sh@tokkee.org> | |
Sat, 8 Feb 2014 11:14:10 +0000 (12:14 +0100) |
configure.ac | patch | blob | history |
diff --git a/configure.ac b/configure.ac
index 7029e1e45a7dd3d6530075ec592c78bf5a0aed01..990c530ed02808f14be3620f88913576f80e0ccd 100644 (file)
--- 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