X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=autogen.sh;h=ecdd70107daeb9900c5f3401dc1099351273c1b3;hp=1209bd8e0045d7fb70f7eabdef1df0911dc9040d;hb=91f65c277483b47343b1b64d0f4edd497a8045a3;hpb=912e7e968f4888d62b3c620893a70e825599973b diff --git a/autogen.sh b/autogen.sh index 1209bd8e..ecdd7010 100644 --- a/autogen.sh +++ b/autogen.sh @@ -96,18 +96,6 @@ do echo processing $dr macrodirs=`sed -n -e 's,AM_ACLOCAL_INCLUDE(\(.*\)),\1,gp' < $coin` ( cd $dr - aclocalinclude="$ACLOCAL_FLAGS" - for k in $macrodirs; do - if test -d $k; then - if test -f $k/Makefile.am.in; then - make -C $k -f Makefile.am.in Makefile.am - fi - aclocalinclude="$aclocalinclude -I $k" - ##else - ## echo "**Warning**: No such directory \`$k'. Ignored." - fi - done - touch ChangeLog if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then if grep "sed.*POTFILES" configure.in >/dev/null; then : do nothing -- we still have an old unmodified configure.in @@ -132,6 +120,18 @@ do echo "Running libtoolize..." libtoolize --force --copy fi + aclocalinclude="$ACLOCAL_FLAGS" + for k in $macrodirs; do + if test -d $k; then + if test -f $k/Makefile.am.in; then + make -C $k -f Makefile.am.in Makefile.am + fi + aclocalinclude="$aclocalinclude -I $k" + ##else + ## echo "**Warning**: No such directory \`$k'. Ignored." + fi + done + touch ChangeLog echo "Running aclocal $aclocalinclude ..." aclocal $aclocalinclude if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then