Build-depend on the upcoming libsigrok + libsigrokdecode 0.4.0.

diff --git a/README b/README
index 9a3fe1f0a3449aa392e952c9aefaa4d7f742a4da..0a05ecdfc247f9a37752cd6c3e542b398699e80d 100644 (file)
--- a/README
+++ b/README
@@ -28,8 +28,8 @@ Requirements
  - libtool (only needed when building from git) 
  - pkg-config >= 0.22
  - libglib >= 2.28.0
  - libtool (only needed when building from git) 
  - pkg-config >= 0.22
  - libglib >= 2.28.0

- - libsigrok >= 0.3.0
- - libsigrokdecode >= 0.3.0
+ - libsigrok >= 0.4.0
+ - libsigrokdecode >= 0.4.0

 
 
 Building and installing
 
 
 Building and installing

diff --git a/configure.ac b/configure.ac
index a4c2a1663059fa22c7a7573e41ede11235962837..64f2aa75a0325c821ac8eafe99183af0f1da75d1 100644 (file)
--- 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"])
 
 AM_PATH_GLIB_2_0([2.28.0],
        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 

-PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.3.0],
+PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.4.0],

        [CFLAGS="$CFLAGS $libsigrok_CFLAGS";
        LIBS="$LIBS $libsigrok_LIBS"])
 
 if test "x$WITH_SRD" = "xyes"; then
        [CFLAGS="$CFLAGS $libsigrok_CFLAGS";
        LIBS="$LIBS $libsigrok_LIBS"])
 
 if test "x$WITH_SRD" = "xyes"; then

-       PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.3.0],
+       PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.4.0],

                [CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS";
                        LIBS="$LIBS $libsigrokdecode_LIBS";
                        AC_DEFINE(HAVE_SRD, [1], [libsigrokdecode is available.])]
                [CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS";
                        LIBS="$LIBS $libsigrokdecode_LIBS";
                        AC_DEFINE(HAVE_SRD, [1], [libsigrokdecode is available.])]


@@ -98,7 +98,7 @@ echo "Detected libraries:"
 echo
 
 # Note: This only works for libs with pkg-config integration.
 echo
 
 # Note: This only works for libs with pkg-config integration.

-for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.3.0" "libsigrokdecode >= 0.3.0"; do
+for lib in "glib-2.0 >= 2.28.0" "libsigrok >= 0.4.0" "libsigrokdecode >= 0.4.0"; do

        if test "$lib" = "libsigrokdecode" -a "$WITH_SRD" != "yes" ; then
                answer="no"
        else
        if test "$lib" = "libsigrokdecode" -a "$WITH_SRD" != "yes" ; then
                answer="no"
        else