Skip to content

V
vlc-2-2
Commit 88a4e298 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

bootstrap: Use libtoolize from contrib by default.

parent 06bbffa6
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
bootstrap
View file @ 88a4e298
...@@ -34,7 +34,7 @@ INSTALLSUCKS=no ...@@ -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 ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment