X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=8fbfd451188525c2e4811ce4a1f0ce8fd9ae0b24;hp=c80294a78db3d46448255ffe45cd72d5b30f087a;hb=03a66522d5aef7b49fbf63e4da475c4ab8b1fe2e;hpb=ed5f826a3fe1186f9a2249ca897b836111145116;ds=sidebyside

diff --git a/configure.ac b/configure.ac
index c80294a..8fbfd45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,12 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AC_PREREQ([2.61])
+# We require at least autoconf 2.63 (AC_INIT format changed there).
+AC_PREREQ([2.63])
 
 # libsigrokdecode package version number (NOT the same as shared lib version!).
 m4_define([libsigrokdecode_major_version], [0])
-m4_define([libsigrokdecode_minor_version], [2])
+m4_define([libsigrokdecode_minor_version], [1])
 m4_define([libsigrokdecode_micro_version], [0])
 m4_define([libsigrokdecode_version],
 	  [libsigrokdecode_major_version.libsigrokdecode_minor_version.libsigrokdecode_micro_version])
@@ -33,7 +34,8 @@ AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([autostuff])
 AC_CONFIG_AUX_DIR([autostuff])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign std-options])
+# We require at least automake 1.11 (needed for 'silent rules').
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AH_TOP([#ifndef LIBSIGROKDECODE_CONFIG_H
@@ -65,6 +67,10 @@ LIBSIGROKDECODE_LT_REVISION=0
 LIBSIGROKDECODE_LT_AGE=0
 LIBSIGROKDECODE_LT_VERSION="$LIBSIGROKDECODE_LT_CURRENT:$LIBSIGROKDECODE_LT_REVISION:$LIBSIGROKDECODE_LT_AGE"
 LIBSIGROKDECODE_LT_LDFLAGS="-version-info $LIBSIGROKDECODE_LT_VERSION"
+AC_SUBST(LIBSIGROKDECODE_LT_CURRENT)
+AC_SUBST(LIBSIGROKDECODE_LT_REVISION)
+AC_SUBST(LIBSIGROKDECODE_LT_AGE)
+AC_SUBST(LIBSIGROKDECODE_LT_VERSION)
 AC_SUBST(LIBSIGROKDECODE_LT_LDFLAGS)
 
 # Checks for libraries.
@@ -138,23 +144,16 @@ AC_SUBST(LIBSIGROKDECODE_MINOR_VERSION)
 AC_SUBST(LIBSIGROKDECODE_MICRO_VERSION)
 AC_SUBST(LIBSIGROKDECODE_VERSION)
 
-AC_DEFINE(LIBSIGROKDECODE_MAJOR_VERSION, [libsigrokdecode_major_version],
-	  [Define to the libsigrokdecode major package version])
-AC_DEFINE(LIBSIGROKDECODE_MINOR_VERSION, [libsigrokdecode_minor_version],
-	  [Define to the libsigrokdecode minor package version])
-AC_DEFINE(LIBSIGROKDECODE_MICRO_VERSION, [libsigrokdecode_micro_version],
-	  [Define to the libsigrokdecode micro package version])
-AC_DEFINE(LIBSIGROKDECODE_VERSION, [libsigrokdecode_version],
-	  [Define to the libsigrokdecode package version])
-
 AC_CONFIG_FILES([Makefile
+		 sigrokdecode.h
 		 libsigrokdecode.pc
 		 decoders/Makefile
 		 decoders/dcf77/Makefile
-		 decoders/ddc/Makefile
-		 decoders/ebr30a_i2c_demux/Makefile
+		 decoders/edid/Makefile
 		 decoders/i2c/Makefile
 		 decoders/i2cdemux/Makefile
+		 decoders/i2cfilter/Makefile
+		 decoders/mlx90614/Makefile
 		 decoders/mx25lxx05d/Makefile
 		 decoders/nunchuk/Makefile
 		 decoders/pan1321/Makefile