X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bootstrap;h=09304f8b979f09f7d5edee09156688296be0ce35;hb=c163444a0f19cc6689a995437205ddcbfc3f758a;hp=58203a7ec1d76a59492c2b45b5bce445e9d9f071;hpb=163b655bdf461bc56fa33d3bc95ac260a33bf939;p=vlc

diff --git a/bootstrap b/bootstrap
index 58203a7ec1..09304f8b97 100755
--- a/bootstrap
+++ b/bootstrap
@@ -29,11 +29,14 @@ set -x
 AUTOMAKESUCKS=no
 INSTALLSUCKS=no
 
+ACLOCAL_ARGS="-I m4"
+
 # Check for contrib directory
 if test -d extras/contrib/bin; then
   export PATH=./extras/contrib/bin:$PATH
   export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
   export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
+  ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
 fi
 
 # Check for automake
@@ -360,7 +363,7 @@ fi
 
 # Do the rest
 ${autopoint} -f
-${aclocal} -I m4
+${aclocal} ${ACLOCAL_ARGS}
 ${autoconf}
 ${autoheader}
 ${automake} --add-missing --copy