diff options
-rw-r--r-- | macros/ChangeLog | 4 | ||||
-rw-r--r-- | macros/autogen.sh | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog index 62f0885d5e..41185a4351 100644 --- a/macros/ChangeLog +++ b/macros/ChangeLog @@ -1,3 +1,7 @@ +Sat Feb 14 17:41:28 KST 1998 Changwoo Ryu <cwryu@adam.kaist.ac.kr> + + * autogen.sh: multilple aclocal -I directories. + Sat Feb 14 01:09:37 1998 Tom Tromey <tromey@cygnus.com> * Makefile.am (macros.dep): Removed extra `$' from rule. diff --git a/macros/autogen.sh b/macros/autogen.sh index c40ccee978..1776de2ca5 100644 --- a/macros/autogen.sh +++ b/macros/autogen.sh @@ -65,13 +65,19 @@ fi for j in `find $srcdir -name configure.in -print` do i=`dirname $j` - macros=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $j` + macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $j` + echo "hahaha $macrodirs" echo processing $i ## debug - test -n "$macros" && echo \`aclocal\' will also look in \`$macros\' + test -n "$macrodirs" && echo \`aclocal\' will also look in \`$macrodirs\' (cd $i; \ + aclocalinclude=""; \ + for k in $macrodirs; do \ + if test -d $k; then aclocalinclude="$aclocalinclude -I $k"; \ + else echo "**Warning**: No such directory \`$k'. Ignored."; fi \ + done; \ libtoolize --copy --force; \ - if test -n "$macros"; then aclocal -I $macros; else aclocal; fi; \ + aclocal $aclocalinclude; \ autoheader; automake --add-missing --gnu; autoheader; autoconf) done |