mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-24 01:00:37 +00:00
run libtoolize, remove generated file ltmain.sh add some newer versions for tool checks
Original commit message from CVS: run libtoolize, remove generated file ltmain.sh add some newer versions for tool checks
This commit is contained in:
parent
0b2f2303e4
commit
ea9932349c
2 changed files with 3 additions and 4954 deletions
10
autogen.sh
10
autogen.sh
|
@ -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"; else echo; fi
|
if test ! -z $NOCHECK; then echo " skipped"; 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
|
||||||
|
@ -57,11 +57,7 @@ fi
|
||||||
toplevel_check $srcfile
|
toplevel_check $srcfile
|
||||||
|
|
||||||
tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
|
tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
|
||||||
|
tool_run "libtoolize" "--copy --force"
|
||||||
# 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 "$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
|
||||||
|
|
Loading…
Reference in a new issue