On Fri, 3 Nov 2006 19:59:03 +0100
Alain TAUCH [Alain] wrote:
[...]
Alain> no diff for autogen.sh since I only did some ugly tweaking there ;-)
well, I fixed you something. works on FreeBSD6.1, hope it will work on
other platforms too.
--
Alain
Index: autogen.sh
===================================================================
--- autogen.sh (revision 1611)
+++ autogen.sh (working copy)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Clean up
./clean.sh
@@ -8,34 +8,59 @@
find_tool_version()
{
TOOL=$1
- for i in 1.9 1.8 1.7 1.6 1.5; do
- if $TOOL-$i --version >/dev/null 2>&1; then
- echo "$TOOL-$i"
+ MINVER=$2
+ OKVER=$3
+ NOKREG=$4
+
+ for i in ${OKVER}; do
+ if ${TOOL}${i} --version > /dev/null 2>&1; then
+ echo "${TOOL}${i}"
exit
fi
done
- if $TOOL --version > /dev/null 2>&1; then
- case "$($TOOL --version | sed -e '1s/[^0-9]*//' -e q)" in
- 0|0.*|1|1.[0-4]|1.[0-4][-.]*)
- echo "You need $TOOL version (at least) 1.5 !" 1>&2
- exit 1;;
- esac
+ if ${TOOL} --version > /dev/null 2>&1; then
+ case "$(${TOOL} --version | sed -e '1s/[^0-9]*//' -e q)" in
+ ${NOKREG})
+ echo "You need ${TOOL} version (at least) ${MINVER} !" 1>&2
+ exit 1;;
+ esac
+ else
+ echo "You need ${TOOL} !" 1>&2
+ exit 1
fi
- echo "$TOOL"
+ echo "${TOOL}"
}
#-----------------------------------------------------------------------------
-AUTOMAKE=$(find_tool_version automake 1.5) || exit 1
-ACLOCAL=$(find_tool_version aclocal 1.5) || exit 1
-AUTOCONF=autoconf
+AUTOMAKE_MIN_VERSION="1.6"
+AUTOMAKE_OK_VERSIONS="-1.9 19 -1.8 18 -1.7 17 -1.6 16 -1.5 15"
+AUTOMAKE_NOK_REGEXP='0|0.*|1|1.[0-5]*'
+AUTOCONF_MIN_VERSION="2.58"
+AUTOCONF_OK_VERSIONS="258 259"
+AUTOCONF_NOK_REGEXP='0|0.*|1|1.*|2|2.[0-4]*|2.5[0-7]*'
+
+AUTOMAKE=$(find_tool_version automake "${AUTOMAKE_MIN_VERSION}" \
+ "${AUTOMAKE_OK_VERSIONS}" \
+ "${AUTOMAKE_NOK_REGEXP}") || exit 1
+ACLOCAL=$(find_tool_version aclocal "${AUTOMAKE_MIN_VERSION}" \
+ "${AUTOMAKE_OK_VERSIONS}" \
+ "${AUTOMAKE_NOK_REGEXP}") || exit 1
+AUTOCONF=$(find_tool_version autoconf "${AUTOCONF_MIN_VERSION}" \
+ "${AUTOCONF_OK_VERSIONS}" \
+ "${AUTOCONF_NOK_REGEXP}") || exit 1
+AUTOHEADER=$(find_tool_version autoheader "${AUTOCONF_MIN_VERSION}" \
+ "${AUTOCONF_OK_VERSIONS}" \
+ "${AUTOCONF_NOK_REGEXP}") || exit 1
+
#-----------------------------------------------------------------------------
echo "Run aclocal"
-$ACLOCAL -I m4 || exit 1
+$ACLOCAL -I m4 -I /usr/local/share/aclocal || exit 1
-autoheader || exit 1
+echo "Run autoheader"
+$AUTOHEADER || exit 1
echo "Run automake"
$AUTOMAKE --add-missing --copy || exit 1
_______________________________________________
Wormux-dev mailing list
[email protected]
https://mail.gna.org/listinfo/wormux-dev
