aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-12 21:17:29 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-07-12 21:17:29 +0000
commit16d2db78387cd7c91a70e69aaf54d9fa64095d1b (patch)
tree9d3875ff0e8b0d1be2ccb47dd250c997a357e082
parent27ac3bc1d4689530c5b4d507581f6148c9972adf (diff)
downloadpaludis-16d2db78387cd7c91a70e69aaf54d9fa64095d1b.tar.gz
paludis-16d2db78387cd7c91a70e69aaf54d9fa64095d1b.tar.xz
Make autogen more autoconf-2.60 friendly
-rwxr-xr-xautogen.bash17
1 files changed, 11 insertions, 6 deletions
diff --git a/autogen.bash b/autogen.bash
index e04a3d5..208093f 100755
--- a/autogen.bash
+++ b/autogen.bash
@@ -18,10 +18,15 @@ run() {
}
get() {
- type ${1}-${2} &>/dev/null && echo ${1}-${2} && return
- type ${1}${2//.} &>/dev/null && echo ${1}${2//.} && return
- type ${1} &>/dev/null && echo ${1} && return
- echo "Could not find ${1} ${2}" 1>&2
+ local p=${1} v=
+ shift
+
+ for v in ${@} ; do
+ type ${p}-${v} &>/dev/null && echo ${p}-${v} && return
+ type ${p}${v//.} &>/dev/null && echo ${p}${v//.} && return
+ done
+ type ${p} &>/dev/null && echo ${p} && return
+ echo "Could not find ${p}" 1>&2
kill $KILL_PID
}
@@ -37,7 +42,7 @@ run mkdir -p config
run $(get libtoolize 1.5 ) --copy --force --automake
rm -f config.cache
run $(get aclocal 1.9 )
-run $(get autoheader 2.59 )
-run $(get autoconf 2.59 )
+run $(get autoheader 2.60 2.59 )
+run $(get autoconf 2.60 2.59 )
run $(get automake 1.9 ) -a --copy