X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=1314dea099434a3dde6d5f88901a6812060a45a1;hp=444b631f806eb3d745c2926d0b35776dd525fc62;hb=fbd226c3f70f20fdf3cbfd43a671bf2bcc5d23e6;hpb=7560e16c17b9616e2ab6ae39a65c550b061889fd diff --git a/configure.ac b/configure.ac index 444b631..1314dea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ ## -## This file is part of the sigrok project. +## This file is part of the libsigrokdecode project. ## ## Copyright (C) 2010 Bert Vermeulen ## @@ -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], [1]) +m4_define([srd_package_version_minor], [2]) 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 foreign std-options]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror check-news color-tests]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) @@ -47,12 +47,14 @@ AH_BOTTOM([#endif /* SRD_CONFIG_H */]) CFLAGS="$CFLAGS -Wall -Wextra -fvisibility=hidden" # Checks for programs. -AC_PROG_CXX AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL AC_PROG_LN_S +# Required for per-target flags or subdir-objects with C sources. +AM_PROG_CC_C_O + # Initialize libtool. LT_INIT @@ -64,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=0 +SRD_LIB_VERSION_CURRENT=1 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" @@ -85,7 +87,7 @@ AM_PATH_GLIB_2_0([2.24.0], # 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 python3.2-config python3.1-config python3.0-config]) +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]) CPPFLAGS_PYTHON="" LDFLAGS_PYTHON="" case "$build" in @@ -115,6 +117,17 @@ esac AC_SUBST(CPPFLAGS_PYTHON) AC_SUBST(LDFLAGS_PYTHON) +# 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") + +PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2.0], + [have_libsigrok="yes"; CFLAGS="$CFLAGS $libsigrok_CFLAGS"; + LIBS="$LIBS $libsigrok_LIBS"], [have_libsigrok="no"]) +AM_CONDITIONAL(HAVE_LIBSIGROK, test x"$have_libsigrok" = "xyes") + # Checks for header files. # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h. # AC_CHECK_HEADERS([]) @@ -149,38 +162,10 @@ AC_SUBST(SRD_PACKAGE_VERSION_MICRO) AC_SUBST(SRD_PACKAGE_VERSION) AC_CONFIG_FILES([Makefile - sigrokdecode.h + version.h libsigrokdecode.pc - decoders/Makefile - decoders/avr_isp/Makefile - decoders/can/Makefile - decoders/dcf77/Makefile - decoders/edid/Makefile - decoders/i2c/Makefile - decoders/i2cdemux/Makefile - decoders/i2cfilter/Makefile - decoders/i2s/Makefile - decoders/jtag/Makefile - decoders/jtag_stm32/Makefile - decoders/lm75/Makefile - decoders/lpc/Makefile - decoders/maxim_ds28ea00/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/rtc8564/Makefile - decoders/sdcard_spi/Makefile - decoders/spi/Makefile - decoders/tlc5620/Makefile - decoders/transitioncounter/Makefile - decoders/uart/Makefile - decoders/uart_dump/Makefile - decoders/usb_protocol/Makefile - decoders/usb_signalling/Makefile + contrib/Makefile + tests/Makefile ]) AC_OUTPUT @@ -191,12 +176,14 @@ echo echo " - Package version (major.minor.micro): $SRD_PACKAGE_VERSION" echo " - Library version (current:revision:age): $SRD_LIB_VERSION" echo " - Prefix: $prefix" +echo " - Building on: $build" +echo " - Building for: $host" echo echo "Detected libraries:" echo # Note: This only works for libs with pkg-config integration. -for lib in "glib-2.0"; 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)"