X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=145335653662ababf4e475fd51da76333ad3b1ae;hp=3d592979b67d7052b86d5ec3ed00d2c46d7755d7;hb=65e1c7d091956e42aa4d97d7b639e10076e6f8ff;hpb=066e65a3a60ef5836d9e75b8dffeb55a152efe4d diff --git a/configure.ac b/configure.ac index 3d59297..1453356 100644 --- a/configure.ac +++ b/configure.ac @@ -17,22 +17,25 @@ ## 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([libsigrokdecode_major_version], [0]) +m4_define([libsigrokdecode_minor_version], [2]) +m4_define([libsigrokdecode_micro_version], [0]) +m4_define([libsigrokdecode_version], + [libsigrokdecode_major_version.libsigrokdecode_minor_version.libsigrokdecode_micro_version]) AC_INIT([libsigrokdecode], [libsigrokdecode_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])]) AH_TOP([#ifndef LIBSIGROKDECODE_CONFIG_H @@ -55,16 +58,16 @@ 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) +LIBSIGROKDECODE_LT_CURRENT=0 +LIBSIGROKDECODE_LT_REVISION=0 +LIBSIGROKDECODE_LT_AGE=0 +LIBSIGROKDECODE_LT_VERSION="$LIBSIGROKDECODE_LT_CURRENT:$LIBSIGROKDECODE_LT_REVISION:$LIBSIGROKDECODE_LT_AGE" +LIBSIGROKDECODE_LT_LDFLAGS="-version-info $LIBSIGROKDECODE_LT_VERSION" +AC_SUBST(LIBSIGROKDECODE_LT_LDFLAGS) # Checks for libraries. @@ -75,38 +78,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 +109,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 +124,78 @@ 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/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]) +LIBSIGROKDECODE_MAJOR_VERSION=libsigrokdecode_major_version +LIBSIGROKDECODE_MINOR_VERSION=libsigrokdecode_minor_version +LIBSIGROKDECODE_MICRO_VERSION=libsigrokdecode_micro_version +LIBSIGROKDECODE_VERSION=libsigrokdecode_version + +AC_SUBST(LIBSIGROKDECODE_MAJOR_VERSION) +AC_SUBST(LIBSIGROKDECODE_MINOR_VERSION) +AC_SUBST(LIBSIGROKDECODE_MICRO_VERSION) +AC_SUBST(LIBSIGROKDECODE_VERSION) + +AC_DEFINE(LIBSIGROKDECODE_MAJOR_VERSION, [libsigrokdecode_major_version], + [Define to the libsigrokdecode major package version]) +AC_DEFINE(LIBSIGROKDECODE_MINOR_VERSION, [libsigrokdecode_minor_version], + [Define to the libsigrokdecode minor package version]) +AC_DEFINE(LIBSIGROKDECODE_MICRO_VERSION, [libsigrokdecode_micro_version], + [Define to the libsigrokdecode micro package version]) +AC_DEFINE(LIBSIGROKDECODE_VERSION, [libsigrokdecode_version], + [Define to the libsigrokdecode package version]) AC_CONFIG_FILES([Makefile libsigrokdecode.pc decoders/Makefile + decoders/dcf77/Makefile + decoders/ebr30a_i2c_demux/Makefile + decoders/edid/Makefile + decoders/i2c/Makefile + decoders/i2cdemux/Makefile + decoders/i2cfilter/Makefile + decoders/mlx90614/Makefile + decoders/mx25lxx05d/Makefile + decoders/nunchuk/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): $LIBSIGROKDECODE_VERSION" +echo " - Library version (current:revision:age): $LIBSIGROKDECODE_LT_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 +