srd: extra module path can now optionally be passed to srd_init()

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1b2aeb531b78dd7f55ef6a02ce9e42a697d7e773..145335653662ababf4e475fd51da76333ad3b1ae 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,8 @@
 ## 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])
@@ -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
@@ -76,38 +78,30 @@ AM_PATH_GLIB_2_0([2.22.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])
 CPPFLAGS_PYTHON=""
 LDFLAGS_PYTHON=""
 case "$build" in
-*linux*)
-       # We know that Linux has 'python3-config'.
-       CPPFLAGS_PYTHON="$(python3-config --includes)"
-       LDFLAGS_PYTHON="$(python3-config --ldflags)"
-       ;;
-*darwin*)
-       # 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.
-       if test -x python3-config; then
-               # python3-config exists, use it.
-               CPPFLAGS_PYTHON="$(python3-config --includes)"
-               LDFLAGS_PYTHON="$(python3-config --ldflags)"
-       else
-               # No python3-config found, so try hardcoded python3.2-config.
-               CPPFLAGS_PYTHON="$(python3.2-config --includes)"
-               LDFLAGS_PYTHON="$(python3.2-config --ldflags)"
-       fi
-       ;;
 *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.
+       AC_MSG_WARN([using hardcoded Python3 configuration on MinGW])
        CPPFLAGS_PYTHON="-I/c/Python32/include"
        LDFLAGS_PYTHON="-L/c/Python32/libs -lpython32"
        ;;
 *)
-       # Everything else is untested, we just hope 'python3-config' works.
-       CPPFLAGS_PYTHON="$(python3-config --includes)"
-       LDFLAGS_PYTHON="$(python3-config --ldflags)"
+       # 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.
+       if test -n "$PYTHON3_CONFIG"; then
+               CPPFLAGS_PYTHON="$($PYTHON3_CONFIG --includes)"
+               LDFLAGS_PYTHON="$($PYTHON3_CONFIG --ldflags)"
+       else
+               AC_MSG_ERROR([python3-config not found])
+       fi
        ;;
 esac
 AC_SUBST(CPPFLAGS_PYTHON)
@@ -158,6 +152,21 @@ AC_DEFINE(LIBSIGROKDECODE_VERSION, [libsigrokdecode_version],
 AC_CONFIG_FILES([Makefile
                 libsigrokdecode.pc
                 decoders/Makefile
+                decoders/dcf77/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
+                decoders/rtc8564/Makefile
+                decoders/spi/Makefile
+                decoders/transitioncounter/Makefile
+                decoders/uart/Makefile
+                decoders/usb/Makefile
                ])
 
 AC_OUTPUT