X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=configure.ac;h=77857f0762807af529a4b108ffd3d072fcdfa152;hp=03865ab98d0f52dff7fa4e7b177675464de888e1;hb=c5e1e956dd6728e6fbb8d4ed75b5475bccb26ec9;hpb=8e301dd26c1ff7703918e0ece7f3530f4ae76f24 diff --git a/configure.ac b/configure.ac index 03865ab..77857f0 100644 --- a/configure.ac +++ b/configure.ac @@ -64,12 +64,12 @@ 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"]) -PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0], +PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.3.0], [CFLAGS="$CFLAGS $libsigrok_CFLAGS"; LIBS="$LIBS $libsigrok_LIBS"]) if test "x$WITH_SRD" = "xyes"; then - PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.2.0], + PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.3.0], [CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS"; LIBS="$LIBS $libsigrokdecode_LIBS"; AC_DEFINE(HAVE_SRD, [1], [libsigrokdecode is available.])] @@ -82,10 +82,7 @@ fi AC_SUBST(MAKEFLAGS, '--no-print-directory') AC_SUBST(AM_LIBTOOLFLAGS, '--silent') -AC_CONFIG_FILES([Makefile - contrib/Makefile - contrib/sigrok-cli_cross.nsi - doc/Makefile]) +AC_CONFIG_FILES([Makefile contrib/sigrok-cli_cross.nsi]) AC_OUTPUT @@ -101,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.2.0"; do +for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.3.0" "libsigrokdecode >= 0.3.0"; do if test "$lib" = "libsigrokdecode" -a "$WITH_SRD" != "yes" ; then answer="no" else @@ -112,7 +109,7 @@ for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.2.0" "libsigrokdecode >= 0.2.0"; answer="no" fi fi - echo " - $lib: $answer" + echo " - (REQUIRED) $lib: $answer" done echo