vala-configure.sh (automake-1.16.2.tar.xz) | : | vala-configure.sh (automake-1.16.3.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 40 | skipping to change at line 40 | |||
no-valac: | no-valac: | |||
test x'$(VALAC)' = x'valac' | test x'$(VALAC)' = x'valac' | |||
END | END | |||
mkdir bin | mkdir bin | |||
cat > bin/valac << 'END' | cat > bin/valac << 'END' | |||
#! /bin/sh | #! /bin/sh | |||
if test "x$1" = x--version; then | if test "x$1" = x--version; then | |||
echo "${vala_version-1.2.3}" | echo "${vala_version-1.2.3}" | |||
fi | fi | |||
if test "x$1" = x--api-version; then | ||||
echo "${vala_version-1.2.3}" | ||||
fi | ||||
exit 0 | exit 0 | |||
END | END | |||
chmod +x bin/valac | chmod +x bin/valac | |||
cat > bin/valac.old << 'END' | cat > bin/valac.old << 'END' | |||
#! /bin/sh | #! /bin/sh | |||
if test "x$1" = x--version; then | if test "x$1" = x--version; then | |||
echo 0.1 | echo 0.1 | |||
fi | fi | |||
if test "x$1" = x--api-version; then | ||||
echo 0.1 | ||||
fi | ||||
exit 0 | exit 0 | |||
END | END | |||
chmod +x bin/valac.old | chmod +x bin/valac.old | |||
PATH=$(pwd)/bin$PATH_SEPARATOR$PATH; export PATH | PATH=$(pwd)/bin$PATH_SEPARATOR$PATH; export PATH | |||
# Avoid interferences from the environment. | # Avoid interferences from the environment. | |||
unset VALAC vala_version | unset VALAC vala_version | |||
$ACLOCAL | $ACLOCAL | |||
skipping to change at line 77 | skipping to change at line 83 | |||
st=0; vala_version=99.9 ./configure 2>stderr || st=$? | st=0; vala_version=99.9 ./configure 2>stderr || st=$? | |||
cat stderr >&2 | cat stderr >&2 | |||
grep 'WARNING.*vala' stderr && exit 1 | grep 'WARNING.*vala' stderr && exit 1 | |||
test $st -eq 0 | test $st -eq 0 | |||
$MAKE has-valac | $MAKE has-valac | |||
st=0; vala_version=0.1.2 ./configure 2>stderr || st=$? | st=0; vala_version=0.1.2 ./configure 2>stderr || st=$? | |||
cat stderr >&2 | cat stderr >&2 | |||
test $st -eq 0 | test $st -eq 0 | |||
grep '^configure: WARNING: no proper vala compiler found' stderr | grep '^configure: WARNING: Vala compiler not found or too old' stderr | |||
$MAKE no-valac | $MAKE no-valac | |||
st=0; ./configure VALAC="$(pwd)/bin/valac.old" 2>stderr || st=$? | st=0; ./configure VALAC="$(pwd)/bin/valac.old" 2>stderr || st=$? | |||
cat stderr >&2 | cat stderr >&2 | |||
test $st -eq 0 || exit 1 | test $st -eq 0 || exit 1 | |||
grep '^configure: WARNING: no proper vala compiler found' stderr | grep '^configure: WARNING: Vala compiler not found or too old' stderr | |||
$MAKE no-valac | $MAKE no-valac | |||
sed 's/^\(AM_PROG_VALAC\).*/\1([1], [: > ok], [: > ko])/' <configure.ac >t | sed 's/^\(AM_PROG_VALAC\).*/\1([1], [: > ok], [: > ko])/' <configure.ac >t | |||
mv -f t configure.ac | mv -f t configure.ac | |||
rm -rf autom4te*.cache | rm -rf autom4te*.cache | |||
$ACLOCAL | $ACLOCAL | |||
$AUTOCONF | $AUTOCONF | |||
st=0; ./configure 2>stderr || st=$? | st=0; ./configure 2>stderr || st=$? | |||
cat stderr >&2 | cat stderr >&2 | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 8 lines changed or added |