X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?p=subdirmk.git;a=blobdiff_plain;f=configure.ac;h=88516fbacb3c26a5d1a1f2d811052f83f110cb7e;hp=e56fee9a188399f01a9643912ca48fa12887718f;hb=b0ec8ee72de621b16191b1a06612c60156ec667e;hpb=03e85f8934e2a1b68970d762a53c6bd890dd65fc

diff --git a/configure.ac b/configure.ac
index e56fee9..88516fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,26 +1,8 @@
 dnl -*-autoconf-*-
-dnl
-dnl Configuration script for toy project
-dnl
-dnl (c) 2019 Mark Wooding
-dnl
-
-dnl----- Licensing notice ---------------------------------------------------
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU Library General Public License as
-dnl published by the Free Software Foundation; either version 2 of the
-dnl License, or (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU Library General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU Library General Public
-dnl License along with this program; if not, write to the Free
-dnl Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-dnl MA 02111-1307, USA.
+dnl subdirmk example - configuration script
+dnl  Copyright 2019 Mark Wooding
+dnl  Copyright 2019 Ian Jackson
+dnl SPDX-License-Identifier: LGPL-2.0-or-later
 
 AC_INIT([mktoy], [0.9.0], [mdw@distorted.org.uk])
 AC_CONFIG_SRCDIR([src/toy.c])
@@ -32,26 +14,10 @@ AC_PROG_CC
 INCLUDES=
 AC_SUBST(INCLUDES)
 
-m4_define([SUBDIRSMK_SUBDIRS],
-[m4_map_args_w([$1],[_SUBDIRSMK_SUBDIR(],[/)])])dnl
-
-AC_CONFIG_FILES([subdirs.mk:subdirs.mk.tmp Subdir.mk:Subdir.mk.tmp],[],
-[
-subdirsmk_need_prep=false
-AS_IF([\$ac_need_defaults],
-[subdirsmk_need_prep=true],[
-AS_CASE([" \$ac_config_targets "],[*" subdirs.mk "*],
-[subdirsmk_need_prep=true])])
-AS_IF([\$subdirsmk_need_prep],[
- echo 'running subdirmk-setup'
- '$srcdir'/build-aux/subdirmk-setup --srcdir '$srcdir' $subdirsmk_subdirs
-])])
-
-m4_define([_SUBDIRSMK_SUBDIR],
-[subdirsmk_subdirs="$subdirsmk_subdirs '$1'"
-AC_CONFIG_FILES([$1Subdir.mk:$1Subdir.mk.tmp])])dnl
+m4_include([subdirmk/subdirmk.ac])
 
-SUBDIRSMK_SUBDIRS([lib lib/t src])
+SUBDIRMK_SUBDIRS([lib])
+SUBDIRMK_SUBDIRS([lib/t src])
 
 AC_OUTPUT