X-Git-Url: https://sigrok.org/gitweb/?p=libsigrokdecode.git;a=blobdiff_plain;f=configure.ac;h=f2bf69d9eaffe234f1a47bb61255dea7fd071200;hp=aecec7ccdd6b883802931a2d5b031d1aa7949cc3;hb=aa56f7ad4f6238fd994b37bf61ba0efa052c14d5;hpb=084f0f94deedb52ced0c96590a621339973eb7a7

diff --git a/configure.ac b/configure.ac
index aecec7c..f2bf69d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,18 +19,19 @@
 
 AC_PREREQ(2.61)
 
-# 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])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -55,16 +56,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.
 
@@ -131,28 +132,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(DECODERS_DIR, "$datadir/sigrok/decoders")
+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
@@ -161,3 +162,31 @@ AC_CONFIG_FILES([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
+