From 73d1ec0d37792486bb6025e03851861cfcbc93b5 Mon Sep 17 00:00:00 2001 From: Nuno Araujo Date: Mon, 11 Feb 2013 18:13:18 +0100 Subject: [PATCH] Fix the build with automake-1.13 In Automake 1.13, the long-deprecated macro AM_CONFIG_HEADER (deprecated since 2002) has been removed in favour of AC_CONFIG_HEADERS. https://bugs.freedesktop.org/show_bug.cgi?id=60677 --- autogen.sh | 17 +++++++++-------- configure.ac | 3 +-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/autogen.sh b/autogen.sh index 7538595..f895462 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,14 +10,15 @@ 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.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.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.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.12 automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.12 automake-1.11" ;; - 1.12*) automake_progs="automake-1.12" ;; + 1.5*) automake_progs="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.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.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.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; + 1.9*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;; + 1.10*) automake_progs="automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;; + 1.11*) automake_progs="automake-1.13 automake-1.12 automake-1.11" ;; + 1.12*) automake_progs="automake-1.13 automake-1.12" ;; + 1.13*) automake_progs="automake-1.13" ;; esac # Print types diff --git a/configure.ac b/configure.ac index a512782..7653523 100644 --- a/configure.ac +++ b/configure.ac @@ -8,8 +8,7 @@ AC_INIT([poppler],[poppler_version],[https://bugs.freedesktop.org/enter_bug.cgi? AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) -AM_CONFIG_HEADER(config.h) -AM_CONFIG_HEADER(poppler/poppler-config.h) +AC_CONFIG_HEADERS([config.h poppler/poppler-config.h]) AC_C_BIGENDIAN dnl ##### Initialize libtool. -- 1.8.1.3