Merge branch 'maint'

* maint:
  fixup: contrib: really integrate in automake build system

diff --cc Makefile.am
index ab57068cef8ff84dd01ea86a97e3af8dc4b6a1c8,bd5b76a069ea5d603b5ee8711948cf647cea0500..0b7e091d6e3c17232e15777b4f412c73261792a1
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -23,9 -23,9 +23,9 @@@
  ## automake (run in doc, tests, and in the rebuild rules.)
  ## `.' goes before doc and tests, because the latter two directories
  ## run aclocal and automake.
- SUBDIRS = lib . doc m4 tests
+ SUBDIRS = lib . contrib doc m4 tests
  
 -TEST_SUBDIRS = tests lib/Automake/tests
 +TEST_SUBDIRS = lib/Automake/tests tests
  
  bin_SCRIPTS = automake aclocal
  

diff --cc configure.ac
Simple merge