+ finished centralization of build logic

svn path=/trunk/externals/moocow/; revision=10779

15 files changed, 866 insertions, 1123 deletions

diff --git a/sprinkler/GnuGPL.txt b/sprinkler/COPYING
index fa0bef4..fa0bef4 100644
--- a/sprinkler/GnuGPL.txt
+++ b/sprinkler/COPYING
diff --git a/sprinkler/Makefile.am b/sprinkler/Makefile.am
index 26a718e..73dce37 100644
--- a/sprinkler/Makefile.am
+++ b/sprinkler/Makefile.am
@@ -7,9 +7,17 @@
 #-----------------------------------------------------------------------
 
 #-----------------------------------------------------------------------
+# Includes
+#-----------------------------------------------------------------------
+include $(top_srcdir)/pdexternal.am
+
+#-----------------------------------------------------------------------
 # Options & Subdirectories
 #-----------------------------------------------------------------------
 
+##-- aclocal options (top level only)
+ACLOCAL_AMFLAGS = -I m4 
+
 ## --- automake options
 #AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
 AUTOMAKE_OPTIONS = foreign
@@ -17,115 +25,19 @@ AUTOMAKE_OPTIONS = foreign
 ## --- recursion subdirectories
 #SUBDIRS = config src
 
-## --- pseudo-deps for '.SUFFIXES'
-SUFFIXES = .pod .txt .@PDEXT@
-
-#-----------------------------------------------------------------------
-# Variables: cleanup
-#-----------------------------------------------------------------------
-## --- mostlyclean: built by 'make' & commonly rebuilt
-#MOSTLYCLEANFILES =
-
-## --- clean: built by 'make'
-#CLEANFILES =
-
-## --- distclean: built by 'configure'
-DISTCLEANFILES = \
-	config.log	\
-	config.cache	\
-	config.status
-
-## -- maintainerclean: built by maintainer / by hand
-MAINTAINERCLEANFILES = \
-	*.$(PDEXT) \
-	.*~ *~ \
-	Makefile Makefile.in \
-	aclocal.m4 \
-	configure \
-	install-sh \
-	stamp-h.in \
-	config.h.in \
-	compile \
-	config.guess \
-	config.sub \
-	depcomp \
-	install-sh \
-	ltmain.sh \
-	missing \
-	mkinstalldirs \
-	texinfo.tex \
-	ylwrap
-
-#	$(PODS:.pod=.txt)
-
-maintainer-clean-local:
-	rm -rf autom4te.cache
-
-#CVSCLEAN_SUBDIRS = $(SUBDIRS)
-
-#CVSCLEANFILES = Makefile.in Makefile
-
-
 #-----------------------------------------------------------------------
 # Additional Variables & Rules: PODS
 #-----------------------------------------------------------------------
 PODS = README.pod
 
-.pod.txt:
-	pod2text $< $@
-
 all-local: $(PODS:.pod=.txt)
 
 #-----------------------------------------------------------------------
-# Variables: distribution
-#-----------------------------------------------------------------------
-
-## --- extra distribution files
-EXTRA_DIST = \
-	$(PODS:.pod=.txt) autogen.sh configure \
-	README.cvs GnuGPL.txt \
-	Makefile.in
-
-## --- recursion subdirectories for 'make dist'
-#DIST_SUBDIRS = $(SUBDIRS)
-
-## --- dist-hook: when another 'Makefile.am' is overkill
-#DISTHOOK_DIRS = foo
-#DISTHOOK_FILES = foo/bar.txt foo/baz.txt
-#dist-hook:
-#	for d in $(DISTHOOK_DIRS); do\
-#	  mkdir -p $(distdir)/$$d ;\
-#	done
-#	for f in $(DISTHOOK_FILES); do\
-#	  cp -p $(srcdir)/$$f $(distdir)/$$f ;\
-#	done
-
-#dist-bz2: dist-bzip2 ;
-
-
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#-----------------------------------------------------------------------
-.PHONY: cvsclean cvsclean-hook
-
-cvsclean: maintainer-clean ;
-
-##======================================================================
-## sources etc
-##======================================================================
-
-#-----------------------------------------------------------------------
-# Flags and variables
-#-----------------------------------------------------------------------
-PDEXT    = @PDEXT@
-EXEEXT   = .@PDEXT@
-
-#-----------------------------------------------------------------------
 # pd externals (hacked _PROGRAMS target)
 #-----------------------------------------------------------------------
 
 ## --- externals
-pdexterns_PROGRAMS = @PD_OBJECT_EXTERNALS@
+pdexterns_PROGRAMS = sprinkler
 
 ## --- possible externals
 EXTRA_PROGRAMS = \
@@ -137,36 +49,8 @@ pdexterns_DATA =
 ## --- documentation
 pddoc_DATA = sprinkler-help.pd
 
-
 #-----------------------------------------------------------------------
 # sources
 #-----------------------------------------------------------------------
 
-sprinkler_SOURCES = \
-	sprinkler.c mooPdUtils.h
-
-#-----------------------------------------------------------------------
-# external compilation : flags
-#-----------------------------------------------------------------------
-DEFS    = @DEFS@
-AFLAGS  = @AFLAGS@
-DFLAGS  = @DFLAGS@
-IFLAGS  = @IFLAGS@
-LFLAGS  = @LFLAGS@
-OFLAGS  = @OFLAGS@
-WFLAGS  = -Wall -Winline
-
-AM_CPPFLAGS = $(IFLAGS) $(DFLAGS)
-AM_CFLAGS   = $(OFLAGS) $(WFLAGS) $(AFLAGS)
-
-sprinkler_LDFLAGS = $(LFLAGS)
-#sprinkler_LDADD   =
-
-#-----------------------------------------------------------------------
-# Variables: distribution
-#-----------------------------------------------------------------------
-
-## --- extra distribution files
-EXTRA_DIST += \
-	$(pddoc_DATA) \
-	$(pdexterns_DATA)
+sprinkler_SOURCES = sprinkler.c mooPdUtils.h
diff --git a/sprinkler/Makefile.in b/sprinkler/Makefile.in
index 5c137b7..8593979 100644
--- a/sprinkler/Makefile.in
+++ b/sprinkler/Makefile.in
@@ -22,9 +22,10 @@
 # Process this file with Automake to create Makefile.in.
 #-----------------------------------------------------------------------
 
-#-----------------------------------------------------------------------
-# Options & Subdirectories
-#-----------------------------------------------------------------------
+#ACLOCAL_AMFLAGS = -I m4 
+
+#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
+#AUTOMAKE_OPTIONS = foreign
 
 
 srcdir = @srcdir@
@@ -47,19 +48,22 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-pdexterns_PROGRAMS = @PD_OBJECT_EXTERNALS@
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(srcdir)/sprinkler-help.pd.in $(top_srcdir)/configure \
+	$(top_srcdir)/pdexternal.am COPYING depcomp install-sh missing
+pdexterns_PROGRAMS = sprinkler$(EXEEXT)
 EXTRA_PROGRAMS = sprinkler$(EXEEXT)
 subdir = .
-DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/sprinkler-help.pd.in \
-	$(top_srcdir)/configure
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pd_external.m4 \
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno configure.status.lineno
 mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = sprinkler-help.pd
 am__installdirs = "$(DESTDIR)$(pdexternsdir)" "$(DESTDIR)$(pddocdir)" \
 	"$(DESTDIR)$(pdexternsdir)"
@@ -68,8 +72,8 @@ PROGRAMS = $(pdexterns_PROGRAMS)
 am_sprinkler_OBJECTS = sprinkler.$(OBJEXT)
 sprinkler_OBJECTS = $(am_sprinkler_OBJECTS)
 sprinkler_LDADD = $(LDADD)
-DEFAULT_INCLUDES = -I. -I$(srcdir)
-depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -100,7 +104,6 @@ GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-AFLAGS = @AFLAGS@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
@@ -114,28 +117,22 @@ CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DEBUG = @DEBUG@
-
-#-----------------------------------------------------------------------
-# external compilation : flags
-#-----------------------------------------------------------------------
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DFLAGS = @DFLAGS@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
+ENABLE_DEBUG = @ENABLE_DEBUG@
 EXEEXT = .@PDEXT@
-IFLAGS = @IFLAGS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LFLAGS = @LFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -143,7 +140,6 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
 NON_MAX_FORWARD = @NON_MAX_FORWARD@
 OBJEXT = @OBJEXT@
