Commit 29f8c4b3 authored by hartman's avatar hartman
Browse files

* aclocal doesn't handle searching in non-existing dirs all that gracefully.

  new method in which aclocal args first get stored in a variable.
parent d2845b70
...@@ -29,11 +29,14 @@ set -x ...@@ -29,11 +29,14 @@ set -x
AUTOMAKESUCKS=no AUTOMAKESUCKS=no
INSTALLSUCKS=no INSTALLSUCKS=no
ACLOCAL_ARGS="-I m4"
# Check for contrib directory # Check for contrib directory
if test -d extras/contrib/bin; then if test -d extras/contrib/bin; then
export PATH=./extras/contrib/bin:$PATH export PATH=./extras/contrib/bin:$PATH
export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
ACLOCAL_ARGS="${ACLOCAL_ARGS} -I extras/contrib/share/aclocal"
fi fi
# Check for automake # Check for automake
...@@ -360,7 +363,7 @@ fi ...@@ -360,7 +363,7 @@ fi
# Do the rest # Do the rest
${autopoint} -f ${autopoint} -f
${aclocal} -I m4 -I extras/contrib/share/aclocal ${aclocal} ${ACLOCAL_ARGS}
${autoconf} ${autoconf}
${autoheader} ${autoheader}
${automake} --add-missing --copy ${automake} --add-missing --copy
......
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