X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=10213a74835f63c88669a712d00e21bdd00f5fe9;hp=962c1b7e1ce3bcaa3684fb9f4804da6f3f464986;hb=83df730dd21ce52670a593455cfe5e732989a90d;hpb=cb73763da5d004b3f780f4395ccf19a398da60a2 diff --git a/configure.ac b/configure.ac index 962c1b7..10213a7 100644 --- 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]) @@ -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 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]) @@ -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,7 +77,7 @@ 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 +# Assume we can build tests/runtc unless proven otherwise. build_runtc="yes" # Checks for libraries. @@ -91,40 +91,55 @@ AM_PATH_GLIB_2_0([2.24.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="" -PKG_CHECK_MODULES([python3], [python3 >= 3.0], - [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python3_CFLAGS"; - LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python3_LIBS"], -[PKG_CHECK_MODULES([python33], [python-3.3 >= 3.0], - [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python33_CFLAGS"; - LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python33_LIBS"], -[PKG_CHECK_MODULES([python32], [python-3.2 >= 3.0], - [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python32_CFLAGS"; - LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python32_LIBS"], -[PKG_CHECK_MODULES([python31], [python-3.1 >= 3.0], - [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python31_CFLAGS"; - LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python31_LIBS"], -[PKG_CHECK_MODULES([python30], [python-3.0 >= 3.0], - [CPPFLAGS_PYTHON="$CPPFLAGS_PYTHON $python30_CFLAGS"; - LDFLAGS_PYTHON="$LDFLAGS_PYTHON $python30_LIBS"], -)])])])]) +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") # libsigrok is optional (only used for the protocol decoder test framework). # Disable if not found. -PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0], +PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.3.0], [LIBSIGROK_CFLAGS="$libsigrok_CFLAGS"; LIBSIGROK_LIBS="$libsigrok_LIBS"], [build_runtc="no"]) AC_SUBST([LIBSIGROK_CFLAGS]) @@ -150,12 +165,7 @@ AC_SUBST(SRD_PACKAGE_VERSION) AM_CONDITIONAL(BUILD_RUNTC, test x"$build_runtc" = "xyes") -AC_CONFIG_FILES([Makefile - version.h - libsigrokdecode.pc - contrib/Makefile - tests/Makefile - ]) +AC_CONFIG_FILES([Makefile version.h libsigrokdecode.pc]) AC_OUTPUT @@ -167,26 +177,33 @@ echo " - Library version (current:revision:age): $SRD_LIB_VERSION" echo " - Prefix: $prefix" echo " - Building on: $build" echo " - Building for: $host" -echo " - Building protocol decoder test framework: $build_runtc" echo 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" "libsigrok >= 0.2.0"; do - if `$PKG_CONFIG --exists $lib`; then - ver=`$PKG_CONFIG --modversion $lib` - answer="yes ($ver)" - else - answer="no" - fi - echo " - $lib: $answer" +for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4" "libsigrok >= 0.3.0"; do + 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 " - (OPTIONAL) Protocol decoder test framework support: $build_runtc" echo