X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=cd2ebe865d92c6a61288688fdc461b70b047d6f1;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=4402259ae1f4361427480efd160ffe9784c5da49;hpb=d8521c939f19b08cb991df7d0731fa358381d61c;p=libsigrok.git diff --git a/configure.ac b/configure.ac index 4402259a..cd2ebe86 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ## ## This file is part of the sigrok project. ## -## Copyright (C) 2010 Bert Vermeulen +## Copyright (C) 2010-2012 Bert Vermeulen ## ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -17,14 +17,14 @@ ## 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 libsigrok, no 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]) +# libsigrok package version number (NOT the same as shared lib version!). +m4_define([libsigrok_major_version], [0]) +m4_define([libsigrok_minor_version], [2]) +m4_define([libsigrok_micro_version], [0]) +m4_define([libsigrok_version], [libsigrok_major_version.libsigrok_minor_version.libsigrok_micro_version]) AC_INIT([libsigrok], [libsigrok_version], [sigrok-devel@lists.sourceforge.net], [libsigrok], [http://www.sigrok.org]) @@ -32,14 +32,17 @@ AC_CONFIG_HEADER([config.h]) 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 LIBSIGROK_CONFIG_H #define LIBSIGROK_CONFIG_H /* To stop multiple inclusions. */]) AH_BOTTOM([#endif /* LIBSIGROK_CONFIG_H */]) -CFLAGS="-g -Wall -Wextra" +# Enable more compiler warnings via -Wall and -Wextra. Add -fvisibility=hidden +# and enforce use of SR_API to explicitly mark all public API functions. +CFLAGS="-g -Wall -Wextra -fvisibility=hidden" # Checks for programs. AC_PROG_CXX @@ -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 libsigrok. +# Library version for libsigrok (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 -SIGROK_LT_CURRENT=0 -SIGROK_LT_REVISION=0 -SIGROK_LT_AGE=0 -SIGROK_LT_VERSION="$SIGROK_LT_CURRENT:$SIGROK_LT_REVISION:$SIGROK_LT_AGE" -SIGROK_LT_LDFLAGS="-version-info $SIGROK_LT_VERSION" -AC_SUBST(SIGROK_LT_LDFLAGS) +LIBSIGROK_LT_CURRENT=0 +LIBSIGROK_LT_REVISION=0 +LIBSIGROK_LT_AGE=0 +LIBSIGROK_LT_VERSION="$LIBSIGROK_LT_CURRENT:$LIBSIGROK_LT_REVISION:$LIBSIGROK_LT_AGE" +LIBSIGROK_LT_LDFLAGS="-version-info $LIBSIGROK_LT_VERSION" +AC_SUBST(LIBSIGROK_LT_LDFLAGS) # Logic analyzer hardware support '--enable' options. @@ -188,9 +191,18 @@ PKG_CHECK_MODULES([libzip], [libzip >= 0.8], # zlib is only needed for some hardware drivers. if test "x$LA_ASIX_SIGMA" != xno; then - PKG_CHECK_MODULES([zlib], [zlib >= 1.2.3.1], - [CFLAGS="$CFLAGS $zlib_CFLAGS"; LIBS="$LIBS $zlib_LIBS"; - LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS zlib"]) + case "$build" in + *freebsd*) + # FreeBSD has zlib, but no pkg-config file for it. + # Check manually, and do NOT add it to LIBSIGROK_PKGLIBS. + AC_CHECK_LIB(z, uncompress) + ;; + *) + PKG_CHECK_MODULES([zlib], [zlib >= 1.2.3.1], + [CFLAGS="$CFLAGS $zlib_CFLAGS"; LIBS="$LIBS $zlib_LIBS"; + LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS zlib"]) + ;; + esac fi # libftdi is only needed for some hardware drivers. @@ -241,27 +253,26 @@ AC_SUBST(FIRMWARE_DIR, "$datadir/libsigrok/firmware") 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]) +LIBSIGROK_MAJOR_VERSION=libsigrok_major_version +LIBSIGROK_MINOR_VERSION=libsigrok_minor_version +LIBSIGROK_MICRO_VERSION=libsigrok_micro_version +LIBSIGROK_VERSION=libsigrok_version + +AC_SUBST(LIBSIGROK_MAJOR_VERSION) +AC_SUBST(LIBSIGROK_MINOR_VERSION) +AC_SUBST(LIBSIGROK_MICRO_VERSION) +AC_SUBST(LIBSIGROK_VERSION) + +AC_DEFINE(LIBSIGROK_MAJOR_VERSION, [libsigrok_major_version], + [Define to the libsigrok major package version]) +AC_DEFINE(LIBSIGROK_MINOR_VERSION, [libsigrok_minor_version], + [Define to the libsigrok minor package version]) +AC_DEFINE(LIBSIGROK_MICRO_VERSION, [libsigrok_micro_version], + [Define to the libsigrok micro package version]) +AC_DEFINE(LIBSIGROK_VERSION, [libsigrok_version], + [Define to the libsigrok package version]) AC_CONFIG_FILES([Makefile - sigrok.h firmware/Makefile hardware/Makefile hardware/alsa/Makefile @@ -283,13 +294,35 @@ AC_CONFIG_FILES([Makefile AC_OUTPUT echo -echo "Building drivers:" +echo "libsigrok configuration summary:" +echo +echo " - Package version (major.minor.micro): $LIBSIGROK_VERSION" +echo " - Library version (current:revision:age): $LIBSIGROK_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" "gthread-2.0" "libusb-1.0" "libzip" "zlib" "libftdi" "libudev" "alsa"; 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 "Enabled hardware drivers:" echo -echo "ASIX SIGMA...................... " $LA_ASIX_SIGMA -echo "ChronoVu LA8.................... " $LA_CHRONOVU_LA8 -echo "Link MSO-19..................... " $LA_LINK_MSO19 -echo "Openbench Logic Sniffer......... " $LA_OLS -echo "Saleae Logic.................... " $LA_SALEAE_LOGIC -echo "Zeroplus Logic Cube............. " $LA_ZEROPLUS_LOGIC_CUBE +echo " - ASIX SIGMA...................... $LA_ASIX_SIGMA" +echo " - ChronoVu LA8.................... $LA_CHRONOVU_LA8" +echo " - Demo driver..................... $LA_DEMO" +echo " - Link MSO-19..................... $LA_LINK_MSO19" +echo " - Openbench Logic Sniffer......... $LA_OLS" +echo " - Saleae Logic.................... $LA_SALEAE_LOGIC" +echo " - Zeroplus Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE" echo