X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=ca856485ad0ff43296a65d78b6f66170cc258b02;hp=e024014668a7952a763692f8aef34fc36e929971;hb=a015bd4926d95a5cbb25843c02eca967097f4e7e;hpb=d523eae6e0617e6ad5055738ea4864deacae4313

diff --git a/configure.ac b/configure.ac
index e024014..ca85648 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 libsigrokdecode project.
 ##
 ## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
 ##
@@ -22,7 +22,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], [1])
+m4_define([srd_package_version_minor], [2])
 m4_define([srd_package_version_micro], [0])
 m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro])
 
@@ -34,7 +34,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 check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -47,7 +47,6 @@ AH_BOTTOM([#endif /* SRD_CONFIG_H */])
 CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
 
 # Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
@@ -64,7 +63,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # Carefully read the libtool docs before updating these numbers!
 # 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=0
+SRD_LIB_VERSION_CURRENT=1
 SRD_LIB_VERSION_REVISION=0
 SRD_LIB_VERSION_AGE=0
 SRD_LIB_VERSION="$SRD_LIB_VERSION_CURRENT:$SRD_LIB_VERSION_REVISION:$SRD_LIB_VERSION_AGE"
@@ -80,12 +79,12 @@ AC_SUBST(SRD_LIB_LDFLAGS)
 # libglib-2.0 is always needed.
 # Note: glib-2.0 is part of the libsigrokdecode API
 # (hard pkg-config requirement).
-AM_PATH_GLIB_2_0([2.28.0],
+AM_PATH_GLIB_2_0([2.24.0],
         [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # Python support. We require at least Python >= 3.0.
 AC_ARG_VAR([PYTHON3_CONFIG], [path to python3-config utility])
-AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.3-config python3.2-config python3.1-config python3.0-config])
+AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.3-config python-config-3.3 python3.2-config python-config-3.2 python3.1-config python-config-3.1 python3.0-config python-config-3.0])
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
 case "$build" in
@@ -149,12 +148,14 @@ AC_SUBST(SRD_PACKAGE_VERSION_MICRO)
 AC_SUBST(SRD_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile
-		 sigrokdecode.h
+		 libsigrokdecode.h
 		 libsigrokdecode.pc
+		 contrib/Makefile
 		 decoders/Makefile
 		 decoders/avr_isp/Makefile
 		 decoders/can/Makefile
 		 decoders/dcf77/Makefile
+		 decoders/ds1307/Makefile
 		 decoders/edid/Makefile
 		 decoders/i2c/Makefile
 		 decoders/i2cdemux/Makefile
@@ -165,6 +166,7 @@ AC_CONFIG_FILES([Makefile
 		 decoders/lm75/Makefile
 		 decoders/lpc/Makefile
 		 decoders/maxim_ds28ea00/Makefile
+		 decoders/midi/Makefile
 		 decoders/mlx90614/Makefile
 		 decoders/mx25lxx05d/Makefile
 		 decoders/mxc6225xu/Makefile
@@ -179,8 +181,9 @@ AC_CONFIG_FILES([Makefile
 		 decoders/transitioncounter/Makefile
 		 decoders/uart/Makefile
 		 decoders/uart_dump/Makefile
-		 decoders/usb_protocol/Makefile
+		 decoders/usb_packet/Makefile
 		 decoders/usb_signalling/Makefile
+		 decoders/xfp/Makefile
 		])
 
 AC_OUTPUT
@@ -191,12 +194,14 @@ echo
 echo "  - Package version (major.minor.micro):    $SRD_PACKAGE_VERSION"
 echo "  - Library version (current:revision:age): $SRD_LIB_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"; do
+for lib in "glib-2.0 >= 2.24.0"; do
         if `$PKG_CONFIG --exists $lib`; then
                 ver=`$PKG_CONFIG --modversion $lib`
                 answer="yes ($ver)"