From e052dbfbb9eb4045f8c4f2f9ba944620a09daaae Mon Sep 17 00:00:00 2001 From: David Pirotte Date: Sun, 30 Sep 2018 20:52:26 -0300 Subject: [PATCH 3/3] Fixing configure.ac, so 'make distcheck' pass again * configure.ac: (a) Modern automake versions run the checks in parallel per default, but we don't support these yet (this is the change that fixes 'make distcheck'; (b) moving the project name and version number in AC_INIT, not AM_INIT_AUTOMAKE; (c) bumping both the version number and the minimum libcairo version required to 1.10.0; (d) adding AM_MAINTAINER_MODE, AM_SILENT_RULES; (e) use LT_INIT, not AC_PROG_LIBTOOL; (f) adding a AC_CONFIG_FILES entry for env, running chmod. --- configure.ac | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 47f8b30..5e08f27 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,7 @@ define(GUILE_CAIRO_CONFIGURE_COPYRIGHT,[[ Copyright (C) 2007, 2011 Andy Wingo +Copyright (C) 2018, Daniel Llorens This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -19,20 +20,25 @@ License along with this program. If not, see ]]) AC_PREREQ(2.52) -AC_INIT(HACKING) +AC_INIT([guile-cairo], [1.10.0]) + AC_CONFIG_AUX_DIR([build-aux]) AC_COPYRIGHT(GUILE_CAIRO_CONFIGURE_COPYRIGHT) + AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(guile-cairo, 1.9.92) -AC_SUBST(VERSION,1.9.92) +AM_INIT_AUTOMAKE([1.14 gnu -Wno-portability -Wno-syntax \ + color-tests serial-tests foreign]) +AM_MAINTAINER_MODE([enable]) +AM_SILENT_RULES([yes]) -AC_DISABLE_STATIC +AC_SUBST(VERSION, 1.10.0) AC_ISC_POSIX AC_PROG_CC AC_STDC_HEADERS -AC_PROG_LIBTOOL +LT_INIT([disable-static]) + if test "x$prefix" = xNONE; then AC_MSG_ERROR([No explicit prefix given. @@ -82,12 +88,13 @@ else AC_MSG_NOTICE([found Guile $GUILE_EFFECTIVE_VERSION.x]) fi -PKG_CHECK_MODULES(CAIRO, cairo >= 1.2.0) +PKG_CHECK_MODULES(CAIRO, cairo >= 1.10.0) AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS) AC_ARG_VAR(CAIRO_XML_DIR, [path to Cairo *.xml documentation]) +AC_CONFIG_FILES([env], [chmod +x env]) AC_CONFIG_FILES( Makefile guile-cairo.pc -- 2.19.0