X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=configure.ac;h=5c70e8ad105eef978b6c9739dccef770dae04a4f;hp=76c05f717dba98ec15ab15e252e05086f967224d;hb=f0f2c3f3d5627d5ac7c3cdceb43b0ccd8782319d;hpb=82dad9a9d30d65292630b7594d5b23d6ffe453f5 diff --git a/configure.ac b/configure.ac index 76c05f7..5c70e8a 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 ## @@ -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.])] @@ -101,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 @@ -110,12 +111,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