Merge branch 'maint'

* maint:
  automake: typofix in comments: s/AC_CONFIG_HEADER/AC_CONFIG_HEADERS/
  am: prefer a shorter idiom where possible
  cosmetics: fix few typos, grammaros and missing whitespace
  fixup: remove an obsolete comment
  docs: we still don't have the promised better Java interface
  build: move automake and aclocal in 'bin' subdir
  build: break up monolithic Makefile.am in subdir-specific fragments

+ Extra non-trivial edits:

* m4/Makefile.inc (dist_automake_ac_DATA): Drop lead-dot.m4 and
mkdirp.m4.
* lib/Automake/Makefile.inc (dist_perllib_DATA): Drop Configure_ac.pm.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>

2 files changed, 20 insertions, 16 deletions

diff --git a/maintainer/rename-tests b/maintainer/rename-tests
index a58474862..28963fa37 100755
--- a/maintainer/rename-tests
+++ b/maintainer/rename-tests
@@ -30,7 +30,7 @@ esac
 AWK=${AWK-awk}
 SED=${SED-sed}
 
-[[ -f automake.in && -d lib/Automake ]] \
+[[ -f bin/automake.in && -d lib/Automake ]] \
   || fatal "can only be run from the top-level of the Automake source tree"
 
 $SED --version 2>&1 | grep GNU >/dev/null 2>&1 \
diff --git a/maintainer/syntax-checks.mk b/maintainer/syntax-checks.mk
index 6614820df..6cfa603c2 100644
--- a/maintainer/syntax-checks.mk
+++ b/maintainer/syntax-checks.mk
@@ -85,17 +85,19 @@ sc_at_in_texi
 ## aclocal.
 automake_diff_no = 7
 aclocal_diff_no = 9
+sc_diff_automake sc_diff_aclocal: in=$($*_in)
+sc_diff_automake sc_diff_aclocal: out=$($*_script)
 sc_diff_automake sc_diff_aclocal: sc_diff_% :
 	@set +e; \
 	in=$*-in.tmp out=$*-out.tmp diffs=$*-diffs.tmp \
