X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=76db0a65a6e96d7536ef86392910479f880db7a3;hb=6dddd902244f314eba721a0d8804731ea9c9912d;hp=feeed0b48501e19725c0f7e58b6b423edf1eacd9;hpb=8e190238d7b33ebb9f1baa2a28a37ffd041f7334;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index feeed0b4..76db0a65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 ##
 ## This file is part of the sigrok project.
 ##
-## Copyright (C) 2010 Bert Vermeulen <bert@biot.com>
+## Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
 ##
 ## 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,28 +17,32 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-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([sr_package_version_major], [0])
+m4_define([sr_package_version_minor], [1])
+m4_define([sr_package_version_micro], [0])
+m4_define([sr_package_version], [sr_package_version_major.sr_package_version_minor.sr_package_version_micro])
 
-AC_INIT([libsigrok], [libsigrok_version], [sigrok-devel@lists.sourceforge.net],
+AC_INIT([libsigrok], [sr_package_version], [sigrok-devel@lists.sourceforge.net],
 	[libsigrok], [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 LIBSIGROK_CONFIG_H
-#define LIBSIGROK_CONFIG_H    /* To stop multiple inclusions. */])
-AH_BOTTOM([#endif /* LIBSIGROK_CONFIG_H */])
+AH_TOP([#ifndef SR_CONFIG_H
+#define SR_CONFIG_H    /* To stop multiple inclusions. */])
+AH_BOTTOM([#endif /* SR_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
@@ -54,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 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)
+SR_LIB_VERSION_CURRENT=0
+SR_LIB_VERSION_REVISION=0
+SR_LIB_VERSION_AGE=0
+SR_LIB_VERSION="$SR_LIB_VERSION_CURRENT:$SR_LIB_VERSION_REVISION:$SR_LIB_VERSION_AGE"
+SR_LIB_LDFLAGS="-version-info $SR_LIB_VERSION"
+AC_SUBST(SR_LIB_VERSION_CURRENT)
+AC_SUBST(SR_LIB_VERSION_REVISION)
+AC_SUBST(SR_LIB_VERSION_AGE)
+AC_SUBST(SR_LIB_VERSION)
+AC_SUBST(SR_LIB_LDFLAGS)
 
 # Logic analyzer hardware support '--enable' options.
 
@@ -95,6 +103,15 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then
 	AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
 fi
 
+AC_ARG_ENABLE(fx2lafw, AC_HELP_STRING([--enable-fx2lafw],
+	      [enable fx2lafw support (for FX2 LAs). [default=yes]]),
+	      [LA_FX2LAFW="$enableval"],
+	      [LA_FX2LAFW=yes])
+AM_CONDITIONAL(LA_FX2LAFW, test x$LA_FX2LAFW = xyes)
+if test "x$LA_FX2LAFW" = "xyes"; then
+	AC_DEFINE(HAVE_LA_FX2LAFW, 1, [fx2lafw support])
+fi
+
 AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
 	      [enable demo driver support [default=yes]]),
 	      [LA_DEMO="$enableval"],
@@ -147,7 +164,7 @@ fi
 # This variable collects the pkg-config names of all detected libs.
 # It is then used to construct the "Requires.private:" field in the
 # libsigrok.pc file.
-LIBSIGROK_PKGLIBS=""
+SR_PKGLIBS=""
 
 # libglib-2.0 is always needed.
 # Note: glib-2.0 is part of the libsigrok API (hard pkg-config requirement).
@@ -157,13 +174,14 @@ AM_PATH_GLIB_2_0([2.22.0],
 # libgthread-2.0 is always needed (e.g. for the demo hardware driver).
 PKG_CHECK_MODULES([gthread], [gthread-2.0 >= 2.22.0],
 	[CFLAGS="$CFLAGS $gthread_CFLAGS"; LIBS="$LIBS $gthread_LIBS";
-	LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS gthread-2.0"])
+	SR_PKGLIBS="$SR_PKGLIBS gthread-2.0"])
 
 # libusb is only needed for some hardware drivers.
 if test "x$LA_SALEAE_LOGIC" != xno \
    -o "x$LA_ASIX_SIGMA" != xno \
    -o "x$LA_CHRONOVU_LA8" != xno \
-   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno; then
+   -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno \
+   -o "x$LA_FX2LAFW" != xno; then
 	case "$build" in
 	*freebsd*)
 		# FreeBSD comes with an "integrated" libusb-1.0-style USB API.
@@ -174,7 +192,7 @@ if test "x$LA_SALEAE_LOGIC" != xno \
 		PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.5],
 			[CFLAGS="$CFLAGS $libusb_CFLAGS";
 			LIBS="$LIBS $libusb_LIBS";
-			LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS libusb-1.0"])
+			SR_PKGLIBS="$SR_PKGLIBS libusb-1.0"])
 		AC_CHECK_LIB(usb-1.0, libusb_init)
 		;;
 	esac
@@ -183,13 +201,22 @@ fi
 # libzip is always needed.
 PKG_CHECK_MODULES([libzip], [libzip >= 0.8],
 	[CFLAGS="$CFLAGS $libzip_CFLAGS"; LIBS="$LIBS $libzip_LIBS";
-	LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS libzip"])
+	SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
 # 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 SR_PKGLIBS.
+		AC_CHECK_LIB(z, uncompress)
+		;;
+	*)
+		PKG_CHECK_MODULES([zlib], [zlib >= 1.2.3.1],
+			[CFLAGS="$CFLAGS $zlib_CFLAGS"; LIBS="$LIBS $zlib_LIBS";
+			SR_PKGLIBS="$SR_PKGLIBS zlib"])
+		;;
+	esac
 fi
 
 # libftdi is only needed for some hardware drivers.
@@ -198,24 +225,24 @@ if test "x$LA_ASIX_SIGMA" != xno \
 	PKG_CHECK_MODULES([libftdi], [libftdi >= 0.16],
 		[CFLAGS="$CFLAGS $libftdi_CFLAGS";
 		LIBS="$LIBS $libftdi_LIBS";
-		LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS libftdi"])
+		SR_PKGLIBS="$SR_PKGLIBS libftdi"])
 fi
 
 # libudev is only needed for some hardware drivers.
 if test "x$LA_LINK_MSO19" != xno; then
 	PKG_CHECK_MODULES([libudev], [libudev >= 151],
 		[CFLAGS="$CFLAGS $libudev_CFLAGS"; LIBS="$LIBS $libudev_LIBS";
-		LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS libudev"])
+		SR_PKGLIBS="$SR_PKGLIBS libudev"])
 fi
 
 # ALSA is only needed for some hardware drivers.
 if test "x$LA_ALSA" != xno; then
 	PKG_CHECK_MODULES([alsa], [alsa >= 1.0],
 		[CFLAGS="$CFLAGS $alsa_CFLAGS"; LIBS="$LIBS $alsa_LIBS";
-		LIBSIGROK_PKGLIBS="$LIBSIGROK_PKGLIBS alsa"])
+		SR_PKGLIBS="$SR_PKGLIBS alsa"])
 fi
 
-AC_SUBST(LIBSIGROK_PKGLIBS)
+AC_SUBST(SR_PKGLIBS)
 
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
@@ -240,24 +267,15 @@ 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])
+SR_PACKAGE_VERSION_MAJOR=sr_package_version_major
+SR_PACKAGE_VERSION_MINOR=sr_package_version_minor
+SR_PACKAGE_VERSION_MICRO=sr_package_version_micro
+SR_PACKAGE_VERSION=sr_package_version
+
+AC_SUBST(SR_PACKAGE_VERSION_MAJOR)
+AC_SUBST(SR_PACKAGE_VERSION_MINOR)
+AC_SUBST(SR_PACKAGE_VERSION_MICRO)
+AC_SUBST(SR_PACKAGE_VERSION)
 
 AC_CONFIG_FILES([Makefile
 		 sigrok.h
@@ -268,6 +286,7 @@ AC_CONFIG_FILES([Makefile
 		 hardware/chronovu-la8/Makefile
 		 hardware/common/Makefile
 		 hardware/demo/Makefile
+		 hardware/fx2lafw/Makefile
 		 hardware/link-mso19/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
 		 hardware/saleae-logic/Makefile
@@ -282,13 +301,36 @@ AC_CONFIG_FILES([Makefile
 AC_OUTPUT
 
 echo
-echo "Building drivers:"
+echo "libsigrok configuration summary:"
+echo
+echo "  - Package version (major.minor.micro):    $SR_PACKAGE_VERSION"
+echo "  - Library version (current:revision:age): $SR_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" "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 "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
+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