rfm12: Avoid using the Python 'range' keyword as variable.

[libsigrokdecode.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index b7777adf45ce8fda0acb851b70c5476638e35863..28014ecfb4eed42e309f10262b858f6b855ef01b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,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], [2])
+m4_define([srd_package_version_minor], [3])
 m4_define([srd_package_version_micro], [0])
 m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro])
 
@@ -44,7 +44,7 @@ AH_BOTTOM([#endif /* SRD_CONFIG_H */])
 
 # 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 -Wmissing-prototypes -fvisibility=hidden"
+AM_CFLAGS="$AM_CFLAGS -Wall -Wextra -Wmissing-prototypes -fvisibility=hidden"
 
 # Checks for programs.
 AC_PROG_CC
@@ -66,7 +66,7 @@ PKG_PROG_PKG_CONFIG([0.22])
 # 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_CURRENT=2
 SRD_LIB_VERSION_REVISION=0
 SRD_LIB_VERSION_AGE=0
 SRD_LIB_VERSION="$SRD_LIB_VERSION_CURRENT:$SRD_LIB_VERSION_REVISION:$SRD_LIB_VERSION_AGE"
@@ -77,20 +77,19 @@ AC_SUBST(SRD_LIB_VERSION_AGE)
 AC_SUBST(SRD_LIB_VERSION)
 AC_SUBST(SRD_LIB_LDFLAGS)
 
-# Assume we can build tests/runtc unless proven otherwise.
-build_runtc="yes"
-
 # Checks for libraries.
 
 # 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.24.0],
-        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
+        [AM_CFLAGS="$AM_CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # 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=""
@@ -98,39 +97,45 @@ 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"],
-[PKG_CHECK_MODULES([python33], [python-3.3 >= 3.2],
+       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"],
+       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"],
-)])])
+       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")
 
-# libsigrok is optional (only used for the protocol decoder test framework).
-# Disable if not found.
-PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0],
-       [LIBSIGROK_CFLAGS="$libsigrok_CFLAGS"; LIBSIGROK_LIBS="$libsigrok_LIBS"],
-       [build_runtc="no"])
-AC_SUBST([LIBSIGROK_CFLAGS])
-AC_SUBST([LIBSIGROK_LIBS])
-
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
-AC_CHECK_HEADER([sys/resource.h], [], [build_runtc="no"])
 
 AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
@@ -146,7 +151,7 @@ AC_SUBST(SRD_PACKAGE_VERSION_MINOR)
 AC_SUBST(SRD_PACKAGE_VERSION_MICRO)
 AC_SUBST(SRD_PACKAGE_VERSION)
 
-AM_CONDITIONAL(BUILD_RUNTC, test x"$build_runtc" = "xyes")
+AC_SUBST(AM_CFLAGS)
 
 AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc])
 
@@ -171,7 +176,7 @@ else
 fi
 
 # Note: This only works for libs with pkg-config integration.
-for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4" "libsigrok >= 0.2.0"; do
+for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4"; do
        optional="OPTIONAL"
        if test "x$lib" = "xglib-2.0 >= 2.24.0"; then optional="REQUIRED"; fi
        if `$PKG_CONFIG --exists $lib`; then
@@ -187,6 +192,5 @@ echo
 echo "Enabled features:"
 echo
 echo "  - (OPTIONAL) Library unit test framework support: $have_check"
-echo "  - (OPTIONAL) Protocol decoder test framework support: $build_runtc"
 echo