X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=configure.ac;h=7d86db3cbb7773aa6435f2a7bd56cf914f2c717b;hp=a2d11f9de99279e862e107d5bd78da9775b779c1;hb=7091896f954320abd4a46ed5569a436d904c2d2e;hpb=de0a066e82c23971966752c8abb6ade5e8084008 diff --git a/configure.ac b/configure.ac index a2d11f9..7d86db3 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 ## @@ -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]) @@ -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