From 6691a653a73449b785c9d819eb7f4f3e95e32a55 Mon Sep 17 00:00:00 2001 From: Christophe CURIS Date: Fri, 19 Jun 2015 21:57:09 +0200 Subject: [PATCH] Configure: increased the version of Automake requested The compilation of the WRaster library needs the keyword EXTRA_*_DEPENDENCIES in its Makefile so the configure.ac have been updated to require at least the version of automake in which it is added. Reported-by: Josip Deanovic Signed-off-by: Christophe CURIS --- configure.ac | 6 +++++- debian/control | 2 +- doc/build/Compilation.texi | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c5d31671..2b011088 100644 --- a/configure.ac +++ b/configure.ac @@ -37,7 +37,11 @@ dnl ======================================= AC_INIT([WindowMaker],[0.95.6],[wmaker-dev@lists.windowmaker.org],[WindowMaker],[http://www.windowmaker.org/]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([1.11 silent-rules]) + +dnl We need the EXTRA_xxx_DEPENDENCIES keyword in Makefiles which have been +dnl introduced in the version 1.11.3; because the 1.12 was realeased shortly +dnl after, we just ask for it +AM_INIT_AUTOMAKE([1.12 silent-rules]) dnl Reference file used by 'configure' to make sure the path to sources is valid AC_CONFIG_SRCDIR([src/WindowMaker.h]) diff --git a/debian/control b/debian/control index ce41a771..b761636a 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: x11 Priority: optional Maintainer: Rodolfo García Peñas (kix) Standards-Version: 3.9.6 -Build-Depends: debhelper (>= 9), automake (>= 1:1.11), gettext, +Build-Depends: debhelper (>= 9), automake (>= 1:1.12), gettext, libfontconfig1-dev, libjpeg-dev, libpng-dev, libsm-dev, libtiff5-dev, libtool, libgif-dev, libx11-dev, libxext-dev, libxft-dev, libxinerama-dev, libxkbfile-dev, libxpm-dev, libxt-dev, libxrender-dev, sharutils, libxmu-dev, diff --git a/doc/build/Compilation.texi b/doc/build/Compilation.texi index 2ab7598e..00e58622 100644 --- a/doc/build/Compilation.texi +++ b/doc/build/Compilation.texi @@ -164,7 +164,7 @@ package, you will also need: @itemize @item @emph{git} @item @emph{autoconf} 2.69 -@item @emph{automake} 1.11 +@item @emph{automake} 1.12 @item @emph{libtool} 1.4.2 @end itemize -- 2.11.4.GIT