X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=configure.ac;h=b8f32f8fb650e0899b9be04206e4eaf6795d6da8;hp=d6389c03790f0c66ee6b9028ac34d5f789e3a5a8;hb=48f71481bfa1011fd5c1538a0a8d467e0fe615a8;hpb=2658103e629ffc7d44ff0e80e435b0f1f4cc5bfe

diff --git a/configure.ac b/configure.ac
index d6389c0..b8f32f8 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.1], [sigrok-devel@lists.sourceforge.net],
+AC_INIT([sigrok-cli], [0.3.1], [sigrok-devel@lists.sourceforge.net],
         [sigrok-cli], [http://www.sigrok.org])
 
 AC_CONFIG_SRCDIR([sigrok-cli.c])
@@ -32,6 +32,7 @@ AC_CONFIG_AUX_DIR([autostuff])
 # We require at least automake 1.11 (needed for 'silent rules').
 AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 AH_TOP([#ifndef SIGROK_CLI_CONFIG_H
 #define SIGROK_CLI_CONFIG_H    /* To stop multiple inclusions. */])
@@ -57,11 +58,11 @@ PKG_PROG_PKG_CONFIG([0.22])
 AM_PATH_GLIB_2_0([2.22.0],
         [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
-PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2],
+PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0],
 	[CFLAGS="$CFLAGS $libsigrok_CFLAGS";
 	LIBS="$LIBS $libsigrok_LIBS"])
 
-PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.2],
+PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.1.0],
 	[CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS";
 	LIBS="$LIBS $libsigrokdecode_LIBS"])
 
@@ -88,6 +89,8 @@ AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
 
 AC_CONFIG_FILES([Makefile
+		 contrib/Makefile
+		 contrib/sigrok-cli.nsi
 		 doc/Makefile])
 
 AC_OUTPUT