X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=configure.ac;h=941268cce630012949394c20a8865ba03d9325af;hp=7c1ee441acd40823528c5afeafcf444064b75203;hb=d11d606626a2ce9359ed2b5395fe4b998604da92;hpb=3af71f0da646de1e61ccbed2e85e3fca9798565c

diff --git a/configure.ac b/configure.ac
index 7c1ee441..941268cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 ##
 ## 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>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.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 +18,33 @@
 ## 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])
 
 # 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])
+m4_define([sr_package_version_major], [0])
+m4_define([sr_package_version_minor], [2])
+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([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 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
@@ -58,14 +64,27 @@ 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
-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.
+SR_LIB_VERSION_CURRENT=1
+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)
+
+# Hardware support '--enable' options.
+
+AC_ARG_ENABLE(agilent-dmm, AC_HELP_STRING([--enable-agilent-dmm],
+	      [enable Agilent DMM driver support [default=yes]]),
+	      [HW_AGILENT_DMM="$enableval"],
+	      [HW_AGILENT_DMM=yes])
+AM_CONDITIONAL(HW_AGILENT_DMM, test x$HW_AGILENT_DMM = xyes)
+if test "x$HW_AGILENT_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_AGILENT_DMM, 1, [Agilent DMM driver support])
+fi
 
 # Disabled by default, unfinished.
 AC_ARG_ENABLE(alsa, AC_HELP_STRING([--enable-alsa],
@@ -78,12 +97,12 @@ if test "x$LA_ALSA" = "xyes"; then
 fi
 
 AC_ARG_ENABLE(asix-sigma, AC_HELP_STRING([--enable-asix-sigma],
-	      [enable ASIX Sigma support [default=yes]]),
+	      [enable ASIX SIGMA/SIGMA2 support [default=yes]]),
 	      [LA_ASIX_SIGMA="$enableval"],
 	      [LA_ASIX_SIGMA=yes])
 AM_CONDITIONAL(LA_ASIX_SIGMA, test x$LA_ASIX_SIGMA = xyes)
 if test "x$LA_ASIX_SIGMA" = "xyes"; then
-	AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX Sigma support])
+	AC_DEFINE(HAVE_LA_ASIX_SIGMA, 1, [ASIX SIGMA/SIGMA2 support])
 fi
 
 AC_ARG_ENABLE(chronovu-la8, AC_HELP_STRING([--enable-chronovu-la8],
@@ -95,6 +114,42 @@ if test "x$LA_CHRONOVU_LA8" = "xyes"; then
 	AC_DEFINE(HAVE_LA_CHRONOVU_LA8, 1, [ChronoVu LA8 support])
 fi
 
+AC_ARG_ENABLE(fluke-dmm, AC_HELP_STRING([--enable-fluke-dmm],
+	      [Enable Fluke DMM support. [default=yes]]),
+	      [HW_FLUKE_DMM="$enableval"],
+	      [HW_FLUKE_DMM=yes])
+AM_CONDITIONAL(HW_FLUKE_DMM, test x$HW_FLUKE_DMM = xyes)
+if test "x$HW_FLUKE_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_FLUKE_DMM, 1, [Fluke DMM support])
+fi
+
+AC_ARG_ENABLE(radioshack-dmm, AC_HELP_STRING([--enable-radioshack-dmm],
+	      [Enable Radio Shack DMM support. [default=yes]]),
+	      [HW_RADIOSHACK_DMM="$enableval"],
+	      [HW_RADIOSHACK_DMM=yes])
+AM_CONDITIONAL(HW_RADIOSHACK_DMM, test x$HW_RADIOSHACK_DMM = xyes)
+if test "x$HW_RADIOSHACK_DMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_RADIOSHACK_DMM, 1, [Radioshack DMM 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(genericdmm, AC_HELP_STRING([--enable-genericdmm],
+	      [enable genericdmm support (for most DMMs). [default=yes]]),
+	      [HW_GENERICDMM="$enableval"],
+	      [HW_GENERICDMM=yes])
+AM_CONDITIONAL(HW_GENERICDMM, test x$HW_GENERICDMM = xyes)
+if test "x$HW_GENERICDMM" = "xyes"; then
+	AC_DEFINE(HAVE_HW_GENERICDMM, 1, [Generic DMM support])
+fi
+
 AC_ARG_ENABLE(demo, AC_HELP_STRING([--enable-demo],
 	      [enable demo driver support [default=yes]]),
 	      [LA_DEMO="$enableval"],
@@ -123,23 +178,24 @@ if test "x$LA_OLS" = "xyes"; then
 	AC_DEFINE(HAVE_LA_OLS, 1, [OpenBench Logic Sniffer (OLS) support])
 fi
 
-AC_ARG_ENABLE(saleae-logic, AC_HELP_STRING([--enable-saleae-logic],
-	      [enable Saleae Logic support [default=yes]]),
-	      [LA_SALEAE_LOGIC="$enableval"],
-	      [LA_SALEAE_LOGIC=yes])
-AM_CONDITIONAL(LA_SALEAE_LOGIC, test x$LA_SALEAE_LOGIC = xyes)
-if test "x$LA_SALEAE_LOGIC" = "xyes"; then
-	AC_DEFINE(HAVE_LA_SALEAE_LOGIC, 1, [Saleae Logic support])
-fi
-
 AC_ARG_ENABLE(zeroplus-logic-cube,
 	      AC_HELP_STRING([--enable-zeroplus-logic-cube],
-	      [enable Zeroplus Logic Cube support [default=yes]]),
+	      [enable ZEROPLUS Logic Cube support [default=yes]]),
 	      [LA_ZEROPLUS_LOGIC_CUBE="$enableval"],
 	      [LA_ZEROPLUS_LOGIC_CUBE=yes])
 AM_CONDITIONAL(LA_ZEROPLUS_LOGIC_CUBE, test x$LA_ZEROPLUS_LOGIC_CUBE = xyes)
 if test "x$LA_ZEROPLUS_LOGIC_CUBE" = "xyes"; then
-	AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [Zeroplus Logic Cube support])
+	AC_DEFINE(HAVE_LA_ZEROPLUS_LOGIC_CUBE, 1, [ZEROPLUS Logic Cube support])
+fi
+
+AC_ARG_ENABLE(hantek-dso,
+	      AC_HELP_STRING([--enable-hantek-dso],
+	      [enable Hantek DSO support [default=yes]]),
+	      [HW_HANTEK_DSO="$enableval"],
+	      [HW_HANTEK_DSO=yes])
+AM_CONDITIONAL(HW_HANTEK_DSO, test x$HW_HANTEK_DSO = xyes)
+if test "x$HW_HANTEK_DSO" = "xyes"; then
+	AC_DEFINE(HAVE_HW_HANTEK_DSO, 1, [Hantek DSO support])
 fi
 
 # Checks for libraries.
@@ -147,22 +203,23 @@ 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).
-AM_PATH_GLIB_2_0([2.22.0],
+AM_PATH_GLIB_2_0([2.28.0],
 	[CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
 
 # 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 \
+if test "x$LA_ASIX_SIGMA" != xno \
    -o "x$LA_CHRONOVU_LA8" != xno \
+   -o "x$LA_FX2LAFW" != xno \
+   -o "x$HW_HANTEK_DSO" != xno \
    -o "x$LA_ZEROPLUS_LOGIC_CUBE" != xno; then
 	case "$build" in
 	*freebsd*)
@@ -171,10 +228,10 @@ if test "x$LA_SALEAE_LOGIC" != xno \
 			[Specifies whether we have a libusb.h header.])
 		;;
 	*)
-		PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.5],
+		PKG_CHECK_MODULES([libusb], [libusb-1.0 >= 1.0.9],
 			[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,14 +240,7 @@ 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"])
-
-# 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"])
-fi
+	SR_PKGLIBS="$SR_PKGLIBS libzip"])
 
 # libftdi is only needed for some hardware drivers.
 if test "x$LA_ASIX_SIGMA" != xno \
@@ -198,24 +248,37 @@ 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)
+# EZUSB FX2 firmware helpers only needed for some hardware drivers
+AM_CONDITIONAL(NEED_EZUSB, \
+	test "x$LA_FX2LAFW" != xno \
+	-o "x$HW_HANTEK_DSO" != xno \
+)
+
+# Serial port helpers only needed for some hardware drivers
+AM_CONDITIONAL(NEED_SERIAL, \
+	test "x$LA_OLS" != xno \
+	-o "x$HW_AGILENT_DMM" != xno \
+	-o "x$HW_GENERICDMM" != xno \
+)
+
+AC_SUBST(SR_PKGLIBS)
 
 # Checks for header files.
 # These are already checked: inttypes.h stdint.h stdlib.h string.h unistd.h.
@@ -236,42 +299,37 @@ AC_TYPE_SIZE_T
 # Checks for library functions.
 AC_CHECK_FUNCS([gettimeofday memset strchr strcspn strdup strerror strncasecmp strstr strtol strtoul strtoull])
 
-AC_SUBST(FIRMWARE_DIR, "$datadir/libsigrok/firmware")
+AC_SUBST(FIRMWARE_DIR, "$datadir/sigrok-firmware")
 AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
 
-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])
+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
-		 firmware/Makefile
+		 version.h
 		 hardware/Makefile
+		 hardware/agilent-dmm/Makefile
 		 hardware/alsa/Makefile
 		 hardware/asix-sigma/Makefile
 		 hardware/chronovu-la8/Makefile
 		 hardware/common/Makefile
 		 hardware/demo/Makefile
+		 hardware/fluke-dmm/Makefile
+		 hardware/radioshack-dmm/Makefile
+		 hardware/fx2lafw/Makefile
+		 hardware/genericdmm/Makefile
 		 hardware/link-mso19/Makefile
 		 hardware/openbench-logic-sniffer/Makefile
-		 hardware/saleae-logic/Makefile
 		 hardware/zeroplus-logic-cube/Makefile
+		 hardware/hantek-dso/Makefile
 		 input/Makefile
 		 output/Makefile
 		 output/text/Makefile
@@ -282,13 +340,40 @@ 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" "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 "  - Agilent DMM..................... $HW_AGILENT_DMM"
+echo "  - ASIX SIGMA/SIGMA2............... $LA_ASIX_SIGMA"
+echo "  - ChronoVu LA8.................... $LA_CHRONOVU_LA8"
+echo "  - Demo driver..................... $LA_DEMO"
+echo "  - Fluke DMM....................... $HW_FLUKE_DMM"
+echo "  - Radioshack DMM.................. $HW_RADIOSHACK_DMM"
+echo "  - fx2lafw (for FX2 LAs)........... $LA_FX2LAFW"
+echo "  - Generic DMM..................... $HW_GENERICDMM"
+echo "  - Link MSO-19..................... $LA_LINK_MSO19"
+echo "  - Openbench Logic Sniffer......... $LA_OLS"
+echo "  - ZEROPLUS Logic Cube............. $LA_ZEROPLUS_LOGIC_CUBE"
+echo "  - Hantek DSO...................... $HW_HANTEK_DSO"
 echo