X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=b8171423f4d2960ea1cd27edf1c402fb892b249c;hp=f56803b9eccbb1c771fe63c9114206b5d139f8b9;hb=4dc2a249c9691da9981c849270267a3dc1096700;hpb=56c93143f54601280a119b64b1eea8dc4b591dcb diff --git a/configure.ac b/configure.ac index f56803b..b817142 100644 --- a/configure.ac +++ b/configure.ac @@ -77,6 +77,9 @@ 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. @@ -85,62 +88,51 @@ AC_SUBST(SRD_LIB_LDFLAGS) 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. +# 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 +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"], +)])])])]) AC_SUBST(CPPFLAGS_PYTHON) AC_SUBST(LDFLAGS_PYTHON) +# 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"]) 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_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_CHECK_HEADER([sys/resource.h], [], [build_runtc="no"]) AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders") AC_SUBST(MAKEFLAGS, '--no-print-directory') @@ -156,46 +148,12 @@ 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_CONFIG_FILES([Makefile - libsigrokdecode.h + version.h libsigrokdecode.pc contrib/Makefile - decoders/Makefile - decoders/avr_isp/Makefile - decoders/can/Makefile - decoders/dcf77/Makefile - decoders/ds1307/Makefile - decoders/edid/Makefile - decoders/guess_bitrate/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 ]) @@ -209,12 +167,13 @@ 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 # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0 >= 2.24.0" "check >= 0.9.4"; do +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)"