-OFLAGS = @OFLAGS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -151,12 +147,13 @@ PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
-
-#-----------------------------------------------------------------------
-# Flags and variables
-#-----------------------------------------------------------------------
 PDEXT = @PDEXT@
-PD_OBJECT_EXTERNALS = @PD_OBJECT_EXTERNALS@
+PDEXT_AFLAGS = @PDEXT_AFLAGS@
+PDEXT_DFLAGS = @PDEXT_DFLAGS@
+PDEXT_IFLAGS = @PDEXT_IFLAGS@
+PDEXT_LFLAGS = @PDEXT_LFLAGS@
+PDEXT_OFLAGS = @PDEXT_OFLAGS@
+PDEXT_WFLAGS = @PDEXT_WFLAGS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SPRINKLER_ALIAS_1 = @SPRINKLER_ALIAS_1@
@@ -164,7 +161,8 @@ SPRINKLER_ALIAS_2 = @SPRINKLER_ALIAS_2@
 SPRINKLER_COMPAT_TEXT = @SPRINKLER_COMPAT_TEXT@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WFLAGS = -Wall -Winline
+WANT_OBJECT_EXTERNALS_FALSE = @WANT_OBJECT_EXTERNALS_FALSE@
+WANT_OBJECT_EXTERNALS_TRUE = @WANT_OBJECT_EXTERNALS_TRUE@
 ac_ct_CC = @ac_ct_CC@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
 am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@ -192,8 +190,11 @@ localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pd_buildext = @pd_buildext@
 pddir = @pddir@
 pddocdir = @pddocdir@
+pdexecdir = @pdexecdir@
+pdextdir = @pdextdir@
 pdexternsdir = @pdexternsdir@
 pdfdir = @pdfdir@
 pdincludedir = @pdincludedir@
@@ -204,34 +205,41 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-
-#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
-AUTOMAKE_OPTIONS = foreign
-
-#SUBDIRS = config src
-SUFFIXES = .pod .txt .@PDEXT@
-
-#-----------------------------------------------------------------------
-# Variables: cleanup
-#-----------------------------------------------------------------------
-#MOSTLYCLEANFILES =
-
-#CLEANFILES =
+DEXT = @PDEXT@
+SUFFIXES = .@PDEXT@ .pod .txt .html
+EXTRA_DIST = \
+	$(PODS) \
+	$(PODS:.pod=.txt) \
+	$(pddoc_DATA) \
+	$(pdext_DATA) \
+	$(pdexterns_DATA) \
+	$(pdexec_DATA) \
+	$(wildcard COPYING) \
+	$(wildcard Changes) \
+	$(wildcard ChangeLog) \
+	$(wildcard README.cvs) \
+	$(wildcard depcomp) \
+	$(wildcard install-sh) \
+	$(wildcard ltmain.sh) \
+	$(wildcard mising) \
+	$(wildcard mkinstalldirs)
+
+
+#all-local: $(PODS:.pod=.txt)
+CLEANFILES = *.$(PDEXT)
 DISTCLEANFILES = \
 	config.log	\
 	config.cache	\
 	config.status
 
-MAINTAINERCLEANFILES = \
-	*.$(PDEXT) \
-	.*~ *~ \
-	Makefile Makefile.in \
+MAINTAINERCLEANFILES = *~ \
+	$(PODS:.pod=.txt) \
+	Makefile \
+	Makefile.in \
 	aclocal.m4 \
+	compile \
 	configure \
-	install-sh \
-	stamp-h.in \
 	config.h.in \
-	compile \
 	config.guess \
 	config.sub \
 	depcomp \
@@ -239,48 +247,44 @@ MAINTAINERCLEANFILES = \
 	ltmain.sh \
 	missing \
 	mkinstalldirs \
+	stamp-h.in \
 	texinfo.tex \
 	ylwrap
 
 
-#CVSCLEAN_SUBDIRS = $(SUBDIRS)
-
-#CVSCLEANFILES = Makefile.in Makefile
-
 #-----------------------------------------------------------------------
-# Additional Variables & Rules: PODS
+# Includes
 #-----------------------------------------------------------------------
-PODS = README.pod
 
 #-----------------------------------------------------------------------
-# Variables: distribution
+# Options & Subdirectories
 #-----------------------------------------------------------------------
-#sprinkler_LDADD   =
+ACLOCAL_AMFLAGS = -I m4 
+
+#AUTOMAKE_OPTIONS = foreign dist-bzip2 dist-zip
+AUTOMAKE_OPTIONS = foreign
+
+#SUBDIRS = config src
 
 #-----------------------------------------------------------------------
-# Variables: distribution
+# Additional Variables & Rules: PODS
 #-----------------------------------------------------------------------
-EXTRA_DIST = $(PODS:.pod=.txt) autogen.sh configure README.cvs \
-	GnuGPL.txt Makefile.in $(pddoc_DATA) $(pdexterns_DATA)
+PODS = README.pod
 pdexterns_DATA = 
 pddoc_DATA = sprinkler-help.pd
 
 #-----------------------------------------------------------------------
 # sources
 #-----------------------------------------------------------------------
-sprinkler_SOURCES = \
-	sprinkler.c mooPdUtils.h
-
-AM_CPPFLAGS = $(IFLAGS) $(DFLAGS)
-AM_CFLAGS = $(OFLAGS) $(WFLAGS) $(AFLAGS)
-sprinkler_LDFLAGS = $(LFLAGS)
-all: all-am
+sprinkler_SOURCES = sprinkler.c mooPdUtils.h
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-am
 
 .SUFFIXES:
-.SUFFIXES: .pod .txt .@PDEXT@ .c .o .obj
+.SUFFIXES: .@PDEXT@ .pod .txt .html .c .o .obj
 am--refresh:
 	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/pdexternal.am $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -311,6 +315,23 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(srcdir) && $(AUTOCONF)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
+	@if test ! -f $@; then \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
+	else :; fi
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
+	cd $(top_srcdir) && $(AUTOHEADER)
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
 sprinkler-help.pd: $(top_builddir)/config.status $(srcdir)/sprinkler-help.pd.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-pdexternsPROGRAMS: $(pdexterns_PROGRAMS)
@@ -407,11 +428,11 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	mkid -fID $$unique
 tags: TAGS
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
@@ -423,11 +444,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	    $$tags $$unique; \
 	fi
 ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
@@ -448,7 +469,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/.
+	$(mkdir_p) $(distdir)/. $(distdir)/m4
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -574,7 +595,7 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS) $(DATA) all-local
+all-am: Makefile $(PROGRAMS) $(DATA) config.h all-local
 installdirs:
 	for dir in "$(DESTDIR)$(pdexternsdir)" "$(DESTDIR)$(pddocdir)" "$(DESTDIR)$(pdexternsdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
@@ -596,6 +617,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -614,7 +636,7 @@ distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-tags
+	distclean-hdr distclean-tags
 
 dvi: dvi-am
 
@@ -664,12 +686,13 @@ uninstall-am: uninstall-info-am uninstall-pddocDATA \
 	clean clean-generic clean-pdexternsPROGRAMS ctags dist \
 	dist-all dist-bzip2 dist-gzip dist-shar dist-tarZ dist-zip \
 	distcheck distclean distclean-compile distclean-generic \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-pddocDATA \
-	install-pdexternsDATA install-pdexternsPROGRAMS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	distclean-hdr distclean-tags distcleancheck distdir \
+	distuninstallcheck dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-pddocDATA install-pdexternsDATA \
+	install-pdexternsPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic maintainer-clean-local mostlyclean \
 	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-info-am \
@@ -677,36 +700,20 @@ uninstall-am: uninstall-info-am uninstall-pddocDATA \
 	uninstall-pdexternsPROGRAMS
 
 
-#	$(PODS:.pod=.txt)
-
-maintainer-clean-local:
-	rm -rf autom4te.cache
-
 .pod.txt:
 	pod2text $< $@
 
-all-local: $(PODS:.pod=.txt)
-
-#DIST_SUBDIRS = $(SUBDIRS)
-
-#DISTHOOK_DIRS = foo
-#DISTHOOK_FILES = foo/bar.txt foo/baz.txt
-#dist-hook:
-#	for d in $(DISTHOOK_DIRS); do\
-#	  mkdir -p $(distdir)/$$d ;\
-#	done
-#	for f in $(DISTHOOK_FILES); do\
-#	  cp -p $(srcdir)/$$f $(distdir)/$$f ;\
-#	done
+.pod.html:
+	pod2html $< --outfile=$@
 
