update autogen.sh to 0.4.8

git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_2/libgphoto2@9005 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Hans Ulrich Niedermann
2006-06-30 11:56:55 +00:00
parent 8b45be1b2a
commit bf3a4d413a

View File

@@ -19,7 +19,7 @@ debug="false"
recursive="false"
dryrun="false"
self="$(basename "$0")"
autogen_version="0.4.6"
autogen_version="0.4.8"
########################################################################
@@ -229,8 +229,9 @@ EOF
"$debug" && echo " done."
if "$debug"; then set | grep '^AG_'; fi
dryrun_param=""
if "$dryrun"; then dryrun_param="--dry-run"; fi
recurse_params=""
if "$dryrun"; then recurse_params="$recurse_params --dry-run"; fi
if "$debug"; then recurse_params="$recurse_params --verbose"; fi
}
@@ -282,7 +283,7 @@ command_clean() {
done
echo " done."
if test -n "${AG_SUBDIRS}"; then
"$0" --clean ${dryrun_param} --recursive ${AG_SUBDIRS}
"$0" --clean ${recurse_params} --recursive ${AG_SUBDIRS}
fi
fi
)
@@ -318,7 +319,7 @@ if cd "${dir}"; then
(cd "${AG_LIBLTDL_DIR}" && execute_command rm -f aclocal.m4 config.guess config.sub configure install-sh ltmain.sh Makefile.in missing)
fi
if test -n "${AG_SUBDIRS}"; then
"$0" --init ${dryrun_param} --recursive ${AG_SUBDIRS}
"$0" --init ${recurse_params} --recursive ${AG_SUBDIRS}
status="$?"
if test "$status" -ne 0; then exit "$status"; fi
fi
@@ -340,7 +341,7 @@ fi
status="$?"
echo "$self:init: Left directory \`${dir}'"
if "$recursive"; then
:
:
elif test "$status" -ne "0"; then
exit "$status"
fi
@@ -366,7 +367,7 @@ while read flag variable binary version restofline; do
if test -n "`eval echo \$\{$variable+"set"\}`"; then
skip=:
else
if test -x "`which ${binary}${version}`"; then
if test -x "`which ${binary}${version} 2> /dev/null`"; then
export "$variable"="${binary}${version}"
oldversion="${version}"
else
@@ -461,21 +462,22 @@ if "$check_versions"; then
errors=false
lf="
"
while read tool minversion; do
while read tool minversion package; do
version="$("$tool" --version | sed 's/^.*(.*) *\(.*\)$/\1/g;1q')"
# compare version and minversion
first="$(echo "$version$lf$minversion" | sort -n | sed '1q')"
if test "x$minversion" != "x$first" && test "x$version" = "x$first"; then
echo "Version \`$version' of \`$tool' not sufficient. At least \`$minversion' required."
echo "Version \`$version' of \`$tool' from the \`$package' (dev/devel) package is not sufficient."
echo "At least \`$minversion' required."
errors=:
fi
done <<EOF
${ACLOCAL-"aclocal"} 1.8
${AUTOMAKE-"automake"} 1.8
${AUTOCONF-"autoconf"} 2.59
${AUTOHEADER-"autoheader"} 2.59
${AUTOPOINT-"autopoint"} 0.14.1
${LIBTOOLIZE-"libtoolize"} 1.4
${ACLOCAL-"aclocal"} 1.8 automake
${AUTOMAKE-"automake"} 1.8 automake
${AUTOCONF-"autoconf"} 2.59 autoconf
${AUTOHEADER-"autoheader"} 2.59 autoconf
${AUTOPOINT-"autopoint"} 0.14.1 gettext
${LIBTOOLIZE-"libtoolize"} 1.4 libtool
EOF
if "$errors"; then
echo "Please update your toolset."