# libsigrokdecode package version number (NOT the same as shared lib version!).
m4_define([srd_package_version_major], [0])
-m4_define([srd_package_version_minor], [2])
-m4_define([srd_package_version_micro], [0])
+m4_define([srd_package_version_minor], [3])
+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 check-news color-tests])
+AM_INIT_AUTOMAKE([1.11 -Wall -Werror subdir-objects check-news color-tests])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
# 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"
+CFLAGS="$CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden"
# Checks for programs.
AC_PROG_CC
# 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=1
-SRD_LIB_VERSION_REVISION=0
+SRD_LIB_VERSION_CURRENT=2
+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"
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 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])
+# Python 3 is always needed.
+# Note: We need to try a few different variants, since some systems have a
+# python3.pc file, others have a python-3.3.pc file, and so on.
+# We also export the name of the package so that it can be correctly
+# added to libsigrokdecode.pc.
+# See also: http://sigrok.org/wiki/Libsigrokdecode/Python
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 -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 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)"
- else
- AC_MSG_ERROR([python3-config not found])
- fi
- ;;
-esac
+pyver="none"
+PKG_CHECK_MODULES([python3], [python3 >= 3.2],
+ [pyver=`$PKG_CONFIG --modversion python3`;
+ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python3_CFLAGS";
+ LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python3_LIBS";
+ MODNAME_PYTHON="python3"],
+[PKG_CHECK_MODULES([python34], [python-3.4 >= 3.4],
+ [pyver=`$PKG_CONFIG --modversion python-3.4`;
+ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python34_CFLAGS";
+ LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python34_LIBS";
+ MODNAME_PYTHON="python-3.4"],
+[PKG_CHECK_MODULES([python33], [python-3.3 >= 3.3],
+ [pyver=`$PKG_CONFIG --modversion python-3.3`;
+ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python33_CFLAGS";
+ LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python33_LIBS";
+ MODNAME_PYTHON="python-3.3"],
+[PKG_CHECK_MODULES([python32], [python-3.2 >= 3.2],
+ [pyver=`$PKG_CONFIG --modversion python-3.2`;
+ CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python32_CFLAGS";
+ LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python32_LIBS";
+ MODNAME_PYTHON="python-3.2"],
+)])])])
AC_SUBST(CPPFLAGS_PYTHON)
AC_SUBST(LDFLAGS_PYTHON)
+AC_SUBST(MODNAME_PYTHON)
+
+# We also need to find the name of the python3 executable (for 'make install').
+# Some OSes call this python3, some call it python3.2, etc. etc.
+AC_CHECK_PROGS([PYTHON3], [python3.4 python3.3 python3.2 python3])
+if test "x$PYTHON3" = "x"; then
+ AC_MSG_ERROR([cannot find python3 executable.])
+fi
+
+# Link against libm, this is required (among other things) by Python.
+AC_SEARCH_LIBS([pow], [m])
# The Check unit testing framework is optional. Disable if not found.
PKG_CHECK_MODULES([check], [check >= 0.9.4],
- [have_check="yes"; CFLAGS="$CFLAGS $check_CFLAGS";
- LIBS="$LIBS $check_LIBS"], [have_check="no"])
+ [have_check="yes"], [have_check="no"])
AM_CONDITIONAL(HAVE_CHECK, test x"$have_check" = "xyes")
# Checks for header files.
# These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-# AC_CHECK_HEADERS([])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_INLINE
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-AC_TYPE_SIZE_T
-
-# Checks for library functions.
-AC_CHECK_FUNCS([memset strtoull])
AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders")
AC_SUBST(MAKEFLAGS, '--no-print-directory')
AC_SUBST(SRD_PACKAGE_VERSION_MICRO)
AC_SUBST(SRD_PACKAGE_VERSION)
-AC_CONFIG_FILES([Makefile
- 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
- decoders/i2cfilter/Makefile
- decoders/i2s/Makefile
- decoders/i2s_dump/Makefile
- decoders/jtag/Makefile
- decoders/jtag_stm32/Makefile
- decoders/lm75/Makefile
- decoders/lpc/Makefile
- decoders/maxim_ds28ea00/Makefile
- decoders/midi/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/parallel/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_packet/Makefile
- decoders/usb_signalling/Makefile
- decoders/xfp/Makefile
- tests/Makefile
- ])
+AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc])
AC_OUTPUT
echo "Detected libraries:"
echo
+if test "x$pyver" = "xnone"; then
+ echo " - (REQUIRED) python >= 3.2: no"
+else
+ echo " - (REQUIRED) python >= 3.2: yes ($pyver)"
+fi
+
# Note: This only works for libs with pkg-config integration.
for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4"; do
- if `$PKG_CONFIG --exists $lib`; then
- ver=`$PKG_CONFIG --modversion $lib`
- answer="yes ($ver)"
- else
- answer="no"
- fi
- echo " - $lib: $answer"
+ optional="OPTIONAL"
+ if test "x$lib" = "xglib-2.0 >= 2.24.0"; then optional="REQUIRED"; fi
+ if `$PKG_CONFIG --exists $lib`; then
+ ver=`$PKG_CONFIG --modversion $lib`
+ answer="yes ($ver)"
+ else
+ answer="no"
+ fi
+ echo " - ($optional) $lib: $answer"
done
echo
-echo "Detected Python:"
+echo "Enabled features:"
echo
-echo " - Python CPPFLAGS: $CPPFLAGS_PYTHON"
-echo " - Python LDFLAGS: $LDFLAGS_PYTHON"
+echo " - (OPTIONAL) Library unit test framework support: $have_check"
echo