X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=48353b7cdb3f63c868aa7c4c184b790b593199fb;hb=6f791b702d50f1e75fdbda0441b111468181572f;hp=10213a74835f63c88669a712d00e21bdd00f5fe9;hpb=76a83a335197b54fe9974ba0acc0e333ab57111f;p=libsigrokdecode.git

diff --git a/configure.ac b/configure.ac
index 10213a7..48353b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@ AC_PREREQ([2.63])
 # libsigrokdecode package version number (NOT the same as shared lib version!).
 m4_define([srd_package_version_major], [0])
 m4_define([srd_package_version_minor], [3])
-m4_define([srd_package_version_micro], [0])
+m4_define([srd_package_version_micro], [1])
 m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro])
 
 AC_INIT([libsigrokdecode], [srd_package_version],
@@ -67,7 +67,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # The algorithm for determining which number to change (and how) is nontrivial!
 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
 SRD_LIB_VERSION_CURRENT=2
-SRD_LIB_VERSION_REVISION=0
+SRD_LIB_VERSION_REVISION=1
 SRD_LIB_VERSION_AGE=0
 SRD_LIB_VERSION="$SRD_LIB_VERSION_CURRENT:$SRD_LIB_VERSION_REVISION:$SRD_LIB_VERSION_AGE"
 SRD_LIB_LDFLAGS="-version-info $SRD_LIB_VERSION"
@@ -77,9 +77,6 @@ AC_SUBST(SRD_LIB_VERSION_AGE)
 AC_SUBST(SRD_LIB_VERSION)
 AC_SUBST(SRD_LIB_LDFLAGS)
 
-# Assume we can build tests/runtc unless proven otherwise.
-build_runtc="yes"
-
 # Checks for libraries.
 
 # libglib-2.0 is always needed.
@@ -137,17 +134,8 @@ PKG_CHECK_MODULES([check], [check >= 0.9.4],
 	[have_check="yes"], [have_check="no"])
 AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
 
-# libsigrok is optional (only used for the protocol decoder test framework).
-# Disable if not found.
-PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.3.0],
-	[LIBSIGROK_CFLAGS="$libsigrok_CFLAGS"; LIBSIGROK_LIBS="$libsigrok_LIBS"],
-	[build_runtc="no"])
-AC_SUBST([LIBSIGROK_CFLAGS])
-AC_SUBST([LIBSIGROK_LIBS])
-
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-AC_CHECK_HEADER([sys/resource.h], [], [build_runtc="no"])
 
 AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
@@ -163,8 +151,6 @@ AC_SUBST(SRD_PACKAGE_VERSION_MINOR)
 AC_SUBST(SRD_PACKAGE_VERSION_MICRO)
 AC_SUBST(SRD_PACKAGE_VERSION)
 
-AM_CONDITIONAL(BUILD_RUNTC, test x"$build_runtc" = "xyes")
-
 AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc])
 
 AC_OUTPUT
@@ -188,7 +174,7 @@ else
 fi
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4" "libsigrok >= 0.3.0"; do
+for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4"; do
 	optional="OPTIONAL"
 	if test "x$lib" = "xglib-2.0 >= 2.24.0"; then optional="REQUIRED"; fi
 	if `$PKG_CONFIG --exists $lib`; then
@@ -204,6 +190,5 @@ echo
 echo "Enabled features:"
 echo
 echo "  - (OPTIONAL) Library unit test framework support: $have_check"
-echo "  - (OPTIONAL) Protocol decoder test framework support: $build_runtc"
 echo