[poppler] autogen.sh configure.ac

[Albert Astals Cid]

 autogen.sh   |   18 ------------------
 configure.ac |    2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

New commits:
commit bb16c7162c73b871e26f508823c0ee259b7e5420
Author: Hib Eris <hib at hiberis.nl>
Date:   Sat Jun 7 12:00:52 2014 +0200

    Move automake version check from autogen.sh to configure.ac
    
    https://bugs.freedesktop.org/show_bug.cgi?id=79797

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 9b66986..49c78b6 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