configure.ac: Look for python-config-3.x besides python3.x-config.

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index abc2a37dacafd85e26dc8fcb9ad00aaa927b7450..ad5e626c6b9ff246b22cc85fe630f7ce60d2581f 100644 (file)
--- 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], [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],
@@ -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])
 
@@ -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,28 +79,30 @@ 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 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
 *mingw*)
        # We currently hardcode the paths to the Python 3.2 default install
        # location as there's no 'python-config' script on Windows, it seems.
+       # Note: We add both the /c/ and c:/ syntax (needed for cmake).
        AC_MSG_WARN([using hardcoded Python3 configuration on MinGW])
-       CPPFLAGS_PYTHON="-I/c/Python32/include"
-       LDFLAGS_PYTHON="-L/c/Python32/libs -lpython32"
+       CPPFLAGS_PYTHON="-I/c/Python32/include -Ic:/Python32/include"
+       LDFLAGS_PYTHON="-L/c/Python32/libs -Lc:/Python32/libs -lpython32"
        ;;
 *)
        # We know that Linux has 'python3-config'.
        # 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)"
@@ -147,8 +150,12 @@ AC_SUBST(SRD_PACKAGE_VERSION)
 AC_CONFIG_FILES([Makefile
                 sigrokdecode.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
@@ -158,20 +165,23 @@ AC_CONFIG_FILES([Makefile
                 decoders/jtag_stm32/Makefile
                 decoders/lm75/Makefile
                 decoders/lpc/Makefile
+                decoders/maxim_ds28ea00/Makefile
                 decoders/mlx90614/Makefile
                 decoders/mx25lxx05d/Makefile
                 decoders/mxc6225xu/Makefile
                 decoders/nunchuk/Makefile
+                decoders/onewire_link/Makefile
+                decoders/onewire_network/Makefile
                 decoders/pan1321/Makefile
                 decoders/rtc8564/Makefile
+                decoders/sdcard_spi/Makefile
                 decoders/spi/Makefile
+                decoders/tlc5620/Makefile
                 decoders/transitioncounter/Makefile
                 decoders/uart/Makefile
                 decoders/uart_dump/Makefile
-                decoders/usb/Makefile
-                decoders/usb_signalling/Makefile
                 decoders/usb_protocol/Makefile
-                decoders/onewire/Makefile
+                decoders/usb_signalling/Makefile
                ])
 
 AC_OUTPUT