autogen.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
New commits: commit 3b0962cd14b15ce92c0916f58ed5ba00aebe80b0 Merge: a9d7ea2... 42908e6... Author: Albert Astals Cid <[email protected]> Date: Tue Oct 2 19:51:48 2012 +0200 Merge remote-tracking branch 'origin/poppler-0.20' commit 42908e6e72d95cec0f70b202c4b1c23f7e47c2a4 Author: Lu Wang <[email protected]> Date: Tue Oct 2 19:31:04 2012 +0200 support automake-1.12 in autogen.sh Bug #55541 diff --git a/autogen.sh b/autogen.sh index b2de90c..7538595 100755 --- a/autogen.sh +++ b/autogen.sh @@ -10,13 +10,14 @@ 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.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.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; - 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; - 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; - 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;; - 1.10*) automake_progs="automake-1.11 automake-1.10" ;; - 1.11*) automake_progs="automake-1.11" ;; + 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" ;; esac # Print types _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
