X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=configure.ac;h=64f2aa75a0325c821ac8eafe99183af0f1da75d1;hp=77857f0762807af529a4b108ffd3d072fcdfa152;hb=84b39e3e488c4897df5afb5ffeca21ef30c71fba;hpb=c5e1e956dd6728e6fbb8d4ed75b5475bccb26ec9 diff --git a/configure.ac b/configure.ac index 77857f0..64f2aa7 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ # We require at least autoconf 2.63 (AC_INIT format changed there). AC_PREREQ([2.63]) -AC_INIT([sigrok-cli], [0.4.0], [sigrok-devel@lists.sourceforge.net], +AC_INIT([sigrok-cli], [0.6.0-git], [sigrok-devel@lists.sourceforge.net], [sigrok-cli], [http://www.sigrok.org]) AC_CONFIG_SRCDIR([sigrok-cli.h]) @@ -58,18 +58,18 @@ PKG_PROG_PKG_CONFIG([0.22]) AC_ARG_WITH([libsigrokdecode], AS_HELP_STRING([--with-libsigrokdecode], [compile with libsigrokdecode support]), - [WITH_SRD=$enableval],[WITH_SRD=yes]) + [WITH_SRD=$withval],[WITH_SRD=yes]) AM_CONDITIONAL(WITH_SRD, test x$WITH_SRD = xyes) AM_PATH_GLIB_2_0([2.28.0], [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"]) -PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.3.0], +PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.4.0], [CFLAGS="$CFLAGS $libsigrok_CFLAGS"; LIBS="$LIBS $libsigrok_LIBS"]) if test "x$WITH_SRD" = "xyes"; then - PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.3.0], + PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.4.0], [CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS"; LIBS="$LIBS $libsigrokdecode_LIBS"; AC_DEFINE(HAVE_SRD, [1], [libsigrokdecode is available.])] @@ -98,7 +98,7 @@ echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.3.0" "libsigrokdecode >= 0.3.0"; do +for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.4.0" "libsigrokdecode >= 0.4.0"; do if test "$lib" = "libsigrokdecode" -a "$WITH_SRD" != "yes" ; then answer="no" else