Commit bc965132 authored by David I. Lehn's avatar David I. Lehn
Browse files

run libtoolize in autogen.sh.

Original commit message from CVS:
run libtoolize in autogen.sh.
remove ltmain.sh from cvs because libtoolize creates it.
let cothread detect tools same as root to fix auto*-x.y case
parent e7db7a70
...@@ -28,9 +28,9 @@ autogen_options $@ ...@@ -28,9 +28,9 @@ autogen_options $@
echo -n "+ check for build tools" echo -n "+ check for build tools"
if test ! -z $NOCHECK; then echo ": skipped version checks"; else echo; fi if test ! -z $NOCHECK; then echo ": skipped version checks"; else echo; fi
version_check "autoconf" "$AUTOCONF autoconf autoconf-2.53 autoconf-2.52" \ version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \
"ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1
version_check "automake" "$AUTOMAKE automake automake-1.6 automake-1.5" \ version_check "automake" "$AUTOMAKE automake automake-1.7 automake-1.6 automake-1.5" \
"ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/automake/" 1 5 || DIE=1
version_check "libtool" "" \ version_check "libtool" "" \
"ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1
...@@ -59,10 +59,7 @@ toplevel_check $srcfile ...@@ -59,10 +59,7 @@ toplevel_check $srcfile
if test -e acinclude.m4; then rm acinclude.m4; fi if test -e acinclude.m4; then rm acinclude.m4; fi
tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS" tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS"
# FIXME : why does libtoolize keep complaining about aclocal ? tool_run "libtoolize" "--copy --force"
echo "+ not running libtoolize until libtool fix has flown downstream"
# tool_run "libtoolize" "--copy --force"
tool_run "$autoheader" tool_run "$autoheader"
# touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo # touch the stamp-h.in build stamp so we don't re-run autoheader in maintainer mode -- wingo
...@@ -73,10 +70,10 @@ debug "automake: $automake" ...@@ -73,10 +70,10 @@ debug "automake: $automake"
tool_run "$automake" "-a -c" tool_run "$automake" "-a -c"
echo echo
echo "+ running autogen.sh --noconfigure --nocheck $@ in libs/ext/cothreads..." echo "+ running autogen.sh --noconfigure $@ in libs/ext/cothreads..."
pushd libs/ext/cothreads > /dev/null pushd libs/ext/cothreads > /dev/null
echo echo
./autogen.sh --noconfigure --nocheck $@ || { ./autogen.sh --noconfigure $@ || {
echo "autogen in cothreads failed." echo "autogen in cothreads failed."
exit 1 exit 1
} }
......
This diff is collapsed.
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