X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=0413453647196803b46c0fc6fdbb88e3e7abb40e;hb=8c76be539e8098c08f69f56053077211001ed52b;hp=89e69b0f363981d9e37e743a893edc7193275255;hpb=db8ae7b941a31b2bc64e14d60a1e962fd2b2dc38;p=libsigrok.git

diff --git a/configure.ac b/configure.ac
index 89e69b0f..04134536 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,19 +17,19 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AC_PREREQ(2.61)
+AC_PREREQ([2.61])
 
-# 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])
 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])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -54,16 +54,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.
 
@@ -236,29 +236,28 @@ 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/sigrok/firmware")
-### AC_SUBST(DECODERS_DIR, "$datadir/sigrok/decoders")
+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
@@ -283,13 +282,35 @@ AC_CONFIG_FILES([Makefile
 AC_OUTPUT
 
 echo
-echo "Building drivers:"
+echo "libsigrok configuration summary:"
 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 "  - 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 "  - 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