-	  && sed '/^#!.*[pP]rototypes/d' $(srcdir)/$*.in > $$in \
-	  && sed '/^# BEGIN.* PROTO/,/^# END.* PROTO/d' $* > $$out \
+	  && sed '/^#!.*[pP]rototypes/d' $(in) > $$in \
+	  && sed '/^# BEGIN.* PROTO/,/^# END.* PROTO/d' $(out) > $$out \
 	  && { diff -u $$in $$out > $$diffs; test $$? -eq 1; } \
 	  && added=`grep -v '^+++ ' $$diffs | grep -c '^+'` \
 	  && removed=`grep -v '^--- ' $$diffs | grep -c '^-'` \
 	  && test $$added,$$removed = $($*_diff_no),$($*_diff_no) \
 	  || { \
-	    echo "Found unexpected diffs between $*.in and $*"; \
+	    echo "Found unexpected diffs between $(in) and $(out)"; \
 	    echo "Lines added:   $$added"  ; \
 	    echo "Lines removed: $$removed"; \
 	    cat $$diffs; \
@@ -150,22 +152,22 @@ sc_pre_normal_post_install_uninstall:
 
 ## We never want to use "undef", only "delete", but for $/.
 sc_perl_no_undef:
-	@if grep -n -w 'undef ' $(srcdir)/automake.in | \
+	@if grep -n -w 'undef ' $(automake_in) | \
 	      grep -F -v 'undef $$/'; then \
-	  echo "Found undef in automake.in; use delete instead" 1>&2; \
+	  echo "Found 'undef' in the lines above; use 'delete' instead" 1>&2; \
 	  exit 1; \
 	fi
 
 ## We never want split (/ /,...), only split (' ', ...).
 sc_perl_no_split_regex_space:
-	@if grep -n 'split (/ /' $(srcdir)/automake.in; then \
+	@if grep -n 'split (/ /' $(automake_in) $(acloca_in); then \
 	  echo "Found bad split in the lines above." 1>&2; \
 	  exit 1; \
 	fi
 
 ## Look for cd within backquotes
 sc_cd_in_backquotes:
-	@if grep -n '^[^#]*` *cd ' $(srcdir)/automake.in $(ams); then \
+	@if grep -n '^[^#]*` *cd ' $(automake_in) $(ams); then \
 	  echo "Consider using \$$(am__cd) in the lines above." 1>&2; \
 	  exit 1; \
 	fi
@@ -173,7 +175,7 @@ sc_cd_in_backquotes:
 ## Look for cd to a relative directory (may be influenced by CDPATH).
 ## Skip some known directories that are OK.
 sc_cd_relative_dir:
-	@if grep -n '^[^#]*cd ' $(srcdir)/automake.in $(ams) | \
+	@if grep -n '^[^#]*cd ' $(automake_in) $(ams) | \
 	      grep -v 'echo.*cd ' | \
 	      grep -v 'am__cd =' | \
 	      grep -v '^[^#]*cd [./]' | \
@@ -187,22 +189,24 @@ sc_cd_relative_dir:
 
 ## Using @_ in a scalar context is most probably a programming error.
 sc_perl_at_uscore_in_scalar_context:
-	@if grep -Hn '[^@_A-Za-z0-9][_A-Za-z0-9]*[^) ] *= *@_' $(srcdir)/automake.in; then \
+	@if grep -Hn '[^%@_A-Za-z0-9][_A-Za-z0-9]*[^) ] *= *@_' \
+	    $(automake_in) $(aclocal_in); then \
 	  echo "Using @_ in a scalar context in the lines above." 1>&2; \
 	  exit 1; \
 	fi
 
-## Allow only few variables to be localized in Automake.
+## Allow only few variables to be localized in automake and aclocal.
 sc_perl_local:
-	@if egrep -v '^[ \t]*local \$$[_~]( *=|;)' $(srcdir)/automake.in | \
-	        grep '^[ \t]*local [^*]'; then \
+	@if egrep -v '^[ \t]*local \$$[_~]( *=|;)' \
+	      $(automake_in) $(aclocal_in) | \
+	    grep '^[ \t]*local [^*]'; then \
 	  echo "Please avoid 'local'." 1>&2; \
 	  exit 1; \
 	fi
 
 ## Don't let AMDEP_TRUE substitution appear in automake.in.
 sc_AMDEP_TRUE_in_automake_in:
-	@if grep '@AMDEP''_TRUE@' $(srcdir)/automake.in; then \
+	@if grep '@AMDEP''_TRUE@' $(automake_in); then \
 	  echo "Don't put AMDEP_TRUE substitution in automake.in" 1>&2; \
 	  exit 1; \
 	fi
@@ -210,7 +214,7 @@ sc_AMDEP_TRUE_in_automake_in:
 ## Recursive make invocations should always pass $(AM_MAKEFLAGS)
 ## to $(MAKE), for portability to non-GNU make.
 sc_tests_make_without_am_makeflags:
-	@if grep '^[^#].*(MAKE) ' $(ams) $(srcdir)/automake.in \
+	@if grep '^[^#].*(MAKE) ' $(ams) $(automake_in) \
 	    | grep -v 'AM_MAKEFLAGS' \
 	    | grep -v '/am/header-vars\.am:.*am--echo.*| $$(MAKE) -f *-'; \
 	then \
@@ -528,7 +532,7 @@ sc_at_in_texi:
 	  exit 1; \
 	fi
 
-$(syntax_check_rules): automake aclocal
+$(syntax_check_rules): bin/automake bin/aclocal
 maintainer-check: $(syntax_check_rules)
 .PHONY: maintainer-check $(syntax_check_rules)