X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=1d480c6e7328d938e38b6a77af0b2291d9252535;hb=9f4a898ee72a89d6bf213202e792e9b4431a9572;hp=67347a40faee84d90129ef16506c1cc9416695dc;hpb=43e5747a59ed92243c217f7e36da2ac35bbcd80d;p=sigrok-cli.git

diff --git a/configure.ac b/configure.ac
index 67347a4..1d480c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
 ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ##
 
-AC_PREREQ(2.61)
+AC_PREREQ([2.61])
 
 AC_INIT([sigrok-cli], [0.1], [sigrok-devel@lists.sourceforge.net],
         [sigrok-cli], [http://www.sigrok.org])
@@ -25,12 +25,13 @@ 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])
 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,6 +52,9 @@ PKG_PROG_PKG_CONFIG([0.22])
 
 # Checks for libraries.
 
+AM_PATH_GLIB_2_0([2.22.0],
+        [CFLAGS="$CFLAGS $GLIB_CFLAGS"; LIBS="$LIBS $GLIB_LIBS"])
+
 PKG_CHECK_MODULES([libsigrok], [libsigrok],
 	[CFLAGS="$CFLAGS $libsigrok_CFLAGS";
 	LIBS="$LIBS $libsigrok_LIBS"])
@@ -86,3 +90,25 @@ AC_CONFIG_FILES([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
+