X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=configure.ac;h=8ab33aae1f76f1e4f1ede8724f33ba0f492c98dd;hp=f1f2e76f4d9a76312b39f1c959f32de6f019183d;hb=6da249da0628ad1ecfb880a19bbe4795ada755c7;hpb=58b036281136570a7aaa187fffeeda2e4cd466ce

diff --git a/configure.ac b/configure.ac
index f1f2e76..8ab33aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 ##
-## This file is part of the sigrok project.
+## This file is part of the sigrok-cli project.
 ##
 ## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
 ##
@@ -20,10 +20,10 @@
 # We require at least autoconf 2.63 (AC_INIT format changed there).
 AC_PREREQ([2.63])
 
-AC_INIT([sigrok-cli], [0.3.1], [sigrok-devel@lists.sourceforge.net],
+AC_INIT([sigrok-cli], [0.4.0], [sigrok-devel@lists.sourceforge.net],
 	[sigrok-cli], [http://www.sigrok.org])
 
-AC_CONFIG_SRCDIR([sigrok-cli.c])
+AC_CONFIG_SRCDIR([sigrok-cli.h])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([autostuff])
@@ -69,7 +69,7 @@ PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0],
 	LIBS="$LIBS $libsigrok_LIBS"])
 
 if test "x$WITH_SRD" = "xyes"; then
-	PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.1.0],
+	PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.2.0],
 		[CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS";
 			LIBS="$LIBS $libsigrokdecode_LIBS";
 			AC_DEFINE(HAVE_SRD, [1], [libsigrokdecode is available.])]
@@ -78,31 +78,11 @@ fi
 
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-AC_CHECK_HEADERS([sys/time.h termios.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_CHECK_FUNCS([strcasecmp strchr strerror strstr strtol])
 
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
 
-AC_CONFIG_FILES([Makefile
-		 contrib/Makefile
-		 contrib/sigrok-cli.nsi
-		 contrib/sigrok-cli_cross.nsi
-		 doc/Makefile])
+AC_CONFIG_FILES([Makefile contrib/sigrok-cli_cross.nsi])
 
 AC_OUTPUT
 
@@ -118,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.2.0" "libsigrokdecode >= 0.1.0"; do
+for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.2.0" "libsigrokdecode >= 0.2.0"; do
 	if test "$lib" = "libsigrokdecode" -a "$WITH_SRD" != "yes" ; then
 		answer="no"
 	else
@@ -129,7 +109,7 @@ for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.2.0" "libsigrokdecode >= 0.1.0";
 			answer="no"
 		fi
 	fi
-	echo "  - $lib: $answer"
+	echo "  - (REQUIRED) $lib: $answer"
 done
 
 echo