From: Pierre d'Herbemont Date: Fri, 20 Jul 2007 22:40:23 +0000 (+0000) Subject: bootstrap: Use libtoolize from contrib by default. X-Git-Tag: 0.9.0-test0~6774 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=88a4e298124ec7a53edeb8f5672b283d687ed33b;p=vlc bootstrap: Use libtoolize from contrib by default. --- diff --git a/bootstrap b/bootstrap index 9c0fa357a5..1b366c44b9 100755 --- a/bootstrap +++ b/bootstrap @@ -34,7 +34,7 @@ INSTALLSUCKS=no ACLOCAL_ARGS="-I m4 ${ACLOCAL_ARGS}" # Check for contrib directory -if test -d extras/contrib/bin; then +if then export PATH="`pwd`/extras/contrib/bin:$PATH" if test -d extras/contrib/share/aclocal; then ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal" @@ -99,7 +99,9 @@ esac # Check for libtool 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" elif libtoolize --version >/dev/null 2>&1; then libtoolize="libtoolize"