From cd5520e4395eda08ee9db9df8f31f1140acd55fe Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Tue, 27 Jul 2010 22:50:38 +0200 Subject: [PATCH] Bootstrap: don't search perl in $PATH. * bootstrap: Do not explicitly search perl in $PATH anymore. ($PATH_SEPARATOR): Removed, it's no more needed. --- ChangeLog | 4 ++++ bootstrap | 32 ++------------------------------ 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index e424d30ee..815f467da 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-08-08 Stefano Lattarini + Bootstrap: don't search perl in $PATH. + * bootstrap: Do not explicitly search perl in $PATH anymore. + ($PATH_SEPARATOR): Removed, it's no more needed. + Bootstrap: let the user choose which autoconf to use. * bootstrap ($AUTOCONF): New variable, from the environment. ($AUTOM4TE): Likewise, for clarity. diff --git a/bootstrap b/bootstrap index ebcedbe83..f72346f79 100755 --- a/bootstrap +++ b/bootstrap @@ -19,46 +19,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Find the path separator. -# (Snippet copied from configure's initialization in Autoconf 2.65) -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } -fi - # Don't ignore failures. set -e # Set program basename. me=`echo "$0" | sed 's,^.*/,,'` -# Let user choose which version of autoconf and autom4te to use. +# Let user choose which version of autoconf, autom4te and perl to use. : ${AUTOCONF=autoconf} export AUTOCONF # might be used by aclocal and/or automake : ${AUTOM4TE=autom4te} export AUTOM4TE # ditto - -# Find perl. Code based on Autoconf, but without non-POSIX support. -if test -z "$PERL"; then - save_IFS=$IFS - IFS=$PATH_SEPARATOR - for dir in $PATH; do - IFS=$save_IFS - test -z "$dir" && dir=. - if test -x "$dir/perl" && test ! -d "$dir/perl"; then - PERL="$dir/perl" - break - fi - done -fi - -if test -z "$PERL"; then - echo "$me: cannot find perl" >&2 - exit 1 -fi +: ${PERL=perl} # Variables to substitute. VERSION=`sed -ne '/AC_INIT/s/^[^[]*\[[^[]*\[\([^]]*\)\].*$/\1/p' configure.ac` -- 2.34.1