Update libtool version numbers for libsigrokdecode.

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ceeb7477c2d8ab38cbae18e81f63fc814ea01f65..6ced182e50f0bca12d164c8e2ea6f45279f880c8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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 std-options check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
@@ -42,10 +42,11 @@ AH_TOP([#ifndef SRD_CONFIG_H
 #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
@@ -63,7 +64,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=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"
@@ -78,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.2-config python3.1-config python3.0-config])
+AC_CHECK_PROGS([PYTHON3_CONFIG], [python3-config python3.3-config python3.2-config python3.1-config python3.0-config])
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
 case "$build" in
@@ -100,7 +101,8 @@ case "$build" in
        # 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)"
@@ -150,6 +152,7 @@ AC_CONFIG_FILES([Makefile
                 libsigrokdecode.pc
                 decoders/Makefile
                 decoders/avr_isp/Makefile
+                decoders/can/Makefile
                 decoders/dcf77/Makefile
                 decoders/edid/Makefile
                 decoders/i2c/Makefile