+ yet more autobuild-related updates

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

14 files changed, 483 insertions, 338 deletions

diff --git a/autoreconf.sh b/autoreconf.sh
index e69220e..4fdfb2f 100755
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -2,22 +2,32 @@
 
 subdirs=(deque flite gfsm pdstring readdir sprinkler weightmap)
 
+#ar_args="--install --verbose --force --symlink"
+ar_args="--install --verbose --force"
+#ar_args="--install --verbose"
+
 if test -n "$*" ; then
   dirs=("$@")
-elif test "`basename \"$PWD\"`" = "moocow" ; then
-  for d in "${subdirs[@]}"; do
-    $0 "$d"
-  done
-elif test "`basename \"$PWD\"`" = "extended" ; then
-  for d in "${subdirs[@]}"; do
-    $0 "../$d"
-  done
 else
-  dirs=(.)
+  case "$PWD" in
+    *[/-]moocow)
+      for d in "${subdirs[@]}"; do
+        $0 "$d"
+      done
+      ;;
+    */extended)
+      for d in "${subdirs[@]}"; do
+        $0 "../$d"
+      done
+      ;;
+    *)
+      dirs=(.)
+      ;;
+  esac
 fi
 
 if test -n "$dirs"; then
   echo "$0: dirs=(${dirs[@]})"
-  exec autoreconf --install --force --verbose "${dirs[@]}"
+  exec autoreconf $ar_args "${dirs[@]}"
   #--symlink
 fi
diff --git a/deque/configure b/deque/configure
index 04cb9c6..a1eef9a 100755
--- a/deque/configure
+++ b/deque/configure
@@ -3665,55 +3665,70 @@ fi
 
 
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
 
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux;
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe"
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 CFLAGS="$UCFLAGS"
 CPPFLAGS="$UCPPFLAGS"
diff --git a/deque/configure.ac b/deque/configure.ac
index f20749a..3f80e9c 100644
--- a/deque/configure.ac
+++ b/deque/configure.ac
@@ -147,61 +147,70 @@ fi
 AC_SUBST(DEBUG)
 
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
 
-dnl
-dnl machine-dependent variables
-dnl
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux; 
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe"
+  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_linux	
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-dnl
-dnl Flags for MacOSX, borrowed from pd-0.35-test16
-dnl
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 dnl
 dnl restore user's CFLAGS
diff --git a/extended/Makefile b/extended/Makefile
index 093e1e8..0296e30 100644
--- a/extended/Makefile
+++ b/extended/Makefile
@@ -24,7 +24,7 @@ SUBDIRS = \
 MOOCOW_DIR    ?=$(shell pwd)
 MOOCOW_BUILD  ?=$(MOOCOW_DIR)/build.moo
 MOOCOW_MFLAGS ?=DESTDIR=""
-MOOCOW_BUILD_VERSION ?=2009-01-17.002
+MOOCOW_BUILD_VERSION ?=2009-01-23.000
 
 CONFIGURE_ARGS=\
 	CFLAGS="$(CFLAGS)" \
@@ -34,11 +34,17 @@ CONFIGURE_ARGS=\
 
 #	--with-pd-extdir="$(MOOCOW_BUILD)/externs"
 
+## ONFAIL
+##  + set to 'true' to ignore failed sub-targets (for robust autobuild)
+##  + set to 'false' to turn failed builds into make errors (maintainer only)
+#ONFAIL ?= true
+#ONFAIL ?= false
+ONFAIL ?= echo "(MOOCOW) Warning: sub-target failed: '$@'"
+
 ##-- defaults
 CFLAGS ?= -g -O2 -Wall -Winline -W
 pd_src ?= $(CURDIR)/../../../pd
 
-
 ##======================================================================
 ## Rules: default
 all: build.stamp
@@ -49,28 +55,28 @@ all: build.stamp
 DUMMY_DIR            ?=../dummy
 DUMMY_CONFIGURE_ARGS ?=--disable-shared
 dummy.autogen_stamp: 
