From 066ecdabd251d503649850f09ff2bf161fc3364b Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Sat, 28 Jan 2012 21:26:56 +0100 Subject: [PATCH] Update/enforce/document our build requirements. --- README | 8 ++++++-- configure.ac | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README b/README index e1d93ee..4a2441c 100644 --- a/README +++ b/README @@ -27,8 +27,12 @@ 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 - Python >= 3.x (for protocol decoders) diff --git a/configure.ac b/configure.ac index fa6b97c..7900f57 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]) # libsigrokdecode package version number (NOT the same as shared lib version!). m4_define([libsigrokdecode_major_version], [0]) @@ -33,7 +34,8 @@ AC_CONFIG_HEADER([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 LIBSIGROKDECODE_CONFIG_H -- 2.30.2