support current automake

The current automake spews warnings and fails if Makefile.am has subdirectories in it, unless the `subdir-options` option to automake is specified.  So we specify it.  The option appears to have no effect on older versions of automake.