-#dist-bz2: dist-bzip2 ;
+maintainer-clean-local:
+	rm -rf autom4te.cache
 
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#-----------------------------------------------------------------------
 .PHONY: cvsclean cvsclean-hook
 
 cvsclean: maintainer-clean ;
+
+all-local: $(PODS:.pod=.txt)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/sprinkler/aclocal.m4 b/sprinkler/aclocal.m4
index b6186f2..4ab8160 100644
--- a/sprinkler/aclocal.m4
+++ b/sprinkler/aclocal.m4
@@ -340,6 +340,18 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
 # Do all the work for Automake.                             -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
@@ -877,3 +889,4 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([m4/ax_pd_external.m4])
diff --git a/sprinkler/config.h.in b/sprinkler/config.h.in
new file mode 100644
index 0000000..9f3c616
--- /dev/null
+++ b/sprinkler/config.h.in
@@ -0,0 +1,40 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define this to use pd_forwardmess() for all messages */
+#undef ALL_FORWARDMESS
+
+/* Define this to enable MAX-incompatible "forward" alias */
+#undef NON_MAX_FORWARD
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Date this package was configured */
+#undef PACKAGE_BUILD_DATE
+
+/* User who configured this package */
+#undef PACKAGE_BUILD_USER
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define this to include debugging code for the 'readdir' external. */
+#undef SPRINKLER_DEBUG
+
+/* Version number of package */
+#undef VERSION
+
+/* Define this if you are building single-object externals */
+#undef WANT_OBJECT_EXTERNALS
diff --git a/sprinkler/config/Makefile.am b/sprinkler/config/Makefile.am
deleted file mode 100644
index 1661120..0000000
--- a/sprinkler/config/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-## File: config/Makefile.am
-## Package: sprinkler
-## Description:
-##   + automake file for 'config' package-subdir
-##
-## Process this file with Automake to create Makefile.in.
-##-----------------------------------------------------------------------
-
-##-----------------------------------------------------------------------
-## Variables: options
-##-----------------------------------------------------------------------
-
-##-----------------------------------------------------------------------
-## Variables: cleanup
-##-----------------------------------------------------------------------
-
-## --- mostlyclean: built by 'make' & commonly rebuilt
-#MOSTLYCLEANFILES = 
-
-## --- clean:  built by 'make'
-#CLEANFILES = 
-
-## --- distclean: built by 'configure'
-#DISTCLEANFILES = 
-
-## -- maintainerclean: built by maintainer / by hand
-MAINTAINERCLEANFILES = \
-	*~ .*~ \
-	compile Makefile Makefile.in \
-	config.guess \
-	config.sub \
-	depcomp \
-	install-sh \
-	ltmain.sh \
-	missing \
-	mkinstalldirs \
-	texinfo.tex \
-	ylwrap
-
-
-##-----------------------------------------------------------------------
-## Variables: distribution
-##-----------------------------------------------------------------------
-
-## --- extra distribution files
-EXTRA_DIST = \
-	Makefile.in \
-	depcomp \
-	install-sh \
-	$(wildcard mkinstalldirs) \
-	missing
-
-#	config.guess
-#	config.sub
-#	ltmain.sh
-#	texinfo.tex
-
-## --- recursion subdirectories for 'make dist'
-#DIST_SUBDIRS = $(SUBDIRS)
-
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#-----------------------------------------------------------------------
-.PHONY: cvsclean cvsclean-hook
-
-cvsclean: maintainer-clean ;
diff --git a/sprinkler/config/Makefile.in b/sprinkler/config/Makefile.in
deleted file mode 100644
index 6ea4373..0000000
--- a/sprinkler/config/Makefile.in
+++ /dev/null
@@ -1,338 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-#MOSTLYCLEANFILES = 
-
-#CLEANFILES = 
-
-#DISTCLEANFILES = 
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-subdir = config
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in depcomp \
-	install-sh missing
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AFLAGS = @AFLAGS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BUGREPORT = @BUGREPORT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEBUG = @DEBUG@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-DFLAGS = @DFLAGS@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EXEEXT = @EXEEXT@
-IFLAGS = @IFLAGS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LD = @LD@
-LDFLAGS = @LDFLAGS@
-LFLAGS = @LFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-NON_MAX_FORWARD = @NON_MAX_FORWARD@
-OBJEXT = @OBJEXT@
-OFLAGS = @OFLAGS@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PDEXT = @PDEXT@
-PD_OBJECT_EXTERNALS = @PD_OBJECT_EXTERNALS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-SPRINKLER_ALIAS_1 = @SPRINKLER_ALIAS_1@
-SPRINKLER_ALIAS_2 = @SPRINKLER_ALIAS_2@
-SPRINKLER_COMPAT_TEXT = @SPRINKLER_COMPAT_TEXT@
-STRIP = @STRIP@
-VERSION = @VERSION@
-WFLAGS = @WFLAGS@
-ac_ct_CC = @ac_ct_CC@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-datarootdir = @datarootdir@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pddir = @pddir@
-pddocdir = @pddocdir@
-pdexternsdir = @pdexternsdir@
-pdfdir = @pdfdir@
-pdincludedir = @pdincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-MAINTAINERCLEANFILES = \
-	*~ .*~ \
-	compile Makefile Makefile.in \
-	config.guess \
-	config.sub \
-	depcomp \
-	install-sh \
-	ltmain.sh \
-	missing \
-	mkinstalldirs \
-	texinfo.tex \
-	ylwrap
-
-EXTRA_DIST = \
-	Makefile.in \
-	depcomp \
-	install-sh \
-	$(wildcard mkinstalldirs) \
-	missing
-
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  config/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  config/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic distclean \
-	distclean-generic distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-
-#	config.guess
-#	config.sub
-#	ltmain.sh
-#	texinfo.tex
-
-#DIST_SUBDIRS = $(SUBDIRS)
-
-#-----------------------------------------------------------------------
-# Rules: cleanup
-#-----------------------------------------------------------------------
-.PHONY: cvsclean cvsclean-hook
-
-cvsclean: maintainer-clean ;
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/sprinkler/configure b/sprinkler/configure
index 47867f8..c6941f4 100755
--- a/sprinkler/configure
+++ b/sprinkler/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for sprinkler 0.06.
+# Generated by GNU Autoconf 2.61 for sprinkler 0.06-1.
 #
 # Report bugs to <moocow@ling.uni-potsdam.de>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='sprinkler'
 PACKAGE_TARNAME='sprinkler'
-PACKAGE_VERSION='0.06'
-PACKAGE_STRING='sprinkler 0.06'
+PACKAGE_VERSION='0.06-1'
+PACKAGE_STRING='sprinkler 0.06-1'
 PACKAGE_BUGREPORT='moocow@ling.uni-potsdam.de'
 
 ac_default_prefix=/usr/local
@@ -637,6 +637,9 @@ am__leading_dot
 AMTAR
 am__tar
 am__untar
+MAINTAINER_MODE_TRUE
+MAINTAINER_MODE_FALSE
+MAINT
 CC
 CFLAGS
 LDFLAGS
@@ -653,28 +656,30 @@ AMDEPBACKSLASH
 CCDEPMODE
 am__fastdepCC_TRUE
 am__fastdepCC_FALSE
-AFLAGS
-DFLAGS
-IFLAGS
-LFLAGS
-OFLAGS
-WFLAGS
-LD
-PDEXT
+LN_S
 BUGREPORT
-MAINTAINER_MODE_TRUE
-MAINTAINER_MODE_FALSE
-MAINT
-PD_OBJECT_EXTERNALS
+pd_buildext
 pddir
 pddocdir
 pdincludedir
+pdextdir
 pdexternsdir
+pdexecdir
+WANT_OBJECT_EXTERNALS_TRUE
+WANT_OBJECT_EXTERNALS_FALSE
+ENABLE_DEBUG
+LD
+PDEXT
+PDEXT_AFLAGS
+PDEXT_DFLAGS
+PDEXT_IFLAGS
+PDEXT_LFLAGS
+PDEXT_OFLAGS
+PDEXT_WFLAGS
 NON_MAX_FORWARD
 SPRINKLER_COMPAT_TEXT
 SPRINKLER_ALIAS_1
 SPRINKLER_ALIAS_2
