mirror of
https://code.videolan.org/videolan/vlc
synced 2024-09-24 20:48:52 +02:00
* aclocal doesn't handle searching in non-existing dirs all that gracefully.
new method in which aclocal args first get stored in a variable.
This commit is contained in:
parent
d2845b70dc
commit
29f8c4b341
@ -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 -I extras/contrib/share/aclocal
|
||||
${aclocal} ${ACLOCAL_ARGS}
|
||||
${autoconf}
|
||||
${autoheader}
|
||||
${automake} --add-missing --copy
|
||||
|
Loading…
Reference in New Issue
Block a user