From adb3aa8ec1a70976f92cd05a8bab4174905d3005 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 20 May 2009 23:43:36 -0700 Subject: [PATCH] Added -I option to aclocal so the system finds the right libtool.m4 file. --- config/bootstrap | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config/bootstrap b/config/bootstrap index fa2cb512..d252837a 100755 --- a/config/bootstrap +++ b/config/bootstrap @@ -7,6 +7,7 @@ die() { echo "$@"; exit 1; } # LIBTOOLIZE=${LIBTOOLIZE:-libtoolize} LIBTOOLIZE_FLAGS=" --automake --copy --force" # ACLOCAL=${ACLOCAL:-aclocal} +ACLOCAL_FLAGS="-I config" # AUTOHEADER=${AUTOHEADER:-autoheader} # AUTOMAKE=${AUTOMAKE:-automake} AUTOMAKE_FLAGS="--add-missing --copy --force" @@ -93,12 +94,12 @@ if test x$AUTOHEADER = x; then fi -run $ACLOCAL $ACLOCAL_FLAGS || die "Can't execute aclocal" -run $AUTOHEADER || die "Can't execute autoheader" - # --force means overwrite ltmain.sh script if it already exists run $LIBTOOLIZE $LIBTOOLIZE_FLAGS || die "Can't execute libtoolize" +run $ACLOCAL $ACLOCAL_FLAGS || die "Can't execute aclocal" +run $AUTOHEADER || die "Can't execute autoheader" + # --add-missing instructs automake to install missing auxiliary files # and --force to overwrite them if they already exist run $AUTOMAKE $AUTOMAKE_FLAGS || die "Can't execute automake" -- 2.30.2