# 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_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],
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 std-options check-news])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
#define SRD_CONFIG_H /* To stop multiple inclusions. */])
AH_BOTTOM([#endif /* SRD_CONFIG_H */])
-CFLAGS="-g -Wall -Wextra"
+# Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden
+# and enforce use of SRD_API to explicitly mark all public API functions.
+CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden"
# Checks for programs.
-AC_PROG_CXX
AC_PROG_CC
AC_PROG_CPP
AC_PROG_INSTALL
# 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_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"
# 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.
# On Darwin, Macports has python3.x-config, fink has python3-config.
# Mac OS X (Snow Leopard) ships with 'python-config' per default, but
# that's Python 2.x, so not useful for us.
- # Everything else is untested, we just hope 'PYTHON3_CONFIG' works.
+ # Everything else is untested, we just hope some $PYTHON3_CONFIG
+ # (i.e., any of the tools we check for above) is available.
if test -n "$PYTHON3_CONFIG"; then
CPPFLAGS_PYTHON="$($PYTHON3_CONFIG --includes)"
LDFLAGS_PYTHON="$($PYTHON3_CONFIG --ldflags)"
AC_CONFIG_FILES([Makefile
sigrokdecode.h
libsigrokdecode.pc
+ contrib/Makefile
decoders/Makefile
decoders/avr_isp/Makefile
decoders/can/Makefile