[brlcad-commits] SF.net SVN: brlcad:[33357] brlcad/trunk/autogen.sh
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <br...@us...> - 2008-12-11 02:50:30
|
Revision: 33357 http://brlcad.svn.sourceforge.net/brlcad/?rev=33357&view=rev Author: brlcad Date: 2008-12-11 02:50:27 +0000 (Thu, 11 Dec 2008) Log Message: ----------- and the last change by sebastian pipping, from git commit 320ee0c022636152b173ecd9b57a373fce02b1a4 (Separate availability check and actual download, report versions, add support for fetch). includes a few (untested) minor mods to push the actual download line to a one-liner. Modified Paths: -------------- brlcad/trunk/autogen.sh Modified: brlcad/trunk/autogen.sh =================================================================== --- brlcad/trunk/autogen.sh 2008-12-11 02:41:07 UTC (rev 33356) +++ brlcad/trunk/autogen.sh 2008-12-11 02:50:27 UTC (rev 33357) @@ -69,8 +69,10 @@ # To verbosely try running with an older (unsupported) autoconf: # AUTOCONF_VERSION=2.50 ./autogen.sh --verbose # -# Authors: +# Author: # Christopher Sean Morrison <mor...@br...> +# +# Patches: # Sebastian Pipping <seb...@pi...> # ###################################################################### @@ -107,6 +109,7 @@ fi echo "autogen.sh build preparation script by Christopher Sean Morrison" + echo " + config.guess download patch by Sebastian Pipping (2008-12-03)" echo "revised 3-clause BSD-style license, copyright (c) $__copyright" echo "script version $__version, ISO/IEC 9945 POSIX shell script" } @@ -1062,20 +1065,35 @@ # abuse gitweb to download gnulib's latest config.guess via HTTP config_guess_temp="config.guess.$$.download" ret=1 - for __cmd in wget curl ; do + for __cmd in wget curl fetch ; do + $VERBOSE_ECHO "Checking for command ${__cmd}" + ${__cmd} --version &>/dev/null + ret=$? + if [ ! $ret = 0 ] ; then + continue + fi + + __cmd_version=`${__cmd} --version | head -n 1 | sed -e 's/^[^0-9]\+//' -e 's/ .*//'` + $VERBOSE_ECHO "Found ${__cmd} ${__cmd_version}" + + opts="" case ${__cmd} in wget) - wget "${CONFIG_GUESS_URL}" -O "${config_guess_temp}" > /dev/null 2>&1 - ret=$? + opts="-O" ;; curl) - curl "${CONFIG_GUESS_URL}" -o "${config_guess_temp}" > /dev/null 2>&1 - ret=$? + opts="-o" ;; + fetch) + opts="-t 5 -f" + ;; esac - if [ $ret = 0 ] ; then + $VERBOSE_ECHO "Running $__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" + eval "$__cmd \"${CONFIG_GUESS_URL}\" $opts \"${config_guess_temp}\"" > /dev/null 2>&1 + if [ $? = 0 ] ; then mv -f "${config_guess_temp}" ${_aux_dir}/config.guess + ret=0 break fi done This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |