From 2658103e629ffc7d44ff0e80e435b0f1f4cc5bfe Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 28 Jan 2012 21:26:56 +0100 Subject: [PATCH 1/1] Update/enforce/document our build requirements. --- README | 12 ++++++++---- configure.ac | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README b/README index 87d0311..7c83efe 100644 --- a/README +++ b/README @@ -21,11 +21,15 @@ Requirements ------------ - git - - gcc, g++, make, ... - - autoconf, automake, libtool, pkg-config + - gcc + - make + - autoconf >= 2.63 + - automake >= 1.11 + - libtool + - pkg-config >= 0.22 - libglib >= 2.22.0 - - libsigrok - - libsigrokdecode + - libsigrok >= 0.2 + - libsigrokdecode >= 0.2 Building and installing diff --git a/configure.ac b/configure.ac index 531b5ac..d6389c0 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,8 @@ ## along with this program. If not, see . ## -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]) @@ -28,7 +29,8 @@ AC_CONFIG_HEADERS([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])]) AH_TOP([#ifndef SIGROK_CLI_CONFIG_H -- 2.30.2