diff --git a/bootstrap b/bootstrap index 5bab8ed..56f507b 100755 --- a/bootstrap +++ b/bootstrap @@ -1,14 +1,14 @@ #! /bin/sh -# bootstrap: generic bootstrap/autogen.sh script for autotools projects +# bootstrap — generic bootstrap/autogen.sh script for autotools projects # -# Copyright (c) 2002-2010 Sam Hocevar +# Copyright © 2002—2015 Sam Hocevar # -# This program is free software. It comes without any warranty, to -# the extent permitted by applicable law. You can redistribute it -# and/or modify it under the terms of the Do What The Fuck You Want -# To Public License, Version 2, as published by Sam Hocevar. See -# http://www.wtfpl.net/ for more details. +# This program is free software. It comes without any warranty, to +# the extent permitted by applicable law. You can redistribute it +# and/or modify it under the terms of the Do What the Fuck You Want +# to Public License, Version 2, as published by the WTFPL Task Force. +# See http://www.wtfpl.net/ for more details. # # The latest version of this script can be found at the following place: # http://caca.zoy.org/wiki/build @@ -36,27 +36,15 @@ aclocalflags="`sed -ne 's/^[ \t]*ACLOCAL_AMFLAGS[ \t]*=//p' Makefile.am 2>/dev/n # Check for automake amvers="no" -for v in 13 12 11 10 9 8 7 6 5; do - if automake-1.${v} --version >/dev/null 2>&1; then - amvers="-1.${v}" - break - elif automake1.${v} --version >/dev/null 2>&1; then - amvers="1.${v}" +for v in "" "-1.15" "-1.14" "-1.13" "-1.12" "-1.11"; do + if automake${v} --version > /dev/null 2>&1; then + amvers=${v} break fi done -if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then - amvers="`automake --version | sed -e '1s/[^0-9]*//' -e q`" - if expr "$amvers" "<" "1.5" > /dev/null 2>&1; then - amvers="no" - else - amvers="" - fi -fi - if test "$amvers" = "no"; then - echo "$0: you need automake version 1.5 or later" + echo "$0: automake not found" exit 1 fi @@ -70,7 +58,7 @@ for v in "" "259" "253"; do done if test "$acvers" = "no"; then - echo "$0: you need autoconf" + echo "$0: autoconf not found" exit 1 fi @@ -89,7 +77,7 @@ if test "$libtool" = "yes"; then fi if test "$libtoolize" = "no"; then - echo "$0: you need libtool" + echo "$0: libtool not found" exit 1 fi fi @@ -97,7 +85,7 @@ fi # Check for pkg-config if test "$pkgconfig" = "yes"; then if ! pkg-config --version >/dev/null 2>&1; then - echo "$0: you need pkg-config" + echo "$0: pkg-config not found" exit 1 fi fi