Fix saving to session file.

[sigrok-cli.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a2d11f9de99279e862e107d5bd78da9775b779c1..65e0b42390bb4745488cc1bf13550f0cc18bf9d1 100644 (file)
--- 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,17 +20,17 @@
 # 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])
 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])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror std-options check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -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,29 +78,13 @@ 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_OUTPUT
@@ -110,12 +94,14 @@ echo "sigrok-cli configuration summary:"
 echo
 echo "  - Package version: $VERSION"
 echo "  - Prefix: $prefix"
+echo "  - Building on: $build"
+echo "  - Building for: $host"
 echo
 echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0" "libsigrok" "libsigrokdecode"; 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
@@ -126,7 +112,7 @@ for lib in "glib-2.0" "libsigrok" "libsigrokdecode"; do
                        answer="no"
                fi
        fi
-       echo "  - $lib: $answer"
+       echo "  - (REQUIRED) $lib: $answer"
 done
 
 echo