projects
/
platform
/
upstream
/
gstreamer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run libtoolize in autogen.sh.
[platform/upstream/gstreamer.git]
/
autogen.sh
diff --git
a/autogen.sh
b/autogen.sh
index
24b7cf0
..
bbd385f
100755
(executable)
--- a/
autogen.sh
+++ b/
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
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.5
4 autoconf-2.5
3 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
version_check "libtool" "" \
"ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1
"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"
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
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
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
pushd libs/ext/cothreads > /dev/null
echo
-./autogen.sh --noconfigure
--nocheck
$@ || {
+./autogen.sh --noconfigure $@ || {
echo "autogen in cothreads failed."
exit 1
}
echo "autogen in cothreads failed."
exit 1
}