mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 19:51:11 +00:00
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
This commit is contained in:
parent
e7db7a70ad
commit
bc965132c8
2 changed files with 5 additions and 5037 deletions
13
autogen.sh
13
autogen.sh
|
@ -28,9 +28,9 @@ autogen_options $@
|
|||
|
||||
echo -n "+ check for build tools"
|
||||
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
|
||||
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
|
||||
version_check "libtool" "" \
|
||||
"ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1
|
||||
|
@ -59,10 +59,7 @@ toplevel_check $srcfile
|
|||
if test -e acinclude.m4; then rm acinclude.m4; fi
|
||||
tool_run "$aclocal" "-I common/m4 $ACLOCAL_FLAGS"
|
||||
|
||||
# FIXME : why does libtoolize keep complaining about aclocal ?
|
||||
|
||||
echo "+ not running libtoolize until libtool fix has flown downstream"
|
||||
# tool_run "libtoolize" "--copy --force"
|
||||
tool_run "libtoolize" "--copy --force"
|
||||
tool_run "$autoheader"
|
||||
|
||||
# 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"
|
|||
tool_run "$automake" "-a -c"
|
||||
|
||||
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
|
||||
echo
|
||||
./autogen.sh --noconfigure --nocheck $@ || {
|
||||
./autogen.sh --noconfigure $@ || {
|
||||
echo "autogen in cothreads failed."
|
||||
exit 1
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue