GPL headers: Use correct project name.

[sigrok-cli.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index a0c93efbae8799dc8e5810566d4e45ad44aa115c..8bd75a2acc4fc6a313274cc92633bd634f437b67 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>
 ##
@@ -21,7 +21,7 @@
 AC_PREREQ([2.63])
 
 AC_INIT([sigrok-cli], [0.3.1], [sigrok-devel@lists.sourceforge.net],
-        [sigrok-cli], [http://www.sigrok.org])
+       [sigrok-cli], [http://www.sigrok.org])
 
 AC_CONFIG_SRCDIR([sigrok-cli.c])
 
@@ -30,7 +30,7 @@ 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])
 
@@ -55,17 +55,26 @@ LT_INIT
 PKG_PROG_PKG_CONFIG([0.22])
 
 # Checks for libraries.
+AC_ARG_WITH([libsigrokdecode],
+       AS_HELP_STRING([--with-libsigrokdecode],
+                       [compile with libsigrokdecode support]),
+       [WITH_SRD=$enableval],[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"])
+       [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0],
        [CFLAGS="$CFLAGS $libsigrok_CFLAGS";
        LIBS="$LIBS $libsigrok_LIBS"])
 
-PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.1.0],
-       [CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS";
-       LIBS="$LIBS $libsigrokdecode_LIBS"])
+if test "x$WITH_SRD" = "xyes"; then
+       PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.1.0],
+               [CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS";
+                       LIBS="$LIBS $libsigrokdecode_LIBS";
+                       AC_DEFINE(HAVE_SRD, [1], [libsigrokdecode is available.])]
+       )
+fi
 
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
@@ -92,6 +101,7 @@ AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
 AC_CONFIG_FILES([Makefile
                 contrib/Makefile
                 contrib/sigrok-cli.nsi
+                contrib/sigrok-cli_cross.nsi
                 doc/Makefile])
 
 AC_OUTPUT
@@ -101,19 +111,25 @@ 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
-        if `$PKG_CONFIG --exists $lib`; then
-                ver=`$PKG_CONFIG --modversion $lib`
-                answer="yes ($ver)"
-        else
-                answer="no"
-        fi
-        echo "  - $lib: $answer"
+for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.2.0" "libsigrokdecode >= 0.1.0"; do
+       if test "$lib" = "libsigrokdecode" -a "$WITH_SRD" != "yes" ; then
+               answer="no"
+       else
+               if `$PKG_CONFIG --exists $lib`; then
+                       ver=`$PKG_CONFIG --modversion $lib`
+                       answer="yes ($ver)"
+               else
+                       answer="no"
+               fi
+       fi
+       echo "  - $lib: $answer"
 done
 
 echo