-#	(cd $(DUMMY_DIR); sh ./autogen.sh) || true
+#	(cd $(DUMMY_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 dummy.configure_stamp: dummy.autogen_stamp
-	(cd $(DUMMY_DIR); sh ./configure $(CONFIGURE_ARGS) $(DUMMY_CONFIGURE_ARGS); make clean) || true
+	(cd $(DUMMY_DIR); sh ./configure $(CONFIGURE_ARGS) $(DUMMY_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 dummy.build_stamp: dummy.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(DUMMY_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(DUMMY_DIR) all install || $(ONFAIL)
 	touch $@
 
 dummy.extclean:
 	rm -f dummy.autogen_stamp dummy.configure_stamp dummy.build_stamp
 
 dummy.clean: dummy.extclean
-	$(MAKE) -C $(DUMMY_DIR) clean || true
+	$(MAKE) -C $(DUMMY_DIR) clean || $(ONFAIL)
 
 dummy.distclean: dummy.extclean
-	$(MAKE) -C $(DUMMY_DIR) distclean || true
+	$(MAKE) -C $(DUMMY_DIR) distclean || $(ONFAIL)
 
 dummy.cvsclean: dummy.extclean
-	$(MAKE) -C $(DUMMY_DIR) cvsclean || true
+	$(MAKE) -C $(DUMMY_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: flite
@@ -80,28 +86,28 @@ FLITE_DIR            ?=../flite
 #FLITE_CONFIGURE_ARGS ?=
 
 flite.autogen_stamp: 
-#	(cd $(FLITE_DIR); sh ./autogen.sh) || true
+#	(cd $(FLITE_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 flite.configure_stamp: flite.autogen_stamp
-	(cd $(FLITE_DIR); sh ./configure $(CONFIGURE_ARGS) $(FLITE_CONFIGURE_ARGS); make clean) || true
+	(cd $(FLITE_DIR); sh ./configure $(CONFIGURE_ARGS) $(FLITE_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 flite.build_stamp: flite.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(FLITE_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(FLITE_DIR) all install || $(ONFAIL)
 	touch $@
 
 flite.extclean:
 	rm -f flite.autogen_stamp flite.configure_stamp flite.build_stamp
 
 flite.clean: flite.extclean
-	$(MAKE) -C $(FLITE_DIR) clean || true
+	$(MAKE) -C $(FLITE_DIR) clean || $(ONFAIL)
 
 flite.distclean: flite.extclean
-	$(MAKE) -C $(FLITE_DIR) distclean || true
+	$(MAKE) -C $(FLITE_DIR) distclean || $(ONFAIL)
 
 flite.cvsclean: flite.extclean
-	$(MAKE) -C $(FLITE_DIR) cvsclean || true
+	$(MAKE) -C $(FLITE_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: gfsm
@@ -111,28 +117,28 @@ GFSM_DIR            ?=../gfsm
 #GFSM_CONFIGURE_ARGS ?=
 
 gfsm.autogen_stamp: 
-#	(cd $(GFSM_DIR); sh ./autogen.sh) || true
+#	(cd $(GFSM_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 gfsm.configure_stamp: gfsm.autogen_stamp
-	(cd $(GFSM_DIR); sh ./configure $(CONFIGURE_ARGS) $(GFSM_CONFIGURE_ARGS); make clean) || true
+	(cd $(GFSM_DIR); sh ./configure $(CONFIGURE_ARGS) $(GFSM_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 gfsm.build_stamp: gfsm.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(GFSM_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(GFSM_DIR) all install || $(ONFAIL)
 	touch $@
 
 gfsm.extclean:
 	rm -f gfsm.autogen_stamp gfsm.configure_stamp gfsm.build_stamp
 
 gfsm.clean: gfsm.extclean
-	$(MAKE) -C $(GFSM_DIR) clean || true
+	$(MAKE) -C $(GFSM_DIR) clean || $(ONFAIL)
 
 gfsm.distclean: gfsm.extclean
-	$(MAKE) -C $(GFSM_DIR) distclean || true
+	$(MAKE) -C $(GFSM_DIR) distclean || $(ONFAIL)
 
 gfsm.cvsclean: gfsm.extclean
-	$(MAKE) -C $(GFSM_DIR) cvsclean || true
+	$(MAKE) -C $(GFSM_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: deque
@@ -140,28 +146,28 @@ gfsm.cvsclean: gfsm.extclean
 DEQUE_DIR            ?=../deque
 DEQUE_CONFIGURE_ARGS ?=
 deque.autogen_stamp: 
-#	(cd $(DEQUE_DIR); sh ./autogen.sh) || true
+#	(cd $(DEQUE_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 deque.configure_stamp: deque.autogen_stamp
-	(cd $(DEQUE_DIR); sh ./configure $(CONFIGURE_ARGS) $(DEQUE_CONFIGURE_ARGS); make clean) || true
+	(cd $(DEQUE_DIR); sh ./configure $(CONFIGURE_ARGS) $(DEQUE_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 deque.build_stamp: deque.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(DEQUE_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(DEQUE_DIR) all install || $(ONFAIL)
 	touch $@
 
 deque.extclean:
 	rm -f deque.autogen_stamp deque.configure_stamp deque.build_stamp
 
 deque.clean: deque.extclean
-	$(MAKE) -C $(DEQUE_DIR) clean || true
+	$(MAKE) -C $(DEQUE_DIR) clean || $(ONFAIL)
 
 deque.distclean: deque.extclean
-	$(MAKE) -C $(DEQUE_DIR) distclean || true
+	$(MAKE) -C $(DEQUE_DIR) distclean || $(ONFAIL)
 
 deque.cvsclean: deque.extclean
-	$(MAKE) -C $(DEQUE_DIR) cvsclean || true
+	$(MAKE) -C $(DEQUE_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: pdstring
@@ -169,28 +175,28 @@ deque.cvsclean: deque.extclean
 PDSTRING_DIR            ?=../pdstring
 PDSTRING_CONFIGURE_ARGS ?=--enable-object-externals
 pdstring.autogen_stamp: 
-#	(cd $(PDSTRING_DIR); sh ./autogen.sh) || true
+#	(cd $(PDSTRING_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 pdstring.configure_stamp: pdstring.autogen_stamp
-	(cd $(PDSTRING_DIR); sh ./configure $(CONFIGURE_ARGS) $(PDSTRING_CONFIGURE_ARGS); make clean) || true
+	(cd $(PDSTRING_DIR); sh ./configure $(CONFIGURE_ARGS) $(PDSTRING_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 pdstring.build_stamp: pdstring.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(PDSTRING_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(PDSTRING_DIR) all install || $(ONFAIL)
 	touch $@
 
 pdstring.extclean:
 	rm -f pdstring.autogen_stamp pdstring.configure_stamp pdstring.build_stamp
 
 pdstring.clean: pdstring.extclean
-	$(MAKE) -C $(PDSTRING_DIR) clean || true
+	$(MAKE) -C $(PDSTRING_DIR) clean || $(ONFAIL)
 
 pdstring.distclean: pdstring.extclean
-	$(MAKE) -C $(PDSTRING_DIR) distclean || true
+	$(MAKE) -C $(PDSTRING_DIR) distclean || $(ONFAIL)
 
 pdstring.cvsclean: pdstring.extclean
-	$(MAKE) -C $(PDSTRING_DIR) cvsclean || true
+	$(MAKE) -C $(PDSTRING_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: readdir
@@ -198,28 +204,28 @@ pdstring.cvsclean: pdstring.extclean
 READDIR_DIR            ?=../readdir
 READDIR_CONFIGURE_ARGS ?=
 readdir.autogen_stamp: 
-#	(cd $(READDIR_DIR); sh ./autogen.sh) || true
+#	(cd $(READDIR_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 readdir.configure_stamp: readdir.autogen_stamp
-	(cd $(READDIR_DIR); sh ./configure $(CONFIGURE_ARGS) $(READDIR_CONFIGURE_ARGS); make clean) || true
+	(cd $(READDIR_DIR); sh ./configure $(CONFIGURE_ARGS) $(READDIR_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 readdir.build_stamp: readdir.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(READDIR_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(READDIR_DIR) all install || $(ONFAIL)
 	touch $@
 
 readdir.extclean:
 	rm -f readdir.autogen_stamp readdir.configure_stamp readdir.build_stamp
 
 readdir.clean: readdir.extclean
-	$(MAKE) -C $(READDIR_DIR) clean || true
+	$(MAKE) -C $(READDIR_DIR) clean || $(ONFAIL)
 
 readdir.distclean: readdir.extclean
-	$(MAKE) -C $(READDIR_DIR) distclean || true
+	$(MAKE) -C $(READDIR_DIR) distclean || $(ONFAIL)
 
 readdir.cvsclean: readdir.extclean
-	$(MAKE) -C $(READDIR_DIR) cvsclean || true
+	$(MAKE) -C $(READDIR_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: sprinkler
@@ -228,28 +234,28 @@ readdir.cvsclean: readdir.extclean
 SPRINKLER_DIR            ?=../sprinkler
 SPRINKLER_CONFIGURE_ARGS ?=
 sprinkler.autogen_stamp: 
-#	(cd $(SPRINKLER_DIR); sh ./autogen.sh) || true
+#	(cd $(SPRINKLER_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 sprinkler.configure_stamp: sprinkler.autogen_stamp
-	(cd $(SPRINKLER_DIR); sh ./configure $(CONFIGURE_ARGS) $(SPRINKLER_CONFIGURE_ARGS); make clean) || true
+	(cd $(SPRINKLER_DIR); sh ./configure $(CONFIGURE_ARGS) $(SPRINKLER_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 sprinkler.build_stamp: sprinkler.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(SPRINKLER_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(SPRINKLER_DIR) all install || $(ONFAIL)
 	touch $@
 
 sprinkler.extclean:
 	rm -f sprinkler.autogen_stamp sprinkler.configure_stamp sprinkler.build_stamp
 
 sprinkler.clean: sprinkler.extclean
-	$(MAKE) -C $(SPRINKLER_DIR) clean || true
+	$(MAKE) -C $(SPRINKLER_DIR) clean || $(ONFAIL)
 
 sprinkler.distclean: sprinkler.extclean
-	$(MAKE) -C $(SPRINKLER_DIR) distclean || true
+	$(MAKE) -C $(SPRINKLER_DIR) distclean || $(ONFAIL)
 
 sprinkler.cvsclean: sprinkler.extclean
-	$(MAKE) -C $(SPRINKLER_DIR) cvsclean || true
+	$(MAKE) -C $(SPRINKLER_DIR) cvsclean || $(ONFAIL)
 
 ##======================================================================
 ## Rules: subdirectory: weightmap
@@ -257,28 +263,28 @@ sprinkler.cvsclean: sprinkler.extclean
 WEIGHTMAP_DIR            ?=../weightmap
 WEIGHTMAP_CONFIGURE_ARGS ?=
 weightmap.autogen_stamp: 
-#	(cd $(WEIGHTMAP_DIR); sh ./autogen.sh) || true
+#	(cd $(WEIGHTMAP_DIR); sh ./autogen.sh) || $(ONFAIL)
 	touch $@
 
 weightmap.configure_stamp: weightmap.autogen_stamp
-	(cd $(WEIGHTMAP_DIR); sh ./configure $(CONFIGURE_ARGS) $(WEIGHTMAP_CONFIGURE_ARGS); make clean) || true
+	(cd $(WEIGHTMAP_DIR); sh ./configure $(CONFIGURE_ARGS) $(WEIGHTMAP_CONFIGURE_ARGS); make clean) || $(ONFAIL)
 	touch $@
 
 weightmap.build_stamp: weightmap.configure_stamp
-	$(MAKE) $(MOOCOW_MFLAGS) -C $(WEIGHTMAP_DIR) all install || true
+	$(MAKE) $(MOOCOW_MFLAGS) -C $(WEIGHTMAP_DIR) all install || $(ONFAIL)
 	touch $@
 
 weightmap.extclean:
 	rm -f weightmap.autogen_stamp weightmap.configure_stamp weightmap.build_stamp
 
 weightmap.clean: weightmap.extclean
-	$(MAKE) -C $(WEIGHTMAP_DIR) clean || true
+	$(MAKE) -C $(WEIGHTMAP_DIR) clean || $(ONFAIL)
 
 weightmap.distclean: weightmap.extclean
-	$(MAKE) -C $(WEIGHTMAP_DIR) distclean || true
+	$(MAKE) -C $(WEIGHTMAP_DIR) distclean || $(ONFAIL)
 
 weightmap.cvsclean: weightmap.extclean
-	$(MAKE) -C $(WEIGHTMAP_DIR) cvsclean || true
+	$(MAKE) -C $(WEIGHTMAP_DIR) cvsclean || $(ONFAIL)
 
 
 ##======================================================================
@@ -298,11 +304,11 @@ README.txt: README.pod
 	pod2text README.pod $@
 
 extclean: $(SUBDIRS:=.extclean)
-
-clean: $(SUBDIRS:=.clean)
-	rm  -f build.stamp config.log
+	rm -f build.stamp config.log
 	rm -rf $(MOOCOW_BUILD)
 
+clean: $(SUBDIRS:=.clean) extclean
+
 realclean: distclean
 
 distclean: $(SUBDIRS:=.distclean) clean
diff --git a/flite/configure b/flite/configure
index 67454cb..c317515 100755
--- a/flite/configure
+++ b/flite/configure
@@ -3942,57 +3942,70 @@ fi
 
 WFLAGS="-Wall"
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
 
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux;
 then
-  LFLAGS="$LFLAGS -export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
-    OFLAGS="-O3 -pipe"
+  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"
-  EXT=pd_linux
+  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"
-EXT=pd_irix6
+  PDEXT=pd_irix6
 fi
 
+##-- irix32
 if test `uname -s` = IRIX32;
 then
   LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
-  EXT=pd_irix5
+  PDEXT=pd_irix5
 fi
 
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="$LFLAGS -bundle -undefined suppress  -flat_namespace"
-  EXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 CPPFLAGS="$UCPPFLAGS"
 CFLAGS="$UCFLAGS"
diff --git a/flite/configure.ac b/flite/configure.ac
index c53c074..250283b 100644
--- a/flite/configure.ac
+++ b/flite/configure.ac
@@ -204,63 +204,70 @@ dnl compiler warnings
 dnl
 WFLAGS="-Wall"
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
 
-dnl
-dnl machine-dependent variables
-dnl
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux; 
 then
-  LFLAGS="$LFLAGS -export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
-    OFLAGS="-O3 -pipe"
+  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"
-  EXT=pd_linux
+  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"
-EXT=pd_irix6
+  PDEXT=pd_irix6
 fi
 
+##-- irix32
 if test `uname -s` = IRIX32; 
 then
   LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
-  EXT=pd_irix5
+  PDEXT=pd_irix5
 fi
 
-dnl
-dnl Flags for MacOSX, borrowed from pd-0.35-test16
-dnl
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="$LFLAGS -bundle -undefined suppress  -flat_namespace"
-  EXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 dnl
 dnl Restore user flags
diff --git a/gfsm/configure b/gfsm/configure
index 387bb3f..2396fd5 100755
--- a/gfsm/configure
+++ b/gfsm/configure
@@ -19971,57 +19971,70 @@ fi
 ## /gfsm:any
 ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
+
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux;
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
-    OFLAGS="-O3 -pipe"
+  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
-  DFLAGS="$DFLAGS -DPIC"
   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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 CFLAGS="$UCFLAGS"
 CPPFLAGS="$UCPPFLAGS"
diff --git a/gfsm/configure.ac b/gfsm/configure.ac
index 4205094..df756d9 100644
--- a/gfsm/configure.ac
+++ b/gfsm/configure.ac
@@ -213,69 +213,70 @@ fi
 ## /gfsm:any
 ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-dnl --------------------------------------------------------------------
-dnl BEGIN import from pd configure.in
-dnl --------------------------------------------------------------------
-dnl
-dnl machine-dependent variables
-dnl
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
+
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux; 
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer"
-    OFLAGS="-O3 -pipe"
+  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
-  DFLAGS="$DFLAGS -DPIC"
   OFLAGS="$OFLAGS -fPIC"
-  PDEXT=pd_linux	
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-dnl
-dnl Flags for MacOSX, borrowed from pd-0.35-test16
-dnl
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
-dnl --------------------------------------------------------------------
-dnl END import from pd configure.in
-dnl --------------------------------------------------------------------
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 dnl
 dnl restore user's CFLAGS
diff --git a/readdir/configure b/readdir/configure
index 36bb98d..469ae1d 100755
--- a/readdir/configure
+++ b/readdir/configure
@@ -3579,55 +3579,71 @@ fi
 
 
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
 
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux;
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe"
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
+
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
 
 CFLAGS="$UCFLAGS"
 CPPFLAGS="$UCPPFLAGS"
diff --git a/readdir/configure.ac b/readdir/configure.ac
index 31e0446..4a45877 100644
--- a/readdir/configure.ac
+++ b/readdir/configure.ac
@@ -144,61 +144,71 @@ fi
 AC_SUBST(DEBUG)
 
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
 
-dnl
-dnl machine-dependent variables
-dnl
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux; 
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe"
+  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_linux	
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-dnl
-dnl Flags for MacOSX, borrowed from pd-0.35-test16
-dnl
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
+
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
 
 dnl
 dnl restore user's CFLAGS
diff --git a/sprinkler/configure b/sprinkler/configure
index 46e212b..9dcef02 100755
--- a/sprinkler/configure
+++ b/sprinkler/configure
@@ -3571,58 +3571,70 @@ fi
 
 
 
-##--------------------------------------------------------------
-## machine-dependent variables
-##
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
+
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux;
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    #OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe"
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 ##-- restore user's CFLAGS
diff --git a/sprinkler/configure.ac b/sprinkler/configure.ac
index b026360..4a68a9c 100644
--- a/sprinkler/configure.ac
+++ b/sprinkler/configure.ac
@@ -177,61 +177,70 @@ fi
 AC_SUBST(DEBUG)
 
 
-##--------------------------------------------------------------
-## machine-dependent variables
-##
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
+
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux; 
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    #OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe"
-    OFLAGS="-O2 -pipe"
+  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_linux	
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-dnl
-dnl Flags for MacOSX, borrowed from pd-0.35-test16
-dnl
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 
 ##-- restore user's CFLAGS
diff --git a/weightmap/configure b/weightmap/configure
index d1db25e..3593de4 100755
--- a/weightmap/configure
+++ b/weightmap/configure
@@ -3574,56 +3574,71 @@ echo "${ECHO_T}no" >&6; }
 fi
 
 
-
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
 
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux;
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe"
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
+
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
 
 CFLAGS="$UCFLAGS"
 CPPFLAGS="$UCPPFLAGS"
diff --git a/weightmap/configure.ac b/weightmap/configure.ac
index dbbe010..b14144b 100644
--- a/weightmap/configure.ac
+++ b/weightmap/configure.ac
@@ -142,62 +142,71 @@ else
 fi
 AC_SUBST(DEBUG)
 
+##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+## BEGIN machine-dependent variables
 
-
-dnl
-dnl machine-dependent variables
-dnl
 LD=ld
+
+##-- Linux
 if test `uname -s` = Linux; 
 then
-  LFLAGS="-export_dynamic -shared"
-  if test "$DEBUG" = "no"; then
-    #OFLAGS="-O6 -funroll-loops -fomit-frame-pointer -finline-limit-10000000"
-    OFLAGS="-O3 -funroll-loops -fomit-frame-pointer -pipe"
+  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_linux	
+  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="-n32 -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
+  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="-o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
+  LFLAGS="$LFLAGS -o32 -DUNIX -DIRIX -O2 -shared -rdata_shared"
   OFLAGS="$CFLAGS"
   PDEXT=pd_irix5
 fi
 
-dnl
-dnl Flags for MacOSX, borrowed from pd-0.35-test16
-dnl
-if test `uname -s` = Darwin;
-then
-  LD=cc
-  LFLAGS="-bundle -undefined suppress  -flat_namespace"
-  PDEXT=pd_darwin
-  DFLAGS="$DFLAGS -DMACOSX"
+EXT=$PDEXT
+
+## END machine-dependent variables
+##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-  if test "$DEBUG" = "no"; then
-    OFLAGS="-O2"
-  else
-    OFLAGS="-g"
-  fi
-fi
 
 dnl
 dnl restore user's CFLAGS