INCLUDES=
AC_SUBST(INCLUDES)
-m4_define([SUBDIRSMK_SUBDIRS],
-[m4_map_args_w([$1],[_SUBDIRSMK_SUBDIR(],[/)])])dnl
+m4_include([subdirmk/subdirmk.ac])
-m4_define([_SUBDIRSMK_SUBDIR],
-[AC_CONFIG_FILES([$1Subdir.mk:$1Subdir.mk.tmp])])dnl
-dnl ,[subdirsmk_need_prep]
-dnl [AC_CONFIG_COMMANDS([$1Subdir.mk],)
-
-SUBDIRSMK_SUBDIRS([lib lib/t src])
+SUBDIRMK_SUBDIRS([lib])
+SUBDIRMK_SUBDIRS([lib/t src])
AC_OUTPUT