X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-cli.git;a=blobdiff_plain;f=configure.ac;h=d2ccf367a112c3555f90a466e4f7a863b94efd1b;hp=67347a40faee84d90129ef16506c1cc9416695dc;hb=96e7e071c6ebe939166c1fc7c11e9f5528ef4288;hpb=43e5747a59ed92243c217f7e36da2ac35bbcd80d

diff --git a/configure.ac b/configure.ac
index 67347a4..d2ccf36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,8 @@
 ## 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])
 
 AC_INIT([sigrok-cli], [0.1], [sigrok-devel@lists.sourceforge.net],
         [sigrok-cli], [http://www.sigrok.org])
@@ -25,12 +26,14 @@ AC_INIT([sigrok-cli], [0.1], [sigrok-devel@lists.sourceforge.net],
 AC_CONFIG_SRCDIR([sigrok-cli.c])
 
 AC_CONFIG_HEADERS([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 SGIROK_CLI_CONFIG_H
+AH_TOP([#ifndef SIGROK_CLI_CONFIG_H
 #define SIGROK_CLI_CONFIG_H    /* To stop multiple inclusions. */])
 AH_BOTTOM([#endif /* SIGROK_CLI_CONFIG_H */])
 
@@ -51,11 +54,14 @@ PKG_PROG_PKG_CONFIG([0.22])
 
 # Checks for libraries.
 
-PKG_CHECK_MODULES([libsigrok], [libsigrok],
+AM_PATH_GLIB_2_0([2.22.0],
+        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
+
+PKG_CHECK_MODULES([libsigrok], [libsigrok >= 0.2],
 	[CFLAGS="$CFLAGS $libsigrok_CFLAGS";
 	LIBS="$LIBS $libsigrok_LIBS"])
 
-PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode],
+PKG_CHECK_MODULES([libsigrokdecode], [libsigrokdecode >= 0.2],
 	[CFLAGS="$CFLAGS $libsigrokdecode_CFLAGS";
 	LIBS="$LIBS $libsigrokdecode_LIBS"])
 
@@ -82,7 +88,31 @@ AC_SUBST(MAKEFLAGS, '--no-print-directory')
 AC_SUBST(AM_LIBTOOLFLAGS, '--silent')
 
 AC_CONFIG_FILES([Makefile
+		 contrib/Makefile
+		 contrib/sigrok-cli.nsi
 		 doc/Makefile])
 
 AC_OUTPUT
 
+echo
+echo "sigrok-cli configuration summary:"
+echo
+echo "  - Package version: $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" "libsigrok" "libsigrokdecode"; do
+        if `$PKG_CONFIG --exists $lib`; then
+                ver=`$PKG_CONFIG --modversion $lib`
+                answer="yes ($ver)"
+        else
+                answer="no"
+        fi
+        echo "  - $lib: $answer"
+done
+
+echo
+