-DEBUG
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
@@ -1188,7 +1193,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures sprinkler 0.06 to adapt to many kinds of systems.
+\`configure' configures sprinkler 0.06-1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1254,29 +1259,32 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of sprinkler 0.06:";;
+     short | recursive ) echo "Configuration of sprinkler 0.06-1:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --disable-dependency-tracking  speeds up one-time build
+  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-object-externals
+                          Whether to build single-object externals
+                          (default=no)
+  --enable-debug          build debug version (default=no)
   --enable-forward        allow backwards-compatible non-MAX "forward" alias
                           (default=no)
   --enable-all-forwardmess
                           use pd_forwardmess() for all messages (default=no)
-  --enable-debug          build debug version (default=no)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pd-dir=DIR       PD base directory (default=PREFIX/pd)
-  --with-pd-include=DIR   PD include directory (default=NONE)
-  --with-pd-extdir=DIR    Directory for PD externals (default=PDDIR/externs)
+  --with-pd-dir=DIR       Pd base directory (default=PREFIX/pd)
+  --with-pd-include=DIR   Pd include directory (default=NONE)
+  --with-pd-extdir=DIR    Directory for Pd externals (default=PDDIR/externs)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1351,7 +1359,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-sprinkler configure 0.06
+sprinkler configure 0.06-1
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1365,7 +1373,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by sprinkler $as_me 0.06, which was
+It was created by sprinkler $as_me 0.06-1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1719,8 +1727,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+##-- Additional m4 macros
+
+
+##-- source & aux
 ac_aux_dir=
-for ac_dir in config "$srcdir"/config; do
+for ac_dir in . "$srcdir"/.; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1736,8 +1748,8 @@ for ac_dir in config "$srcdir"/config; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in config \"$srcdir\"/config" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in . \"$srcdir\"/." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
@@ -1751,10 +1763,12 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-
+##-- save user's CFLAGS,CPPFLAGS
 UCPPFLAGS="$CPPFLAGS"
 UCFLAGS="$CFLAGS"
+ULDFLAGS="$LDFLAGS"
 
+##-- use automake, autoheader
 am__api_version="1.9"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2041,7 +2055,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=sprinkler
- VERSION=0.06
+ VERSION=0.06-1
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2187,9 +2201,119 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
+ac_config_headers="$ac_config_headers config.h"
 
 
-ac_ext=c
+##-- Default prefix
+
+
+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+    # Check whether --enable-maintainer-mode was given.
+if test "${enable_maintainer_mode+set}" = set; then
+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+else
+  USE_MAINTAINER_MODE=no
+fi
+
+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+
+
+if test $USE_MAINTAINER_MODE = yes; then
+  MAINTAINER_MODE_TRUE=
+  MAINTAINER_MODE_FALSE='#'
+else
+  MAINTAINER_MODE_TRUE='#'
+  MAINTAINER_MODE_FALSE=
+fi
+
+  MAINT=$MAINTAINER_MODE_TRUE
+
+
+
+##-- other flags (?)
+
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Pd external common
+DEPDIR="${am__leading_dot}deps"
+
+ac_config_commands="$ac_config_commands depfiles"
+
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+	@echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+
+
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## prerequisites
+
+
+ ##-- save user's CFLAGS,CPPFLAGS (do this before calling AX_PD_EXTERNAL!)
+ #test -z "$UCPPFLAGS" && UCPPFLAGS="$CPPFLAGS"
+ #test -z "$UCFLAGS"   &&   UCFLAGS="$CFLAGS"
+ #test -z "$ULDFLAGS"   && ULDFLAGS="$LDFLAGS"
+
+ ##-- Programs, prefix
+ ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3107,71 +3231,6 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
 
 depcc="$CC"   am_compiler_list=
 
@@ -3282,7 +3341,7 @@ else
 fi
 
 
-# Find a good install program.  We prefer a C program (faster),
+ # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
@@ -3362,70 +3421,59 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+ { echo "$as_me:$LINENO: checking whether ln -s works" >&5
+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
 else
-  USE_MAINTAINER_MODE=no
+  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+echo "${ECHO_T}no, using $LN_S" >&6; }
 fi
 
-  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
 
+ ##-- use libtool (but don't build static libraries)
+ ##  + in Makefile.am, do:
+ ##    pdexterns_LTLIBRARIES = ext1.la ...
+ ##    ext1_la_SOURCES = ...
+ ##    ext1_la_LDFLAGS = -module
+ ##  + still unclear how to get *.$(PDEXT) targets built from *.la
 
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
 
-  MAINT=$MAINTAINER_MODE_TRUE
+ ## /prerequisites
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## versioning
 
 
 
+ ## /versioning
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-##--------------------------------------------------------------
-## Pd external objects
-{ echo "$as_me:$LINENO: checking how to hack automake EXEEXT conventions" >&5
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## hack EXEEXT (alternative to using libtool)
+ { echo "$as_me:$LINENO: checking how to hack automake EXEEXT conventions" >&5
 echo $ECHO_N "checking how to hack automake EXEEXT conventions... $ECHO_C" >&6; }
-case "${am__api_version}" in
+ case "${am__api_version}" in
   1.[0-4]*)
-    { echo "$as_me:$LINENO: result: automake v${am__api_version}: on install" >&5
-echo "${ECHO_T}automake v${am__api_version}: on install" >&6; }
-    buildext=""
+    { echo "$as_me:$LINENO: result: automake v${ap__api_version}: on install" >&5
+echo "${ECHO_T}automake v${ap__api_version}: on install" >&6; }
+    pd_buildext=""
     ;;
   *)
     { echo "$as_me:$LINENO: result: automake v${am__api_version}: on build" >&5
 echo "${ECHO_T}automake v${am__api_version}: on build" >&6; }
-    buildext="\$(EXEEXT)"
+    pd_buildext="\$(EXEEXT)"
     ;;
-esac
-PD_OBJECT_EXTERNALS="sprinkler${buildext}"
-
+ esac
 
+ ## /hack EXEEXT
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-##--------------------------------------------------------------
-## Pd directories
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## pd-directory/ies
 
 # Check whether --with-pd-dir was given.
 if test "${with_pd_dir+set}" = set; then
@@ -3434,11 +3482,12 @@ else
   pddir="\${prefix}/pd"
 fi
 
-pddocdir="${pddir}/doc/5.reference"
 
 
+ pddocdir="${pddir}/doc/5.reference"
 
 
+ ##-- pdincludedir
 
 # Check whether --with-pd-include was given.
 if test "${with_pd_include+set}" = set; then
@@ -3447,24 +3496,77 @@ else
   pdincludedir=""
 fi
 
-if test -n "$pdincludedir" ; then
+ if test -n "$pdincludedir" ; then
   IFLAGS="$IFLAGS -I$pdincludedir"
-fi
+ fi
 
 
+ ##-- pdextdir
 
 # Check whether --with-pd-extdir was given.
 if test "${with_pd_extdir+set}" = set; then
-  withval=$with_pd_extdir; pdexternsdir="$withval"
+  withval=$with_pd_extdir; pdextdir="$withval"
 else
-  pdexternsdir="$pddir/externs"
+  pdextdir="$pddir/externs"
 fi
 
 
 
-CPPFLAGS="$CPPFLAGS $IFLAGS"
+ ##-- pdextdir: aliases
+ pdexternsdir="$pdextdir"
+ pdexecdir="$pdextdir"
 
-{ echo "$as_me:$LINENO: checking for m_pd.h" >&5
+
+ ## pd-directory/ies
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## single-object-externals?
+ # Check whether --enable-object-externals was given.
+if test "${enable_object_externals+set}" = set; then
+  enableval=$enable_object_externals; want_object_externals="$enableval"
+else
+  want_object_externals="no"
+fi
+
+
+ { echo "$as_me:$LINENO: checking whether to build single-object externals" >&5
+echo $ECHO_N "checking whether to build single-object externals... $ECHO_C" >&6; }
+ if test "$want_object_externals" != "no" ; then
+  ##-- single-objects
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define WANT_OBJECT_EXTERNALS 1
+_ACEOF
+
+ else
+  ##-- multi-lib only
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+ fi
+
+ ##-- add automake conditional for object externals
+
+
+if test "$want_object_externals" != "no"; then
+  WANT_OBJECT_EXTERNALS_TRUE=
+  WANT_OBJECT_EXTERNALS_FALSE='#'
+else
+  WANT_OBJECT_EXTERNALS_TRUE='#'
+  WANT_OBJECT_EXTERNALS_FALSE=
+fi
+
+ ##
+ ## single-object-externals?
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## check: m_pd.h
+ CPPFLAGS="$CPPFLAGS $IFLAGS"
+ { echo "$as_me:$LINENO: checking for m_pd.h" >&5
 echo $ECHO_N "checking for m_pd.h... $ECHO_C" >&6; }
 if test "${ac_cv_header_m_pd_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3511,19 +3613,202 @@ echo "${ECHO_T}$ac_cv_header_m_pd_h" >&6; }
 if test $ac_cv_header_m_pd_h = yes; then
   :
 else
-  { echo "$as_me:$LINENO: WARNING: -----------------------------------------------------------------" >&5
-echo "$as_me: WARNING: -----------------------------------------------------------------" >&2;}
-	{ echo "$as_me:$LINENO: WARNING: could not find PD header file 'm_pd.h' -- things might get ugly." >&5
-echo "$as_me: WARNING: could not find PD header file 'm_pd.h' -- things might get ugly." >&2;}
-	{ echo "$as_me:$LINENO: WARNING: -----------------------------------------------------------------" >&5
-echo "$as_me: WARNING: -----------------------------------------------------------------" >&2;}
+  { { echo "$as_me:$LINENO: error: could not find Pd header file 'm_pd.h' - bailing out" >&5
+echo "$as_me: error: could not find Pd header file 'm_pd.h' - bailing out" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## debugging
+ { echo "$as_me:$LINENO: checking whether to build a debug version" >&5
+echo $ECHO_N "checking whether to build a debug version... $ECHO_C" >&6; }
+ # Check whether --enable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval=$enable_debug;
 fi
 
+ if test "$enable_debug" = "yes" ; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+  ENABLE_DEBUG="yes"
+ else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+  ENABLE_DEBUG="no"
+ fi
+
+ ## debugging
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## warning flags, gcc
+ if test "$GCC" = "yes"; then
+   { echo "$as_me:$LINENO: checking whether to set default gcc warning flags" >&5
+echo $ECHO_N "checking whether to set default gcc warning flags... $ECHO_C" >&6; }
+   case "$UCFLAGS" in
+     *-W*)
+       { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+       ;;
+     *)
+       { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+       PDEXT_WFLAGS="$WFLAGS -Wall -Winline -W -Wno-unused"
+       ;;
+   esac
+ fi
+ ## warning flags, gcc
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## compiled
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUILD_DATE "`date`"
+_ACEOF
 
-##--------------------------------------------------------------
-## local config
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUILD_USER "$USER"
+_ACEOF
+
+ ## /compiled
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN platform-dependent variables
+ ##
+
+ ##-- Defaults
+ LD=ld
+
+ ##----------- `uname -m`: machine hardware name
+ { echo "$as_me:$LINENO: checking target machine" >&5
+echo $ECHO_N "checking target machine... $ECHO_C" >&6; }
+ uname_m="`uname -m`"
+
+ ##-- alpha
+ if test "$uname_m" = alpha;
+ then
+  { echo "$as_me:$LINENO: result: alpha" >&5
+echo "${ECHO_T}alpha" >&6; }
+  PDEXT_AFLAGS="-mieee -mcpu=ev56";
+ else
+  { echo "$as_me:$LINENO: result: $uname_m" >&5
+echo "${ECHO_T}$uname_m" >&6; }
+ fi
+
+ ##----------- `uname -s`: kernel name
+ { echo "$as_me:$LINENO: checking target system" >&5
+echo $ECHO_N "checking target system... $ECHO_C" >&6; }
+ uname_s="`uname -s`"
+
+ case "$uname_s" in
+   Linux)
+     { echo "$as_me:$LINENO: result: linux" >&5
+echo "${ECHO_T}linux" >&6; }
+     ;;
+   Darwin)
+     { echo "$as_me:$LINENO: result: darwin" >&5
+echo "${ECHO_T}darwin" >&6; }
+     ;;
+   IRIX64)
+     { echo "$as_me:$LINENO: result: irix64" >&5
+echo "${ECHO_T}irix64" >&6; }
+     ;;
+   IRIX32)
+     { echo "$as_me:$LINENO: result: irix32" >&5
+echo "${ECHO_T}irix32" >&6; }
+     ;;
+   *)
+     { echo "$as_me:$LINENO: result: $uname_s" >&5
+echo "${ECHO_T}$uname_s" >&6; }
+     { echo "$as_me:$LINENO: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >&5
+echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" >&2;}
+     uname_s="Linux"
+     ;;
+  esac
+
+ ##-- Linux
+ if test "$uname_s" = "Linux"
+ then
+  PDEXT_LFLAGS="-Wl,-export-dynamic -shared"
+  if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
+    ##-- only set OFLAGS if user CFLAGS are empty
+    PDEXT_OFLAGS="-O2 -pipe"
+  elif test "$ENABLE_DEBUG" = "yes"; then
+    PDEXT_OFLAGS="-g"
+  fi
+  PDEXT_OFLAGS="$PDEXT_OFLAGS -fPIC"
+  PDEXT_DFLAGS="$PDEXT_DFLAGS -DPIC"
+  PDEXT=pd_linux
+ fi
+
+ ##-- MacOSX (darwin)
+ if test "$uname_s" = "Darwin"
+ then
+  LD=cc
+  PDEXT_LFLAGS="-bundle -undefined suppress  -flat_namespace"
+  PDEXT_DFLAGS="-DMACOSX"
+  if test "$ENABLE_DEBUG" = "no" -a -z "$UCFLAGS"; then
+    ##-- only set OFLAGS if user CFLAGS are empty
+    PDEXT_OFLAGS="-O2"
+  elif test "$ENABLE_DEBUG" = "yes"; then
+    PDEXT_OFLAGS="-g"
+  fi
+  PDEXT=pd_darwin
+ fi
+
+ ##-- irix64
+ if test "$uname_s" = "IRIX64"
+ then
+  PDEXT_LFLAGS="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+	-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
+	-shared -rdata_shared"
+  PDEXT=pd_irix6
+ fi
+
+ ##-- irix32
+ if test "$uname_s" = "IRIX32"
+ then
+  PDEXT_LFLAGS="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  PDEXT=pd_irix5
+ fi
+
+ ##----------- report pd extension
+ { echo "$as_me:$LINENO: will use pd extension \".$PDEXT\" for pd externals" >&5
+echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
+
+ EXT=$PDEXT
+
+ ##----------- substitute
+
+
+
+
+
+
+
+
+
+ ##-- add defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+
+ ## END platform-dependent variables
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+## /pd external common
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Local: misc
+
+##-- build backwards-compatible non-max 'forward'?
 { echo "$as_me:$LINENO: checking whether to allow non-MAX \"forward\" alias" >&5
 echo $ECHO_N "checking whether to allow non-MAX \"forward\" alias... $ECHO_C" >&6; }
 # Check whether --enable-forward was given.
@@ -3536,7 +3821,11 @@ if test "$enable_forward" = "yes" ; then
   { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
   NON_MAX_FORWARD="yes"
-  DFLAGS="$DFLAGS -DNON_MAX_FORWARD"
+
+cat >>confdefs.h <<\_ACEOF
+#define NON_MAX_FORWARD 1
+_ACEOF
+
   SPRINKLER_COMPAT_TEXT="(with MAX-incompatible [forward] alias)"
   SPRINKLER_ALIAS_1="#X obj 102 407 forward;"
   SPRINKLER_ALIAS_2="#X obj 102 432 fw;"
@@ -3553,6 +3842,7 @@ fi
 
 
 
+##-- use pd_forwardmess() for everything?
 { echo "$as_me:$LINENO: checking whether to use pd_forwardmess() for all messages" >&5
 echo $ECHO_N "checking whether to use pd_forwardmess() for all messages... $ECHO_C" >&6; }
 # Check whether --enable-all-forwardmess was given.
@@ -3574,104 +3864,31 @@ else
 echo "${ECHO_T}no" >&6; }
 fi
 
+## /local: misc
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-##--------------------------------------------------------------
-## debug?
-{ echo "$as_me:$LINENO: checking whether we are building a debug version" >&5
-echo $ECHO_N "checking whether we are building a debug version... $ECHO_C" >&6; }
-# Check whether --enable-debug was given.
-if test "${enable_debug+set}" = set; then
-  enableval=$enable_debug;
-fi
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Local: debug
 
 if test "$enable_debug" = "yes" ; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-  DEBUG="yes"
 
 cat >>confdefs.h <<\_ACEOF
 #define SPRINKLER_DEBUG 1
 _ACEOF
 
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-  DEBUG="no"
 fi
 
+## /local: debug
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
-##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-## BEGIN machine-dependent variables
+##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
+#CFLAGS="$UCFLAGS"
+#CPPFLAGS="$UCPPFLAGS"
+#LDFLAGS="$ULDFLAGS"
 
-LD=ld
-
-##-- Linux
-if test `uname -s` = Linux;
-then
-  LFLAGS="$LFFLAGS -Wl,-export-dynamic -shared"
-  if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
-    ##-- only set OFLAGS if user CFLAGS are empty
-    OFLAGS="-O2 -pipe"
-  else
-    OFLAGS="-g"
-  fi
-  OFLAGS="$OFLAGS -fPIC"
-  DFLAGS="$DFLAGS -DPIC"
-  PDEXT=pd_linux
-fi
-
-##-- MacOSX (darwin)
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="$LFLAGS -bundle -undefined suppress  -flat_namespace"
-  DFLAGS="$DFLAGS -DMACOSX"
-  if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
-    ##-- only set OFLAGS if user CFLAGS are empty
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-  PDEXT=pd_darwin
-fi
-
-##-- alpha
-if test `uname -m` = alpha;
-then
- AFLAGS="-mieee  -mcpu=ev56";
- OFLAGS="$CFLAGS"
-fi
-
-##-- irix64
-if test `uname -s` = IRIX64;
-then
-  LFLAGS="$LFLAGS -n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
-	-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
-	-shared -rdata_shared"
-  OFLAGS="$CFLAGS"
-  PDEXT=pd_irix6
-fi
-
-##-- irix32
-if test `uname -s` = IRIX32;
-then
-  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
-  OFLAGS="$CFLAGS"
-  PDEXT=pd_irix5
-fi
-
-EXT=$PDEXT
-
-## END machine-dependent variables
-##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-
-##-- restore user's CFLAGS
-CFLAGS="$UCFLAGS"
-CPPFLAGS="$UCPPFLAGS"
-
-ac_config_files="$ac_config_files config/Makefile sprinkler-help.pd Makefile"
+ac_config_files="$ac_config_files sprinkler-help.pd Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -3751,37 +3968,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# Transform confdefs.h into DEFS.
-# Protect against shell expansion while executing Makefile rules.
-# Protect against Makefile macro expansion.
-#
-# If the first sed substitution is executed (which looks for macros that
-# take arguments), then branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-ac_script='
-t clear
-:clear
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
-t quote
-b any
-:quote
-s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
-s/\[/\\&/g
-s/\]/\\&/g
-s/\$/$$/g
-H
-:any
-${
-	g
-	s/^\n//
-	s/\n/ /g
-	p
-}
-'
-DEFS=`sed -n "$ac_script" confdefs.h`
-
+DEFS=-DHAVE_CONFIG_H
 
 ac_libobjs=
 ac_ltlibobjs=
@@ -3799,6 +3986,13 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -3813,10 +4007,10 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+if test -z "${WANT_OBJECT_EXTERNALS_TRUE}" && test -z "${WANT_OBJECT_EXTERNALS_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"WANT_OBJECT_EXTERNALS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+echo "$as_me: error: conditional \"WANT_OBJECT_EXTERNALS\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -4120,7 +4314,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by sprinkler $as_me 0.06, which was
+This file was extended by sprinkler $as_me 0.06-1, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4137,6 +4331,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 # Files that config.status was made for.
 config_files="$ac_config_files"
+config_headers="$ac_config_headers"
 config_commands="$ac_config_commands"
 
 _ACEOF
@@ -4155,10 +4350,15 @@ Usage: $0 [OPTIONS] [FILE]...
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=FILE[:TEMPLATE]
 		   instantiate the configuration file FILE
+  --header=FILE[:TEMPLATE]
+		   instantiate the configuration header FILE
 
 Configuration files:
 $config_files
 
+Configuration headers:
+$config_headers
+
 Configuration commands:
 $config_commands
 
@@ -4167,7 +4367,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-sprinkler config.status 0.06
+sprinkler config.status 0.06-1
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -4211,7 +4411,16 @@ do
     $ac_shift
     CONFIG_FILES="$CONFIG_FILES $ac_optarg"
     ac_need_defaults=false;;
-  --he | --h |  --help | --hel | -h )
+  --header | --heade | --head | --hea )
+    $ac_shift
+    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    { echo "$as_me: error: ambiguous option: $1
+Try \`$0 --help' for more information." >&2
+   { (exit 1); exit 1; }; };;
+  --help | --hel | -h )
     echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
@@ -4271,8 +4480,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
+    "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
     "sprinkler-help.pd") CONFIG_FILES="$CONFIG_FILES sprinkler-help.pd" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
@@ -4289,6 +4498,7 @@ done
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
@@ -4394,6 +4604,9 @@ am__leading_dot!$am__leading_dot$ac_delim
 AMTAR!$AMTAR$ac_delim
 am__tar!$am__tar$ac_delim
 am__untar!$am__untar$ac_delim
+MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+MAINT!$MAINT$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 LDFLAGS!$LDFLAGS$ac_delim
@@ -4410,29 +4623,26 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
 CCDEPMODE!$CCDEPMODE$ac_delim
 am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
 am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-AFLAGS!$AFLAGS$ac_delim
-DFLAGS!$DFLAGS$ac_delim
-IFLAGS!$IFLAGS$ac_delim
-LFLAGS!$LFLAGS$ac_delim
-OFLAGS!$OFLAGS$ac_delim
-WFLAGS!$WFLAGS$ac_delim
-LD!$LD$ac_delim
-PDEXT!$PDEXT$ac_delim
+LN_S!$LN_S$ac_delim
 BUGREPORT!$BUGREPORT$ac_delim
-MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-MAINT!$MAINT$ac_delim
-PD_OBJECT_EXTERNALS!$PD_OBJECT_EXTERNALS$ac_delim
+pd_buildext!$pd_buildext$ac_delim
 pddir!$pddir$ac_delim
 pddocdir!$pddocdir$ac_delim
 pdincludedir!$pdincludedir$ac_delim
+pdextdir!$pdextdir$ac_delim
 pdexternsdir!$pdexternsdir$ac_delim
-NON_MAX_FORWARD!$NON_MAX_FORWARD$ac_delim
-SPRINKLER_COMPAT_TEXT!$SPRINKLER_COMPAT_TEXT$ac_delim
-SPRINKLER_ALIAS_1!$SPRINKLER_ALIAS_1$ac_delim
-SPRINKLER_ALIAS_2!$SPRINKLER_ALIAS_2$ac_delim
-DEBUG!$DEBUG$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
+pdexecdir!$pdexecdir$ac_delim
+WANT_OBJECT_EXTERNALS_TRUE!$WANT_OBJECT_EXTERNALS_TRUE$ac_delim
+WANT_OBJECT_EXTERNALS_FALSE!$WANT_OBJECT_EXTERNALS_FALSE$ac_delim
+ENABLE_DEBUG!$ENABLE_DEBUG$ac_delim
+LD!$LD$ac_delim
+PDEXT!$PDEXT$ac_delim
+PDEXT_AFLAGS!$PDEXT_AFLAGS$ac_delim
+PDEXT_DFLAGS!$PDEXT_DFLAGS$ac_delim
+PDEXT_IFLAGS!$PDEXT_IFLAGS$ac_delim
+PDEXT_LFLAGS!$PDEXT_LFLAGS$ac_delim
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
+PDEXT_WFLAGS!$PDEXT_WFLAGS$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -4474,10 +4684,15 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+NON_MAX_FORWARD!$NON_MAX_FORWARD$ac_delim
+SPRINKLER_COMPAT_TEXT!$SPRINKLER_COMPAT_TEXT$ac_delim
+SPRINKLER_ALIAS_1!$SPRINKLER_ALIAS_1$ac_delim
+SPRINKLER_ALIAS_2!$SPRINKLER_ALIAS_2$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 1; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -4534,7 +4749,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF
 fi # test -n "$CONFIG_FILES"
 
 
-for ac_tag in  :F $CONFIG_FILES      :C $CONFIG_COMMANDS
+for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
 do
   case $ac_tag in
   :[FHLC]) ac_mode=$ac_tag; continue;;
@@ -4774,7 +4989,137 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
   esac
  ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+_ACEOF
+
+# Transform confdefs.h into a sed script `conftest.defines', that
+# substitutes the proper values into config.h.in to produce config.h.
+rm -f conftest.defines conftest.tail
+# First, append a space to every undef/define line, to ease matching.
+echo 's/$/ /' >conftest.defines
+# Then, protect against being on the right side of a sed subst, or in
+# an unquoted here document, in config.status.  If some macros were
+# called several times there might be several #defines for the same
+# symbol, which is useless.  But do not sort them, since the last
+# AC_DEFINE must be honored.
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
+# NAME is the cpp macro being defined, VALUE is the value it is being given.
+# PARAMS is the parameter list in the macro definition--in most cases, it's
+# just an empty string.
+ac_dA='s,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
+ac_dB='\\)[	 (].*,\\1define\\2'
+ac_dC=' '
+ac_dD=' ,'
+
+uniq confdefs.h |
+  sed -n '
+	t rset
+	:rset
+	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
+	t ok
+	d
+	:ok
+	s/[\\&,]/\\&/g
+	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
+	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
+  ' >>conftest.defines
+
+# Remove the space that was appended to ease matching.
+# Then replace #undef with comments.  This is necessary, for
+# example, in the case of _POSIX_SOURCE, which is predefined and required
+# on some systems where configure will not decide to define it.
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[	 #]*u.*,/* & */,' >>conftest.defines
+
+# Break up conftest.defines:
+ac_max_sed_lines=50
+
+# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
+# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
+# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
+# et cetera.
+ac_in='$ac_file_inputs'
+ac_out='"$tmp/out1"'
+ac_nxt='"$tmp/out2"'
+
+while :
+do
+  # Write a here document:
+    cat >>$CONFIG_STATUS <<_ACEOF
+    # First, check the format of the line:
+    cat >"\$tmp/defines.sed" <<\\CEOF
+/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
+/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
+b
+:def
+_ACEOF
+  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
+  echo 'CEOF
+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
+  grep . conftest.tail >/dev/null || break
+  rm -f conftest.defines
+  mv conftest.tail conftest.defines
+done
+rm -f conftest.defines conftest.tail
 
+echo "ac_result=$ac_in" >>$CONFIG_STATUS
+cat >>$CONFIG_STATUS <<\_ACEOF
+  if test x"$ac_file" != x-; then
+    echo "/* $configure_input  */" >"$tmp/config.h"
+    cat "$ac_result" >>"$tmp/config.h"
+    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
+      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
+echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f $ac_file
+      mv "$tmp/config.h" $ac_file
+    fi
+  else
+    echo "/* $configure_input  */"
+    cat "$ac_result"
+  fi
+  rm -f "$tmp/out12"
+# Compute $ac_file's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $ac_file | $ac_file:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
+echo "timestamp for $ac_file" >`$as_dirname -- $ac_file ||
+$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X$ac_file : 'X\(//\)[^/]' \| \
+	 X$ac_file : 'X\(//\)$' \| \
+	 X$ac_file : 'X\(/\)' \| . 2>/dev/null ||
+echo X$ac_file |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ ;;
 
   :C)  { echo "$as_me:$LINENO: executing $ac_file commands" >&5
 echo "$as_me: executing $ac_file commands" >&6;}
diff --git a/sprinkler/configure.ac b/sprinkler/configure.ac
index 4393de9..ef41fa7 100644
--- a/sprinkler/configure.ac
+++ b/sprinkler/configure.ac
@@ -4,61 +4,33 @@ AC_PREREQ(2.5)
 
 dnl Some handy macros
 define([THE_PACKAGE_NAME],    [sprinkler])
-define([THE_PACKAGE_VERSION], [0.06])
+define([THE_PACKAGE_VERSION], [0.06-1])
 define([THE_PACKAGE_AUTHOR],  [moocow@ling.uni-potsdam.de])
 
 AC_INIT(THE_PACKAGE_NAME, THE_PACKAGE_VERSION, THE_PACKAGE_AUTHOR)
 
-dnl
-dnl source & aux
-dnl
-AC_CONFIG_AUX_DIR(config)
+##-- Additional m4 macros
+AC_CONFIG_MACRO_DIR(m4)
 
+##-- source & aux
+dnl AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_AUX_DIR(.)
 
-dnl
-dnl save user's CFLAGS,CPPFLAGS
-dnl
+##-- save user's CFLAGS,CPPFLAGS
 UCPPFLAGS="$CPPFLAGS"
 UCFLAGS="$CFLAGS"
+ULDFLAGS="$LDFLAGS"
 
-dnl
-dnl use automake
-dnl
+##-- use automake, autoheader
 AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
+AM_CONFIG_HEADER(config.h)
 
-dnl
-dnl use autoheader
-dnl
-dnl AM_CONFIG_HEADER(config.h)
-
-dnl
-dnl Programs, prefix
-dnl
-AC_PROG_CC
-AC_PROG_INSTALL
+##-- Default prefix
 AC_PREFIX_DEFAULT(/usr/local)
 
-dnl
-dnl Substitutions
-dnl 
-AC_SUBST(AFLAGS)
-AC_SUBST(DFLAGS)
-AC_SUBST(IFLAGS)
-AC_SUBST(LFLAGS)
-AC_SUBST(OFLAGS)
-AC_SUBST(WFLAGS)
-AC_SUBST(LD)
-
-AC_SUBST(PDEXT)
-
-dnl version stuff (automatically exported?)
-AC_SUBST(PACKAGE_VERSION)
-AC_SUBST(PACKAGE_NAME)
-AC_SUBST(BUGREPORT)
-
 dnl ----- maintainer mode
 dnl  + enables "maintainer mode" only with ./configure --enable-maintainer-mode
-dnl    - causes make __never__ to invoke 'config/missing', e.g. any autotools
+dnl    - causes make __never__ to invoke 'config/missing' (i.e. any autotools)
 dnl    - basically a hack to avoid version mismatches in autoconf, automake, etc.
 dnl      for autobuilds from SVN
 dnl  + maintainer should call ./configure --enable-maintainer-mode, and must keep
@@ -66,68 +38,19 @@ dnl    SVN sources consistent
 AM_MAINTAINER_MODE
 dnl -----/maintainer mode
 
-dnl other flags
+##-- other flags (?)
 dnl AC_ISC_POSIX
 
-##--------------------------------------------------------------
-## Pd external objects
-AC_MSG_CHECKING([how to hack automake EXEEXT conventions])
-case "${am__api_version}" in
-  1.[[0-4]]*)
-    AC_MSG_RESULT([automake v${am__api_version}: on install])
-    buildext=""
-    ;;
-  *)
-    AC_MSG_RESULT([automake v${am__api_version}: on build])
-    buildext="\$(EXEEXT)"
-    ;;
-esac
-PD_OBJECT_EXTERNALS="sprinkler${buildext}"
-AC_SUBST(PD_OBJECT_EXTERNALS)
-
-
-##--------------------------------------------------------------
-## Pd directories
-AC_ARG_WITH(pd-dir,
-	AC_HELP_STRING([--with-pd-dir=DIR], [PD base directory (default=PREFIX/pd)]),
-	[pddir="$withval"],
-	[pddir="\${prefix}/pd"])
-pddocdir="${pddir}/doc/5.reference"
-AC_SUBST(pddir)
-AC_SUBST(pddocdir)
-
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Pd external common
+AX_PD_EXTERNAL
+## /pd external common
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-AC_ARG_WITH(pd-include,
-	AC_HELP_STRING([--with-pd-include=DIR], [PD include directory (default=NONE)]),
-	[pdincludedir="$withval"],
-	[pdincludedir=""])
-if test -n "$pdincludedir" ; then
-  IFLAGS="$IFLAGS -I$pdincludedir"
-fi
-AC_SUBST(pdincludedir)
-
-AC_ARG_WITH(pd-extdir,
-	AC_HELP_STRING([--with-pd-extdir=DIR], [Directory for PD externals (default=PDDIR/externs)]),
-	[pdexternsdir="$withval"],
-	[pdexternsdir="$pddir/externs"])
-AC_SUBST(pdexternsdir)
-
-dnl
-dnl Check for m_pd.h
-dnl
-CPPFLAGS="$CPPFLAGS $IFLAGS"
-AC_CHECK_HEADER(m_pd.h,[],
-	AC_MSG_WARN([-----------------------------------------------------------------])
-	AC_MSG_WARN([could not find PD header file 'm_pd.h' -- things might get ugly.])
-	AC_MSG_WARN([-----------------------------------------------------------------]),
-	[/* nonempty includes: compile only */])
-
-##--------------------------------------------------------------
-## local config
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Local: misc
 
-dnl
-dnl build backwards-compatible non-max 'forward'?
-dnl
+##-- build backwards-compatible non-max 'forward'?
 AC_MSG_CHECKING([whether to allow non-MAX "forward" alias])
 AC_ARG_ENABLE([forward],
 	AC_HELP_STRING(
@@ -137,7 +60,7 @@ AC_ARG_ENABLE([forward],
 if test "$enable_forward" = "yes" ; then
   AC_MSG_RESULT(yes)
   NON_MAX_FORWARD="yes"
-  DFLAGS="$DFLAGS -DNON_MAX_FORWARD"
+  AC_DEFINE(NON_MAX_FORWARD,1,[Define this to enable MAX-incompatible "forward" alias])
   SPRINKLER_COMPAT_TEXT=["(with MAX-incompatible [forward] alias)"]
   SPRINKLER_ALIAS_1="#X obj 102 407 forward;"
   SPRINKLER_ALIAS_2="#X obj 102 432 fw;"
@@ -153,9 +76,7 @@ AC_SUBST(SPRINKLER_COMPAT_TEXT)
 AC_SUBST(SPRINKLER_ALIAS_1)
 AC_SUBST(SPRINKLER_ALIAS_2)
 
-dnl
-dnl use pd_forwardmess() for everything?
-dnl
+##-- use pd_forwardmess() for everything?
 AC_MSG_CHECKING([whether to use pd_forwardmess() for all messages])
 AC_ARG_ENABLE([all-forwardmess],
 	AC_HELP_STRING(
@@ -169,92 +90,25 @@ else
   AC_MSG_RESULT(no)
 fi
 
+## /local: misc
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## Local: debug
 
-##--------------------------------------------------------------
-## debug?
-AC_MSG_CHECKING([whether we are building a debug version])
-AC_ARG_ENABLE([debug],
-	AC_HELP_STRING([--enable-debug],[build debug version (default=no)]))
 if test "$enable_debug" = "yes" ; then
-  AC_MSG_RESULT(yes)
-  DEBUG="yes"
   AC_DEFINE(SPRINKLER_DEBUG,1,
 	[Define this to include debugging code for the 'readdir' external.])
-else
-  AC_MSG_RESULT(no)
-  DEBUG="no"
-fi
-AC_SUBST(DEBUG)
-
-
-##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-## BEGIN machine-dependent variables
-
-LD=ld
-
-##-- Linux
-if test `uname -s` = Linux; 
-then
-  LFLAGS="$LFFLAGS -Wl,-export-dynamic -shared"
-  if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
-    ##-- only set OFLAGS if user CFLAGS are empty
-    OFLAGS="-O2 -pipe" 
-  else
-    OFLAGS="-g"
-  fi
-  OFLAGS="$OFLAGS -fPIC"
-  DFLAGS="$DFLAGS -DPIC"
-  PDEXT=pd_linux
-fi
-
-##-- MacOSX (darwin)
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="$LFLAGS -bundle -undefined suppress  -flat_namespace"
-  DFLAGS="$DFLAGS -DMACOSX"
-  if test "$DEBUG" = "no" -a -z "$UCFLAGS"; then
-    ##-- only set OFLAGS if user CFLAGS are empty
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-  PDEXT=pd_darwin
-fi
-
-##-- alpha
-if test `uname -m` = alpha; 
-then 
- AFLAGS="-mieee  -mcpu=ev56"; 
- OFLAGS="$CFLAGS"
-fi
-
-##-- irix64
-if test `uname -s` = IRIX64; 
-then
-  LFLAGS="$LFLAGS -n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
-	-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
-	-shared -rdata_shared"
-  OFLAGS="$CFLAGS"
-  PDEXT=pd_irix6
-fi
-
-##-- irix32
-if test `uname -s` = IRIX32; 
-then
-  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
-  OFLAGS="$CFLAGS"
-  PDEXT=pd_irix5
 fi
 
-EXT=$PDEXT
+## /local: debug
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-## END machine-dependent variables
-##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
+#CFLAGS="$UCFLAGS"
+#CPPFLAGS="$UCPPFLAGS"
+#LDFLAGS="$ULDFLAGS"
 
-##-- restore user's CFLAGS
-CFLAGS="$UCFLAGS"
-CPPFLAGS="$UCPPFLAGS"
 
-AC_OUTPUT(config/Makefile sprinkler-help.pd Makefile)
+AC_OUTPUT(sprinkler-help.pd Makefile)
diff --git a/sprinkler/config/depcomp b/sprinkler/depcomp
index 04701da..04701da 100755
--- a/sprinkler/config/depcomp
+++ b/sprinkler/depcomp
diff --git a/sprinkler/config/install-sh b/sprinkler/install-sh
index 4d4a951..4d4a951 100755
--- a/sprinkler/config/install-sh
+++ b/sprinkler/install-sh
diff --git a/sprinkler/m4 b/sprinkler/m4
new file mode 120000
index 0000000..83ffc0c
--- /dev/null
+++ b/sprinkler/m4
@@ -0,0 +1 @@
+../common/m4
\ No newline at end of file
diff --git a/sprinkler/config/missing b/sprinkler/missing
index 894e786..894e786 100755
--- a/sprinkler/config/missing
+++ b/sprinkler/missing
diff --git a/sprinkler/pdexternal.am b/sprinkler/pdexternal.am
new file mode 120000
index 0000000..914f4be
--- /dev/null
+++ b/sprinkler/pdexternal.am
@@ -0,0 +1 @@
+../common/pdexternal.am
\ No newline at end of file
diff --git a/sprinkler/sprinkler.c b/sprinkler/sprinkler.c
index 619f41e..35ad166 100644
--- a/sprinkler/sprinkler.c
+++ b/sprinkler/sprinkler.c
@@ -34,14 +34,13 @@
  *=============================================================================*/
 
 #include <m_pd.h>
-#include "mooPdUtils.h"
 
-/* black magic */
-#ifdef NT
-#pragma warning( disable : 4244 )
-#pragma warning( disable : 4305 )
+#ifdef HAVE_CONFIG_H
+# include "config.h"
 #endif
 
+#include "mooPdUtils.h"
+
 /*--------------------------------------------------------------------
  * DEBUG
  *--------------------------------------------------------------------*/
@@ -62,7 +61,9 @@ static char sprinkler_errbuf[EBUFSIZE];
  *=====================================================================*/
 
 static char *sprinkler_banner =
-"\nsprinkler version %s by Bryan Jurish : dynamic message dissemination";
+"\n"
+"sprinkler: dynamic message dissemination v" PACKAGE_VERSION " by Bryan Jurish\n"
+"sprinkler: compiled by " PACKAGE_BUILD_USER " on " PACKAGE_BUILD_DATE;
 
 static t_class *sprinkler_class;
 
@@ -173,7 +174,8 @@ void sprinkler_free(t_sprinkler *x) {
  *--------------------------------------------------------------------*/
 void sprinkler_setup(void)
 {
-  post(sprinkler_banner, PACKAGE_VERSION);
+  post(sprinkler_banner);
+
   sprinkler_class = class_new(gensym("sprinkler"),
 			      (t_newmethod)sprinkler_new,
 			      (t_method)sprinkler_free,
@@ -182,18 +184,18 @@ void sprinkler_setup(void)
 
 #ifdef NON_MAX_FORWARD
   //-- add aliases [forward] and [fw]
-  post("sprinkler : non-MAX [forward] alias enabled");
+  post("sprinkler: non-MAX [forward] alias enabled");
   class_addcreator((t_newmethod)sprinkler_new, gensym("forward"), A_DEFSYM, 0);
   class_addcreator((t_newmethod)sprinkler_new, gensym("fw"), A_DEFSYM, 0);
 #endif
 
 #ifdef ALL_FORWARDMESS
   //-- report new semantics
-  post("sprinkler : will use pd_forwardmess() for all messages");
+  post("sprinkler: will use pd_forwardmess() for all messages");
 #endif
 
 #ifdef SPRINKLER_DEBUG
-  post("sprinkler : debugging enabled");
+  post("sprinkler: debugging enabled");
 #endif
   
   //-- methods