X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=f42f0f4c930ab08f9bb25349a57b54e887be57be;hp=aecec7ccdd6b883802931a2d5b031d1aa7949cc3;hb=bf20c75821129600da8ccd3ff5fe33d8f31812b4;hpb=084f0f94deedb52ced0c96590a621339973eb7a7 diff --git a/configure.ac b/configure.ac index aecec7c..f42f0f4 100644 --- a/configure.ac +++ b/configure.ac @@ -17,27 +17,30 @@ ## along with this program. If not, see . ## -AC_PREREQ(2.61) +# We require at least autoconf 2.63 (AC_INIT format changed there). +AC_PREREQ([2.63]) -# TODO: Should be libsigrokdecode, not sigrok. -m4_define([sigrok_major_version], [0]) -m4_define([sigrok_minor_version], [2]) -m4_define([sigrok_micro_version], [0]) -m4_define([sigrok_version], - [sigrok_major_version.sigrok_minor_version.sigrok_micro_version]) +# 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_micro], [0]) +m4_define([srd_package_version], [srd_package_version_major.srd_package_version_minor.srd_package_version_micro]) -AC_INIT([libsigrokdecode], [libsigrokdecode_version], +AC_INIT([libsigrokdecode], [srd_package_version], [sigrok-devel@lists.sourceforge.net], [libsigrokdecode], [http://www.sigrok.org]) AC_CONFIG_HEADER([config.h]) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_MACRO_DIR([autostuff]) +AC_CONFIG_AUX_DIR([autostuff]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign std-options]) +# We require at least automake 1.11 (needed for 'silent rules'). +AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign std-options]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) -AH_TOP([#ifndef LIBSIGROKDECODE_CONFIG_H -#define LIBSIGROKDECODE_CONFIG_H /* To stop multiple inclusions. */]) -AH_BOTTOM([#endif /* LIBSIGROKDECODE_CONFIG_H */]) +AH_TOP([#ifndef SRD_CONFIG_H +#define SRD_CONFIG_H /* To stop multiple inclusions. */]) +AH_BOTTOM([#endif /* SRD_CONFIG_H */]) CFLAGS="-g -Wall -Wextra" @@ -55,16 +58,20 @@ LT_INIT # We require at least 0.22, as "Requires.private" behaviour changed there. PKG_PROG_PKG_CONFIG([0.22]) -# Library version for libsigrokdecode. +# Library version for libsigrokdecode (NOT the same as the package version). # 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 -SIGROKDECODE_LT_CURRENT=0 -SIGROKDECODE_LT_REVISION=0 -SIGROKDECODE_LT_AGE=0 -SIGROKDECODE_LT_VERSION="$SIGROKDECODE_LT_CURRENT:$SIGROKDECODE_LT_REVISION:$SIGROKDECODE_LT_AGE" -SIGROKDECODE_LT_LDFLAGS="-version-info $SIGROKDECODE_LT_VERSION" -AC_SUBST(SIGROKDECODE_LT_LDFLAGS) +SRD_LIB_VERSION_CURRENT=0 +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" +SRD_LIB_LDFLAGS="-version-info $SRD_LIB_VERSION" +AC_SUBST(SRD_LIB_VERSION_CURRENT) +AC_SUBST(SRD_LIB_VERSION_REVISION) +AC_SUBST(SRD_LIB_VERSION_AGE) +AC_SUBST(SRD_LIB_VERSION) +AC_SUBST(SRD_LIB_LDFLAGS) # Checks for libraries. @@ -75,38 +82,30 @@ AM_PATH_GLIB_2_0([2.22.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.2-config python3.1-config python3.0-config]) CPPFLAGS_PYTHON="" LDFLAGS_PYTHON="" case "$build" in -*linux*) - # We know that Linux has 'python3-config'. - CPPFLAGS_PYTHON="$(python3-config --includes)" - LDFLAGS_PYTHON="$(python3-config --ldflags)" - ;; -*darwin*) - # 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. - if test -x python3-config; then - # python3-config exists, use it. - CPPFLAGS_PYTHON="$(python3-config --includes)" - LDFLAGS_PYTHON="$(python3-config --ldflags)" - else - # No python3-config found, so try hardcoded python3.2-config. - CPPFLAGS_PYTHON="$(python3.2-config --includes)" - LDFLAGS_PYTHON="$(python3.2-config --ldflags)" - fi - ;; *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. + AC_MSG_WARN([using hardcoded Python3 configuration on MinGW]) CPPFLAGS_PYTHON="-I/c/Python32/include" LDFLAGS_PYTHON="-L/c/Python32/libs -lpython32" ;; *) - # Everything else is untested, we just hope 'python3-config' works. - CPPFLAGS_PYTHON="$(python3-config --includes)" - LDFLAGS_PYTHON="$(python3-config --ldflags)" + # 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 'PYTHON3_CONFIG' works. + 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 AC_SUBST(CPPFLAGS_PYTHON) @@ -114,7 +113,7 @@ AC_SUBST(LDFLAGS_PYTHON) # Checks for header files. # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h. -AC_CHECK_HEADERS([fcntl.h sys/time.h termios.h]) +# AC_CHECK_HEADERS([]) # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE @@ -129,35 +128,73 @@ AC_TYPE_UINT64_T AC_TYPE_SIZE_T # Checks for library functions. -AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull]) +AC_CHECK_FUNCS([memset strtoull]) -AC_SUBST(DECODERS_DIR, "$datadir/sigrok/decoders") +AC_SUBST(DECODERS_DIR, "$datadir/libsigrokdecode/decoders") AC_SUBST(MAKEFLAGS, '--no-print-directory') AC_SUBST(AM_LIBTOOLFLAGS, '--silent') -SIGROK_MAJOR_VERSION=sigrok_major_version -SIGROK_MINOR_VERSION=sigrok_minor_version -SIGROK_MICRO_VERSION=sigrok_micro_version -SIGROK_VERSION=sigrok_version - -AC_SUBST(SIGROK_MAJOR_VERSION) -AC_SUBST(SIGROK_MINOR_VERSION) -AC_SUBST(SIGROK_MICRO_VERSION) -AC_SUBST(SIGROK_VERSION) - -AC_DEFINE(SIGROK_MAJOR_VERSION, [sigrok_major_version], - [Define to the sigrok major version]) -AC_DEFINE(SIGROK_MINOR_VERSION, [sigrok_minor_version], - [Define to the sigrok minor version]) -AC_DEFINE(SIGROK_MICRO_VERSION, [sigrok_micro_version], - [Define to the sigrok micro version]) -AC_DEFINE(SIGROK_VERSION, [sigrok_version], - [Define to the sigrok version]) +SRD_PACKAGE_VERSION_MAJOR=srd_package_version_major +SRD_PACKAGE_VERSION_MINOR=srd_package_version_minor +SRD_PACKAGE_VERSION_MICRO=srd_package_version_micro +SRD_PACKAGE_VERSION=srd_package_version + +AC_SUBST(SRD_PACKAGE_VERSION_MAJOR) +AC_SUBST(SRD_PACKAGE_VERSION_MINOR) +AC_SUBST(SRD_PACKAGE_VERSION_MICRO) +AC_SUBST(SRD_PACKAGE_VERSION) AC_CONFIG_FILES([Makefile + sigrokdecode.h libsigrokdecode.pc decoders/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/lpc/Makefile + decoders/mlx90614/Makefile + decoders/mx25lxx05d/Makefile + decoders/mxc6225xu/Makefile + decoders/pan1321/Makefile + decoders/rtc8564/Makefile + decoders/spi/Makefile + decoders/transitioncounter/Makefile + decoders/uart/Makefile + decoders/usb/Makefile ]) AC_OUTPUT +echo +echo "libsigrokdecode configuration summary:" +echo +echo " - Package version (major.minor.micro): $SRD_PACKAGE_VERSION" +echo " - Library version (current:revision:age): $SRD_LIB_VERSION" +echo " - Prefix: $prefix" +echo +echo "Detected libraries:" +echo + +# Note: This only works for libs with pkg-config integration. +for lib in "glib-2.0"; do + if `$PKG_CONFIG --exists $lib`; then + ver=`$PKG_CONFIG --modversion $lib` + answer="yes ($ver)" + else + answer="no" + fi + echo " - $lib: $answer" +done + +echo +echo "Detected Python:" +echo +echo " - Python CPPFLAGS: $CPPFLAGS_PYTHON" +echo " - Python LDFLAGS: $LDFLAGS_PYTHON" +echo +