1
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-04 09:11:33 +02:00

bootstrap: Use libtoolize from contrib by default.

This commit is contained in:
Pierre d'Herbemont 2007-07-20 22:40:23 +00:00
parent 06bbffa635
commit 88a4e29812

View File

@ -34,7 +34,7 @@ INSTALLSUCKS=no
ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}" ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}"
# Check for contrib directory # Check for contrib directory
if test -d extras/contrib/bin; then if then
export PATH="`pwd`/extras/contrib/bin:$PATH" export PATH="`pwd`/extras/contrib/bin:$PATH"
if test -d extras/contrib/share/aclocal; then if test -d extras/contrib/share/aclocal; then
ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal" ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
@ -99,7 +99,9 @@ esac
# Check for libtool # Check for libtool
libtoolize="no" libtoolize="no"
if glibtoolize --version >/dev/null 2>&1; then if test -x extras/contrib/bin/libtoolize --version > /dev/null 2>&1; then
libtoolize="extras/contrib/bin/libtoolize"
elif glibtoolize --version >/dev/null 2>&1; then
libtoolize="glibtoolize" libtoolize="glibtoolize"
elif libtoolize --version >/dev/null 2>&1; then elif libtoolize --version >/dev/null 2>&1; then
libtoolize="libtoolize" libtoolize="libtoolize"