Attachment 100660 Details for Bug 79797 – Move automake version check from autogen.sh to configure.ac

[patch] Move automake version check from autogen.sh to configure.ac

Move-automake-version-check-from-autogensh-to-conf.patch (text/plain), 2.73 KB, created by Hib Eris on 2014-06-08 14:18:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hib Eris

Created: 2014-06-08 14:18:48 UTC

Size: 2.73 KB

patch

obsolete

>From 3a447ea94b83a80370d0ec3f27fda393f0b97e86 Mon Sep 17 00:00:00 2001
>From: Hib Eris <hib@hiberis.nl>
>Date: Sat, 7 Jun 2014 12:00:52 +0200
>Subject: [PATCH] Move automake version check from autogen.sh to configure.ac
>
>https://bugs.freedesktop.org/show_bug.cgi?id=79797
>---
> autogen.sh   | 18 ------------------
> configure.ac |  2 +-
> 2 files changed, 1 insertion(+), 19 deletions(-)
>
>diff --git a/autogen.sh b/autogen.sh
>index ab51eb3..d3c0a6f 100755
>--- a/autogen.sh
>+++ b/autogen.sh
>@@ -6,21 +6,6 @@ srcdir=$(dirname $0)
> 
> # Default version requirements
> REQUIRED_GTK_DOC_VERSION=${REQUIRED_GTK_DOC_VERSION:-1.0}
>-REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.7}
>-
>-case $REQUIRED_AUTOMAKE_VERSION in
>-    1.4*) automake_progs="automake-1.4" ;;
>-    1.5*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
>-    1.6*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
>-    1.7*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
>-    1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
>-    1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
>-    1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
>-    1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
>-    1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;;
>-    1.13*) automake_progs="automake-1.14 automake-1.13" ;;
>-    1.14*) automake_progs="automake-1.14" ;;
>-esac
> 
> # Print types
> boldface="`tput bold 2>/dev/null`"
>@@ -115,9 +100,6 @@ if [ ! "`echo $@ |grep -- --enable-gtk-doc`" = "" ]; then
>     want_gtk_doc=true
> fi
> 
>-version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
>-"http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1
>-
> printbold "Running autoreconf -v -i ..."
> (cd $srcdir && autoreconf -v -i )
> 
>diff --git a/configure.ac b/configure.ac
>index 4d55bec..19d0a6c 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -6,7 +6,7 @@ m4_define([poppler_version],[poppler_version_major.poppler_version_minor.poppler
> AC_PREREQ(2.59)
> AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi?product=poppler])
> AC_CONFIG_MACRO_DIR([m4])
>-AM_INIT_AUTOMAKE([foreign])
>+AM_INIT_AUTOMAKE([1.7 foreign])
> m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
> AC_CONFIG_HEADERS([config.h poppler/poppler-config.h])
> AC_C_BIGENDIAN
>-- 
>1.8.3.2

Actions: View | Splinter Review

Attachments on bug 79797: 100660

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.