Merge branches 'remove-acdir-option' and 'remove-obsolete-m4'

* remove-acdir-option:
  aclocal: remove the --acdir option

* remove-obsolete-m4:
  m4: delete several obsolete macros

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

diff --cc Makefile.am
Simple merge

diff --cc NEWS
index 4e49512,993f41e,808d435..8653603
--- 1/NEWS
--- 2/NEWS
--- 3/NEWS
+++ b/NEWS
@@@@ -1,37 -1,45 -1,39 +1,45 @@@@
-  New in 1.12:
-  
-  * WARNING: Future backward-incompatibilities!
+  New in 1.13:
   
-    - Starting from the next major Automake version (1.13), the rules to
-      build pdf, ps and dvi output from Texinfo input will use the '--tidy'
-      option by default.  Since such an option was introduced in Texinfo
-      4.9, this means that Makefiles generated by future Automake versions
-      will require at least that version of Texinfo.
+  * Obsolete features removed:
   
-    - Starting from the next major Automake version (1.13), the parallel
-      testsuite harness (previously only enabled by the 'parallel-tests'
-      option) will become the default one; the older serial testsuite
-      harness will still be available through the use of the 'serial-tests'
-      option.
+ +  - The deprecated aclocal option '--acdir' has been removed.  You
+ +    should use the options '--automake-acdir' and '--system-acdir'
+ +    instead (which have been introduced in Automake 1.11.2).
  +
-    - The following long-obsolete m4 macros will be removed in the
-      next major Automake version (1.13):
++   - The following long-obsolete m4 macros have been removed:
 + 
 +       AM_PROG_CC_STDC:    superseded by AC_PROG_CC since October 2002
 +       fp_PROG_CC_STDC:    broken alias for AM_PROG_CC_STDC
 +       fp_WITH_DMALLOC:    old alias for AM_WITH_DMALLOC
 +       AM_CONFIG_HEADER:   superseded by AC_CONFIG_HEADERS since July 2002
 +       ud_PATH_LISPDIR:    old alias for AM_PATH_LISPDIR
 +       jm_MAINTAINER_MODE: old alias for AM_MAINTAINER_MODE
 +       ud_GNU_GETTEXT:     old alias for AM_GNU_GETTEXT
 +       gm_PROG_LIBTOOL:    old alias for AC_PROG_LIBTOOL
 +       fp_C_PROTOTYPES:    old alias for AM_C_PROTOTYPES (which was part
 +                           of the now-removed automatic de-ANSI-fication
 +                           support of Automake)
 + 
-    - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
-      the next major Automake version (1.13).
++   - All the "old alias" macros in 'm4/obsolete.m4' have been removed.
++ 
+++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+++
+  New in 1.12:
+  
+  * WARNING: Future backward-incompatibilities!
+  
+    - Starting from the next major Automake version (1.13), the rules to
+      build pdf, ps and dvi output from Texinfo input will use the '--tidy'
+      option by default.  Since such an option was introduced in Texinfo
+      4.9, this means that Makefiles generated by future Automake versions
+      will require at least that version of Texinfo.
+  
+    - Starting from the next major Automake version (1.13), the parallel
+      testsuite harness (previously only enabled by the 'parallel-tests'
+      option) will become the default one; the older serial testsuite
+      harness will still be available through the use of the 'serial-tests'
+      option.
   
 -   - The following long-obsolete m4 macros will be removed in the
 -     next major Automake version (1.13):
 - 
 -       AM_PROG_CC_STDC:    superseded by AC_PROG_CC since October 2002
 -       fp_PROG_CC_STDC:    broken alias for AM_PROG_CC_STDC
 -       fp_WITH_DMALLOC:    old alias for AM_WITH_DMALLOC
 -       AM_CONFIG_HEADER:   superseded by AC_CONFIG_HEADERS since July 2002
 -       ud_PATH_LISPDIR:    old alias for AM_PATH_LISPDIR
 -       jm_MAINTAINER_MODE: old alias for AM_MAINTAINER_MODE
 -       ud_GNU_GETTEXT:     old alias for AM_GNU_GETTEXT
 -       gm_PROG_LIBTOOL:    old alias for AC_PROG_LIBTOOL
 -       fp_C_PROTOTYPES:    old alias for AM_C_PROTOTYPES (which was part
 -                           of the now-removed automatic de-ANSI-fication
 -                           support of Automake)
 - 
 -   - All the "old alias" macros in 'm4/obsolete.m4' will be removed in
 -     the next major Automake version (1.13).
 - 
     - Support for the "Cygnus-style" trees (enabled by the 'cygnus' option)
       will be deprecated in the next minor version of Automake (1.12.1) and
       removed in the next major version (1.13).

diff --cc aclocal.in
Simple merge

diff --cc configure.ac
Simple merge