Commit adcba815 authored by Adam Mercer's avatar Adam Mercer 🛌

no need to recurse 00boot, no sources to build

Original: 98bc8ab7e17de2462a9278d1f9f67eeb4c95390b
parent 0a5fd6f3
......@@ -7,12 +7,6 @@ fail () {
exit 1
}
## build sources, where appropriate
for d in lal; do
echo "00boot: building sources in $d"
(cd "$d" && ./00boot --only-build-sources 1>/dev/null) || fail "00boot in $d"
done
echo "00boot: running autoreconf"
LIBTOOLIZE=true autoreconf || fail "autoreconf"
......
......@@ -12,8 +12,6 @@ helpmsg="Usage $0 [options]
Options: [defaults in brackets after description]"
helpmsg="$helpmsg
--help print this message"
helpmsg="$helpmsg
--with-m4=M4 use GNU-m4 program M4 [m4]"
helpmsg="$helpmsg
--with-autoreconf=AUTORECONF use autoreconf program AUTORECONF [autoreconf]"
helpmsg="$helpmsg
......@@ -24,8 +22,6 @@ helpmsg="$helpmsg
--with-automake=AUTOMAKE use automake program AUTOMAKE [automake]"
helpmsg="$helpmsg
--with-autoconf=AUTOCONF use autoconf program AUTOCONF [autoconf]"
helpmsg="$helpmsg
--only-build-sources only build sources, not build system"
# default options
only_build_sources="false"
......@@ -40,13 +36,11 @@ while test $# -gt 0 ; do
esac
case $option in
-h | -help | --help ) echo "$helpmsg"; exit 0;;
-with-m4=* | --with-m4=* ) M4="$optarg";;
-with-autoreconf=* | --with-autoreconf=* ) AUTORECONF="$optarg";;
-with-aclocal=* | --with-aclocal=* ) ACLOCAL="$optarg";;
-with-autoheader=* | --with-autoheader=* ) AUTOHEADER="$optarg";;
-with-automake=* | --with-automake=* ) AUTOMAKE="$optarg";;
-with-autoconf=* | --with-autoconf=* ) AUTOCONF="$optarg";;
-only-build-sources | --only-build-sources ) only_build_sources="true";;
*) echo "unrecognized option $option"; exit 1;;
esac
shift
......@@ -54,7 +48,6 @@ done
# check autotools versions
echo "00boot: checking versions of autotools"
M4=${M4:-"m4"}
AUTORECONF=${AUTORECONF:-"autoreconf"}
ACLOCAL=${ACLOCAL:-"aclocal"}
AUTOHEADER=${AUTOHEADER:-"autoheader"}
......@@ -89,12 +82,6 @@ printf "00boot:\t%-16s %s\n" "autoheader-$autoheader_version:" "`which $AUTOHEAD
printf "00boot:\t%-16s %s\n" "automake-$automake_version:" "`which $AUTOMAKE`"
printf "00boot:\t%-16s %s\n" "autoconf-$autoconf_version:" "`which $AUTOCONF`"
# run m4 to generate sources
echo "00boot: creating sources"
# don't build the build system if --only-build-sources option is specified
if test "$only_build_sources" = "false"; then
# FIXME: autoreconf from Ubuntu 9.10 (and probably also from recent
# Debian versions) automatically run libtoolize with the --copy option
# therefore over writing the supplied libtool scripts with system
......@@ -124,5 +111,3 @@ echo "
Otherwise consult the file README.install
================================================================="
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment