aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Jurish <mukau@users.sourceforge.net>2009-04-26 22:36:09 +0000
committerBryan Jurish <mukau@users.sourceforge.net>2009-04-26 22:36:09 +0000
commit0eeb1dc9455f8976a988e218bec446fdba5574fe (patch)
treec21eeee24f3c4573a85a003eccb8df2e4fa517e4
parentf37557d096b3bdf15a962d382df5f03b34516202 (diff)
+ yet more quoted-command-line-macro hell
svn path=/trunk/externals/moocow/; revision=11161
-rw-r--r--common/m4/ax_hack_cflags.m475
-rw-r--r--common/m4/ax_pd_external.m467
-rw-r--r--deque/Makefile.in5
-rw-r--r--deque/aclocal.m41
-rw-r--r--deque/config/Makefile.in5
-rwxr-xr-xdeque/configure98
-rw-r--r--deque/configure.ac5
-rw-r--r--deque/src/Makefile.in14
-rw-r--r--extended/Makefile9
-rw-r--r--flite/Makefile.in5
-rw-r--r--flite/aclocal.m41
-rw-r--r--flite/config/Makefile.in5
-rwxr-xr-xflite/configure103
-rw-r--r--flite/configure.ac12
-rw-r--r--gfsm/Makefile.in5
-rw-r--r--gfsm/aclocal.m41
-rw-r--r--gfsm/config/Makefile.in5
-rwxr-xr-xgfsm/configure150
-rw-r--r--gfsm/configure.ac12
-rwxr-xr-xgfsm/gfsm/configure.gnu31
-rw-r--r--gfsm/src/Makefile.in5
-rw-r--r--hello/configure.ac10
-rw-r--r--locale/Makefile.in5
-rw-r--r--locale/aclocal.m41
-rw-r--r--locale/config/Makefile.in5
-rwxr-xr-xlocale/configure100
-rw-r--r--locale/configure.ac7
-rw-r--r--locale/src/Makefile.in5
-rw-r--r--readdir/Makefile.in5
-rw-r--r--readdir/aclocal.m41
-rwxr-xr-xreaddir/configure101
-rw-r--r--readdir/configure.ac10
-rw-r--r--readdir/src/Makefile.in5
-rw-r--r--sprinkler/Makefile.in6
-rw-r--r--sprinkler/aclocal.m41
-rwxr-xr-xsprinkler/configure99
-rw-r--r--sprinkler/configure.ac12
-rw-r--r--weightmap/Makefile.in5
-rw-r--r--weightmap/aclocal.m41
-rwxr-xr-xweightmap/configure103
-rw-r--r--weightmap/configure.ac10
-rw-r--r--weightmap/src/Makefile.in6
42 files changed, 849 insertions, 263 deletions
diff --git a/common/m4/ax_hack_cflags.m4 b/common/m4/ax_hack_cflags.m4
new file mode 100644
index 0000000..7e735a8
--- /dev/null
+++ b/common/m4/ax_hack_cflags.m4
@@ -0,0 +1,75 @@
+#-*- Mode: autoconf -*-
+#
+# SYNOPSIS
+#
+# AX_DISTRIBUTE_CFLAGS([$FLAGS], [cppflagsVar], [cflagsVar])
+# + distributes $FLAGS among $cppflagsVar and $cflagsVar
+#
+# AX_SAFE_CFLAGS([$FLAGS], [safeVar], [unsafeVar]).
+# + distributes $FLAGS among $safeVar and $unsafeVar
+#
+# LAST MODIFICATION
+#
+# Sun, 26 Apr 2009 23:53:21 +0200
+#
+# COPYLEFT
+#
+# Copyright (c) 2009 Bryan Jurish <moocow@ling.uni-potsdam.de>
+#
+# Copying and distribution of this file, with or without
+# modification, are permitted in any medium without royalty provided
+# the copyright notice and this notice are preserved.
+
+
+# AX_DISTRIBUTE_CFLAGS($FLAGS, CPPFLAGS, CFLAGS)
+# + distribute $FLAGS between $CPPFLAGS and $CFLAGS
+AC_DEFUN([AX_DISTRIBUTE_CFLAGS],
+[
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $1
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test x$2 != x && $2="$$2 $axdf_cppflags"
+ test x$3 != x && $3="$$3 $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+])
+
+# AX_SAFE_CFLAGS($FLAGS, SAFE, UNSAFE)
+# + distribute $FLAGS between $SAFE and $UNSAFE
+AC_DEFUN([AX_SAFE_CFLAGS],
+[
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $1
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[[ '\''\"\(\)]]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test x$2 != x && $2="$$2 $axsf_safe"
+ test x$3 != x && $3="$$3 $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+])
diff --git a/common/m4/ax_pd_external.m4 b/common/m4/ax_pd_external.m4
index 5218936..25864ee 100644
--- a/common/m4/ax_pd_external.m4
+++ b/common/m4/ax_pd_external.m4
@@ -1,15 +1,19 @@
+#-*- Mode: autoconf -*-
#
# SYNOPSIS
#
-# TODO: AX_PD_EXTERNAL()
+# AX_PD_EARLY() ##-- call this early on
+# AX_PD_EXTERNAL() ##-- call this soon-ish
+# AX_PD_LATE() ##-- call this after running your own tests
#
# DESCRIPTION
#
-# This macro provides tests, options, & flags for building a Pd
-# external.
+# The AX_PD_EXTERNAL macro provides tests, options, & flags for
+# building a Pd external.
#
-# User flags (should already be set at call time)
-# UCFLAGS, UCPPFLAGS, ULDFLAGS
+# CAVEATS:
+#
+# You should call AX_PD_EARLY() before calling AC_PROG_CC()
#
# Pd directories
# AC_ARG_WITH(pd-dir) : default: "\${prefix}/pd"
@@ -50,6 +54,12 @@
# PDEXT : platform-specific external extension (without leading ".")
# LIBS : additional libs required for building pd externals (win32 only)
#
+# Flag parsing:
+# CFLAGS : has CPPFLAGS filtered out
+# CPPFLAGS : has CFLAGS appended and unsafe flags filtered out
+# EXTRA_CPPFLAGS : gets "unsafe" user CPPFLAGS appended (quotes etc.)
+# AM_CPPFLAGS : gets \${EXTRA_CPPFLAGS} appended (make-side)
+#
# EXEEXT hacks:
# AC_SUBST(pd_buildext)
#
@@ -67,17 +77,13 @@
# modification, are permitted in any medium without royalty provided
# the copyright notice and this notice are preserved.
+##==============================================================================
AC_DEFUN([AX_PD_EXTERNAL],
[
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## prerequisites
AC_PREREQ(2.5)
- ##-- 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_PROG_CC
AC_PROG_INSTALL
@@ -371,11 +377,46 @@ AC_DEFUN([AX_PD_EXTERNAL],
AC_SUBST(PDEXT_OFLAGS)
AC_SUBST(PDEXT_WFLAGS)
- ##-- add defaults to user flags
+ ## END platform-dependent variables
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+])
+
+##==============================================================================
+AC_DEFUN([AX_PD_EARLY],
+[
+ ##-- parse user's CFLAGS,CPPFLAGS
+ dnl AC_MSG_NOTICE([parsing user *FLAGS])
+ dnl AC_MSG_NOTICE([(input) CFLAGS=$CFLAGS])
+ dnl AC_MSG_NOTICE([(input) CPPFLAGS=$CPPFLAGS])
+
+ AX_DISTRIBUTE_CFLAGS([$CFLAGS],CPPFLAGS,cflags)
+ AX_SAFE_CFLAGS([$CPPFLAGS],cppflags,EXTRA_CPPFLAGS)
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ dnl AC_MSG_NOTICE([(output) CFLAGS=$CFLAGS])
+ dnl AC_MSG_NOTICE([(output) CPPFLAGS=$CPPFLAGS])
+ dnl AC_MSG_NOTICE([(output) EXTRA_CPPFLAGS=$EXTRA_CPPFLAGS])
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+ AC_SUBST(EXTRA_CPPFLAGS)
+ AC_SUBST(AM_CPPFLAGS)
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+])
+
+##==============================================================================
+AC_DEFUN([AX_PD_LATE],
+[
+ ##-- add platform 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
- ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ AC_MSG_NOTICE([set CPPFLAGS="$CPPFLAGS"])
+ AC_MSG_NOTICE([set EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS"])
+ AC_MSG_NOTICE([set CFLAGS="$CFLAGS])
+ AC_MSG_NOTICE([set LDFLAGS="$LDFLAGS"])
])
diff --git a/deque/Makefile.in b/deque/Makefile.in
index eb50c31..39892f3 100644
--- a/deque/Makefile.in
+++ b/deque/Makefile.in
@@ -51,7 +51,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/configure COPYING
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -86,6 +87,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -103,6 +105,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/deque/aclocal.m4 b/deque/aclocal.m4
index 0cdbeac..e7dee1b 100644
--- a/deque/aclocal.m4
+++ b/deque/aclocal.m4
@@ -889,4 +889,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([common/m4/ax_hack_cflags.m4])
m4_include([common/m4/ax_pd_external.m4])
diff --git a/deque/config/Makefile.in b/deque/config/Makefile.in
index 049c594..a8a1b93 100644
--- a/deque/config/Makefile.in
+++ b/deque/config/Makefile.in
@@ -42,7 +42,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/common/pdexternal.am depcomp install-sh missing
subdir = config
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -56,6 +57,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -73,6 +75,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/deque/configure b/deque/configure
index 2c492aa..9416a5f 100755
--- a/deque/configure
+++ b/deque/configure
@@ -616,6 +616,8 @@ LIBS
build_alias
host_alias
target_alias
+EXTRA_CPPFLAGS
+AM_CPPFLAGS
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -1756,9 +1758,66 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+
+ ##-- parse user's CFLAGS,CPPFLAGS
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $CFLAGS
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test xCPPFLAGS != x && CPPFLAGS="$CPPFLAGS $axdf_cppflags"
+ test xcflags != x && cflags="$cflags $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $CPPFLAGS
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test xcppflags != x && cppflags="$cppflags $axsf_safe"
+ test xEXTRA_CPPFLAGS != x && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+
+
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+
##-- use automake, autoheader
am__api_version="1.9"
@@ -2297,11 +2356,6 @@ fi
## 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'
@@ -3810,11 +3864,6 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
- ##-- 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
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -3917,6 +3966,21 @@ fi
#LDFLAGS="$ULDFLAGS"
##-- local: output
+
+ ##-- add platform defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+
+ { echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
+echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS" >&6;}
+ { echo "$as_me:$LINENO: set LDFLAGS=\"$LDFLAGS\"" >&5
+echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
+
ac_config_files="$ac_config_files config/Makefile src/Makefile Makefile"
cat >confcache <<\_ACEOF
@@ -4613,6 +4677,8 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
+AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -4671,8 +4737,6 @@ 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
@@ -4714,11 +4778,13 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
+PDEXT_WFLAGS!$PDEXT_WFLAGS$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` = 2; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/deque/configure.ac b/deque/configure.ac
index 03b6f4e..4a45862 100644
--- a/deque/configure.ac
+++ b/deque/configure.ac
@@ -17,9 +17,7 @@ dnl AC_CONFIG_AUX_DIR(.)
AC_CONFIG_AUX_DIR(config)
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+AX_PD_EARLY()
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
@@ -76,4 +74,5 @@ fi
#LDFLAGS="$ULDFLAGS"
##-- local: output
+AX_PD_LATE()
AC_OUTPUT(config/Makefile src/Makefile Makefile)
diff --git a/deque/src/Makefile.in b/deque/src/Makefile.in
index f14a461..8b7c23b 100644
--- a/deque/src/Makefile.in
+++ b/deque/src/Makefile.in
@@ -54,7 +54,8 @@ pdexterns_PROGRAMS = deque$(EXEEXT)
EXTRA_PROGRAMS = deque$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -93,6 +94,11 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+
+#-----------------------------------------------------------------------
+# flags
+#-----------------------------------------------------------------------
+AM_CPPFLAGS = -I$(top_srcdir)/common
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -110,6 +116,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -245,11 +252,6 @@ deque_SOURCES = \
dsqueue.c dsqueue.h \
deque.c
-
-#-----------------------------------------------------------------------
-# flags
-#-----------------------------------------------------------------------
-AM_CPPFLAGS = -I$(top_srcdir)/common
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/extended/Makefile b/extended/Makefile
index ac1fc80..b014e02 100644
--- a/extended/Makefile
+++ b/extended/Makefile
@@ -25,16 +25,17 @@ SUBDIRS = \
MOOCOW_DIR ?=$(shell pwd)
MOOCOW_BUILD ?=$(MOOCOW_DIR)/build.moo
MOOCOW_MFLAGS ?=DESTDIR=""
-MOOCOW_BUILD_VERSION ?=2009-04-25.002
+MOOCOW_BUILD_VERSION ?=2009-04-27.001
##-- arguments to be passed to sh ./configure
## + we use "`echo $(CFLAGS)`" to remove ugly quotes from the CFLAGS variable,
## since autoconf doesn't parse these correctly (problem on win32 e.g. -D'O_NONBLOCK=1')
+# CFLAGS="$(CFLAGS)" ##-- ?
# CFLAGS="`echo $(CFLAGS)`" ##-- works
# CFLAGS="$(subst ',,$(CFLAGS))" ##-- works
# CFLAGS="$(shell echo $(CFLAGS))" ##-- works
CONFIGURE_ARGS=\
- CFLAGS="`echo $(CFLAGS)`" \
+ CFLAGS="$(CFLAGS)" \
LDFLAGS="$(LDFLAGS) -L$(pd_src)/bin -L$(pd_src)/obj" \
--with-pd-include="$(pd_src)/src" \
--with-pd-dir="$(MOOCOW_BUILD)" \
@@ -50,8 +51,8 @@ CONFIGURE_ARGS=\
ONFAIL ?= echo "(MOOCOW) Warning: sub-target failed: '$@'"
##-- defaults
-CFLAGS ?= -g -O2 -Wall -Winline -W
-#CFLAGS ?= -g -O2 -Wall -Winline -W -D'UglyQuotedMacro(x)=x'
+#CFLAGS ?= -g -O2 -Wall -Winline -W
+CFLAGS ?= -g -O0 -Wall -Winline -W -D'mooUglyQuotedMacro(x)=x' -DmooSafeMacro=1
pd_src ?= $(CURDIR)/../../../pd
diff --git a/flite/Makefile.in b/flite/Makefile.in
index 3ed423c..7b1d944 100644
--- a/flite/Makefile.in
+++ b/flite/Makefile.in
@@ -55,7 +55,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
pdext_PROGRAMS = flite$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -113,6 +114,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -131,6 +133,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
FLITE_LANGLIBS = @FLITE_LANGLIBS@
FLITE_LEXLIBS = @FLITE_LEXLIBS@
FLITE_LIBS = @FLITE_LIBS@
diff --git a/flite/aclocal.m4 b/flite/aclocal.m4
index 0cdbeac..e7dee1b 100644
--- a/flite/aclocal.m4
+++ b/flite/aclocal.m4
@@ -889,4 +889,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([common/m4/ax_hack_cflags.m4])
m4_include([common/m4/ax_pd_external.m4])
diff --git a/flite/config/Makefile.in b/flite/config/Makefile.in
index 3ce43b3..d7af0c6 100644
--- a/flite/config/Makefile.in
+++ b/flite/config/Makefile.in
@@ -42,7 +42,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/common/pdexternal.am depcomp install-sh missing
subdir = config
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -56,6 +57,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -74,6 +76,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
FLITE_LANGLIBS = @FLITE_LANGLIBS@
FLITE_LEXLIBS = @FLITE_LEXLIBS@
FLITE_LIBS = @FLITE_LIBS@
diff --git a/flite/configure b/flite/configure
index 31fb95c..a03b244 100755
--- a/flite/configure
+++ b/flite/configure
@@ -616,6 +616,8 @@ LIBS
build_alias
host_alias
target_alias
+EXTRA_CPPFLAGS
+AM_CPPFLAGS
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -1762,10 +1764,66 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
-ULIBS="$LIBS"
+
+ ##-- parse user's CFLAGS,CPPFLAGS
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $CFLAGS
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test xCPPFLAGS != x && CPPFLAGS="$CPPFLAGS $axdf_cppflags"
+ test xcflags != x && cflags="$cflags $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $CPPFLAGS
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test xcppflags != x && cppflags="$cppflags $axsf_safe"
+ test xEXTRA_CPPFLAGS != x && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+
+
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+
##-- use automake, autoheader
am__api_version="1.9"
@@ -2304,11 +2362,6 @@ fi
## 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'
@@ -3817,11 +3870,6 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
- ##-- 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
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -4331,11 +4379,20 @@ fi
## /local: debug
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- Restore user flags
-#CPPFLAGS="$UCPPFLAGS"
-#CFLAGS="$UCFLAGS"
-#LDFLAGS="$ULDFLAGS"
-#LIBS="$ULIBS"
+
+ ##-- add platform defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+
+ { echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
+echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS" >&6;}
+ { echo "$as_me:$LINENO: set LDFLAGS=\"$LDFLAGS\"" >&5
+echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
ac_config_files="$ac_config_files config/Makefile Makefile"
@@ -5032,6 +5089,8 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
+AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -5090,8 +5149,6 @@ 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
@@ -5133,6 +5190,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
+PDEXT_WFLAGS!$PDEXT_WFLAGS$ac_delim
FLITE_LIBS!$FLITE_LIBS$ac_delim
FLITE_LEXLIBS!$FLITE_LEXLIBS$ac_delim
FLITE_LANGLIBS!$FLITE_LANGLIBS$ac_delim
@@ -5142,7 +5201,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 9; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/flite/configure.ac b/flite/configure.ac
index 153813c..3116e62 100644
--- a/flite/configure.ac
+++ b/flite/configure.ac
@@ -17,10 +17,7 @@ AC_CONFIG_AUX_DIR(config)
dnl AC_CONFIG_AUX_DIR(.)
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
-ULIBS="$LIBS"
+AX_PD_EARLY()
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
@@ -137,10 +134,5 @@ AC_SUBST(DEBUG)
## /local: debug
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- Restore user flags
-#CPPFLAGS="$UCPPFLAGS"
-#CFLAGS="$UCFLAGS"
-#LDFLAGS="$ULDFLAGS"
-#LIBS="$ULIBS"
-
+AX_PD_LATE()
AC_OUTPUT(config/Makefile Makefile)
diff --git a/gfsm/Makefile.in b/gfsm/Makefile.in
index 39cd028..bd77ae5 100644
--- a/gfsm/Makefile.in
+++ b/gfsm/Makefile.in
@@ -53,7 +53,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/configure COPYING
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -88,6 +89,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -113,6 +115,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
F77 = @F77@
FFLAGS = @FFLAGS@
GFSM_CFLAGS = @GFSM_CFLAGS@
diff --git a/gfsm/aclocal.m4 b/gfsm/aclocal.m4
index 0273319..c26da43 100644
--- a/gfsm/aclocal.m4
+++ b/gfsm/aclocal.m4
@@ -7416,4 +7416,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([common/m4/ax_hack_cflags.m4])
m4_include([common/m4/ax_pd_external.m4])
diff --git a/gfsm/config/Makefile.in b/gfsm/config/Makefile.in
index a2f2e1d..01c1f04 100644
--- a/gfsm/config/Makefile.in
+++ b/gfsm/config/Makefile.in
@@ -45,7 +45,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
depcomp install-sh ltmain.sh missing
subdir = config
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -59,6 +60,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -84,6 +86,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
F77 = @F77@
FFLAGS = @FFLAGS@
GFSM_CFLAGS = @GFSM_CFLAGS@
diff --git a/gfsm/configure b/gfsm/configure
index 4d3f1b3..bb29320 100755
--- a/gfsm/configure
+++ b/gfsm/configure
@@ -806,6 +806,8 @@ LIBS
build_alias
host_alias
target_alias
+EXTRA_CPPFLAGS
+AM_CPPFLAGS
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -2019,9 +2021,66 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+
+ ##-- parse user's CFLAGS,CPPFLAGS
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $CFLAGS
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test xCPPFLAGS != x && CPPFLAGS="$CPPFLAGS $axdf_cppflags"
+ test xcflags != x && cflags="$cflags $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $CPPFLAGS
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test xcppflags != x && cppflags="$cppflags $axsf_safe"
+ test xEXTRA_CPPFLAGS != x && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+
+
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+
##-- use automake, autoheader
am__api_version="1.9"
@@ -4352,7 +4411,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4355 "configure"' > conftest.$ac_ext
+ echo '#line 4414 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7084,11 +7143,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7087: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7146: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7091: \$? = $ac_status" >&5
+ echo "$as_me:7150: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7352,11 +7411,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7355: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7414: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7359: \$? = $ac_status" >&5
+ echo "$as_me:7418: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7456,11 +7515,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7459: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7518: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7463: \$? = $ac_status" >&5
+ echo "$as_me:7522: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9753,7 +9812,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9756 "configure"
+#line 9815 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9853,7 +9912,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9856 "configure"
+#line 9915 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12189,11 +12248,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12192: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12251: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12196: \$? = $ac_status" >&5
+ echo "$as_me:12255: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12293,11 +12352,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12296: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12355: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12300: \$? = $ac_status" >&5
+ echo "$as_me:12359: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13854,11 +13913,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13857: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13916: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13861: \$? = $ac_status" >&5
+ echo "$as_me:13920: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13958,11 +14017,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13961: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14020: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13965: \$? = $ac_status" >&5
+ echo "$as_me:14024: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16145,11 +16204,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16148: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16207: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16152: \$? = $ac_status" >&5
+ echo "$as_me:16211: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16413,11 +16472,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16416: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16475: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16420: \$? = $ac_status" >&5
+ echo "$as_me:16479: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16517,11 +16576,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16520: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16579: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16524: \$? = $ac_status" >&5
+ echo "$as_me:16583: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19202,11 +19261,6 @@ fi
## 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'
@@ -20472,11 +20526,6 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
- ##-- 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
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -20769,9 +20818,25 @@ fi
## /gfsm:select
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## gfsm:flags
##
+
+ ##-- add platform defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+
+ { echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
+echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS" >&6;}
+ { echo "$as_me:$LINENO: set LDFLAGS=\"$LDFLAGS\"" >&5
+echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
+
{ echo "$as_me:$LINENO: checking which libgfsm to use" >&5
echo $ECHO_N "checking which libgfsm to use... $ECHO_C" >&6; }
@@ -20830,11 +20895,6 @@ fi
## /gfsm:any
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- restore user's CFLAGS (?)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#CXXFLAGS="$UCXXFLAGS"
-
ac_config_files="$ac_config_files config/Makefile src/Makefile Makefile"
cat >confcache <<\_ACEOF
@@ -21545,6 +21605,8 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
+AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -21603,8 +21665,6 @@ ac_ct_CXX!$ac_ct_CXX$ac_delim
CXXDEPMODE!$CXXDEPMODE$ac_delim
am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-CXXCPP!$CXXCPP$ac_delim
-F77!$F77$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -21646,6 +21706,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+CXXCPP!$CXXCPP$ac_delim
+F77!$F77$ac_delim
FFLAGS!$FFLAGS$ac_delim
ac_ct_F77!$ac_ct_F77$ac_delim
LIBTOOL!$LIBTOOL$ac_delim
@@ -21682,7 +21744,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 34; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 36; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/gfsm/configure.ac b/gfsm/configure.ac
index fc48396..c54c0a5 100644
--- a/gfsm/configure.ac
+++ b/gfsm/configure.ac
@@ -17,9 +17,7 @@ AC_CONFIG_AUX_DIR(config)
dnl AC_CONFIG_AUX_DIR(.)
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+AX_PD_EARLY()
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
@@ -100,9 +98,11 @@ fi
## /gfsm:select
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## gfsm:flags
##
+AX_PD_LATE()
AC_MSG_CHECKING([which libgfsm to use])
if test "$ac_cv_enable_system_gfsm" != "yes"; then
@@ -150,9 +150,5 @@ fi
## /gfsm:any
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- restore user's CFLAGS (?)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#CXXFLAGS="$UCXXFLAGS"
-
+dnl AX_PD_LATE()
AC_OUTPUT(config/Makefile src/Makefile Makefile)
diff --git a/gfsm/gfsm/configure.gnu b/gfsm/gfsm/configure.gnu
index f433366..e86d268 100755
--- a/gfsm/gfsm/configure.gnu
+++ b/gfsm/gfsm/configure.gnu
@@ -1,3 +1,30 @@
-#!/bin/sh
-exec "`dirname $0`"/configure "$@" FLEX=no BISON=no --disable-doc --disable-programs --disable-shared --prefix="$PWD/../../extended/build.moo/noinstall"
+#!/bin/bash
+
+##-- hack CFLAGS
+for arg in "$@"; do
+ case "$arg" in
+ CFLAGS=*)
+ axsf_safe=
+ for axsf_flag in `echo $arg | sed -e 's/^[^=]*=//'`
+ do
+ #echo "checking: $axsf_flag"
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+ #echo "new CFLAGS: $axsf_safe"
+ args=("${args[@]}" "CFLAGS=$axsf_safe") ##-- only retain 'safe' flags for gfsm
+ ;;
+ *)
+ #echo "default: $arg"
+ args=("${args[@]}" "$arg")
+ ;;
+ esac
+done
+
+#echo "`dirname $0`"/configure "${args[@]}" FLEX=no BISON=no --disable-doc --disable-programs --disable-shared --prefix="$PWD/../../extended/build.moo/noinstall"
+exec "`dirname $0`"/configure "${args[@]}" FLEX=no BISON=no --disable-doc --disable-programs --disable-shared --prefix="$PWD/../../extended/build.moo/noinstall"
diff --git a/gfsm/src/Makefile.in b/gfsm/src/Makefile.in
index c03ed6c..cf5a640 100644
--- a/gfsm/src/Makefile.in
+++ b/gfsm/src/Makefile.in
@@ -55,7 +55,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
pdexterns_PROGRAMS = gfsm$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -100,6 +101,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -125,6 +127,7 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
F77 = @F77@
FFLAGS = @FFLAGS@
GFSM_CFLAGS = @GFSM_CFLAGS@
diff --git a/hello/configure.ac b/hello/configure.ac
index da37a34..135c9f5 100644
--- a/hello/configure.ac
+++ b/hello/configure.ac
@@ -17,9 +17,7 @@ AC_CONFIG_AUX_DIR(.)
dnl AC_CONFIG_AUX_DIR(config)
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+AX_PD_EARLY()
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
@@ -62,10 +60,6 @@ fi
## /local: debug
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#LDFLAGS="$ULDFLAGS"
-
##-- local: output
+AX_PD_LATE()
AC_OUTPUT(Makefile)
diff --git a/locale/Makefile.in b/locale/Makefile.in
index 7302019..401ba6c 100644
--- a/locale/Makefile.in
+++ b/locale/Makefile.in
@@ -51,7 +51,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/configure COPYING
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -86,6 +87,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -103,6 +105,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/locale/aclocal.m4 b/locale/aclocal.m4
index 0cdbeac..e7dee1b 100644
--- a/locale/aclocal.m4
+++ b/locale/aclocal.m4
@@ -889,4 +889,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([common/m4/ax_hack_cflags.m4])
m4_include([common/m4/ax_pd_external.m4])
diff --git a/locale/config/Makefile.in b/locale/config/Makefile.in
index f9f72f8..5ea1d44 100644
--- a/locale/config/Makefile.in
+++ b/locale/config/Makefile.in
@@ -42,7 +42,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/common/pdexternal.am depcomp install-sh missing
subdir = config
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -56,6 +57,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -73,6 +75,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/locale/configure b/locale/configure
index 407ca9c..62e18bb 100755
--- a/locale/configure
+++ b/locale/configure
@@ -640,6 +640,8 @@ am__untar
MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE
MAINT
+EXTRA_CPPFLAGS
+AM_CPPFLAGS
CC
CFLAGS
LDFLAGS
@@ -1755,11 +1757,6 @@ 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),
@@ -2228,6 +2225,66 @@ fi
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## Pd external checks
+
+ ##-- parse user's CFLAGS,CPPFLAGS
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $CFLAGS
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test xCPPFLAGS != x && CPPFLAGS="$CPPFLAGS $axdf_cppflags"
+ test xcflags != x && cflags="$cflags $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $CPPFLAGS
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test xcppflags != x && cppflags="$cppflags $axsf_safe"
+ test xEXTRA_CPPFLAGS != x && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+
+
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
@@ -2299,11 +2356,6 @@ fi
## 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'
@@ -3812,11 +3864,6 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
- ##-- 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
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -4799,6 +4846,21 @@ fi
#CFLAGS="$UCFLAGS"
#CPPFLAGS="$UCPPFLAGS"
+
+ ##-- add platform defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+
+ { echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
+echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS" >&6;}
+ { echo "$as_me:$LINENO: set LDFLAGS=\"$LDFLAGS\"" >&5
+echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
+ ##-- pd external: late
ac_config_files="$ac_config_files config/Makefile src/Makefile Makefile"
cat >confcache <<\_ACEOF
@@ -5519,6 +5581,8 @@ 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
+EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
+AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
LDFLAGS!$LDFLAGS$ac_delim
@@ -5553,8 +5617,6 @@ 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
@@ -5596,11 +5658,13 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
+PDEXT_WFLAGS!$PDEXT_WFLAGS$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` = 2; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/locale/configure.ac b/locale/configure.ac
index a112a46..d7837dd 100644
--- a/locale/configure.ac
+++ b/locale/configure.ac
@@ -16,11 +16,6 @@ AC_CONFIG_MACRO_DIR(m4)
AC_CONFIG_AUX_DIR(config)
dnl AC_CONFIG_AUX_DIR(.)
-##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
-
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
AM_CONFIG_HEADER(src/config.h)
@@ -43,6 +38,7 @@ dnl AC_ISC_POSIX
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## Pd external checks
+AX_PD_EARLY
AX_PD_EXTERNAL
## /pd external common
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -87,4 +83,5 @@ fi
#CFLAGS="$UCFLAGS"
#CPPFLAGS="$UCPPFLAGS"
+AX_PD_LATE() ##-- pd external: late
AC_OUTPUT(config/Makefile src/Makefile Makefile)
diff --git a/locale/src/Makefile.in b/locale/src/Makefile.in
index 42eea8e..df51b75 100644
--- a/locale/src/Makefile.in
+++ b/locale/src/Makefile.in
@@ -52,7 +52,8 @@ pdexterns_PROGRAMS = locale$(EXEEXT) uselocale$(EXEEXT)
EXTRA_PROGRAMS = locale$(EXEEXT) uselocale$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -94,6 +95,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -111,6 +113,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/readdir/Makefile.in b/readdir/Makefile.in
index 0257032..edf67d3 100644
--- a/readdir/Makefile.in
+++ b/readdir/Makefile.in
@@ -51,7 +51,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/configure COPYING depcomp install-sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -86,6 +87,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -103,6 +105,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/readdir/aclocal.m4 b/readdir/aclocal.m4
index 0cdbeac..e7dee1b 100644
--- a/readdir/aclocal.m4
+++ b/readdir/aclocal.m4
@@ -889,4 +889,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([common/m4/ax_hack_cflags.m4])
m4_include([common/m4/ax_pd_external.m4])
diff --git a/readdir/configure b/readdir/configure
index 30462be..f8c266f 100755
--- a/readdir/configure
+++ b/readdir/configure
@@ -616,6 +616,8 @@ LIBS
build_alias
host_alias
target_alias
+EXTRA_CPPFLAGS
+AM_CPPFLAGS
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -1756,9 +1758,66 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+
+ ##-- parse user's CFLAGS,CPPFLAGS
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $CFLAGS
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test xCPPFLAGS != x && CPPFLAGS="$CPPFLAGS $axdf_cppflags"
+ test xcflags != x && cflags="$cflags $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $CPPFLAGS
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test xcppflags != x && cppflags="$cppflags $axsf_safe"
+ test xEXTRA_CPPFLAGS != x && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+
+
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+
##-- use automake, autoheader
am__api_version="1.9"
@@ -2299,11 +2358,6 @@ fi
## 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'
@@ -3812,11 +3866,6 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
- ##-- 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
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -3912,10 +3961,20 @@ fi
## /local: debug
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#LDFLAGS="$ULDFLAGS"
+
+ ##-- add platform defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+
+ { echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
+echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS" >&6;}
+ { echo "$as_me:$LINENO: set LDFLAGS=\"$LDFLAGS\"" >&5
+echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
ac_config_files="$ac_config_files src/Makefile Makefile"
@@ -4612,6 +4671,8 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
+AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -4670,8 +4731,6 @@ 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
@@ -4713,11 +4772,13 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
+PDEXT_WFLAGS!$PDEXT_WFLAGS$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` = 2; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/readdir/configure.ac b/readdir/configure.ac
index d8f2b5b..ab8d734 100644
--- a/readdir/configure.ac
+++ b/readdir/configure.ac
@@ -17,9 +17,7 @@ dnl AC_CONFIG_AUX_DIR(config)
AC_CONFIG_AUX_DIR(.)
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+AX_PD_EARLY()
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
@@ -72,9 +70,5 @@ fi
## /local: debug
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#LDFLAGS="$ULDFLAGS"
-
+AX_PD_LATE()
AC_OUTPUT(src/Makefile Makefile)
diff --git a/readdir/src/Makefile.in b/readdir/src/Makefile.in
index 3d27751..8776a06 100644
--- a/readdir/src/Makefile.in
+++ b/readdir/src/Makefile.in
@@ -52,7 +52,8 @@ pdexterns_PROGRAMS = readdir$(EXEEXT)
EXTRA_PROGRAMS = readdir$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -91,6 +92,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -108,6 +110,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/sprinkler/Makefile.in b/sprinkler/Makefile.in
index 21b860d..942d68f 100644
--- a/sprinkler/Makefile.in
+++ b/sprinkler/Makefile.in
@@ -57,7 +57,8 @@ pdexterns_PROGRAMS = sprinkler$(EXEEXT)
EXTRA_PROGRAMS = sprinkler$(EXEEXT)
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -108,6 +109,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = -I$(top_srcdir)/common
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -125,6 +127,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -278,7 +281,6 @@ pddoc_DATA = sprinkler-help.pd
# sources
#-----------------------------------------------------------------------
sprinkler_SOURCES = sprinkler.c common/mooPdUtils.h
-AM_CPPFLAGS = -I$(top_srcdir)/common
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/sprinkler/aclocal.m4 b/sprinkler/aclocal.m4
index 0cdbeac..e7dee1b 100644
--- a/sprinkler/aclocal.m4
+++ b/sprinkler/aclocal.m4
@@ -889,4 +889,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([common/m4/ax_hack_cflags.m4])
m4_include([common/m4/ax_pd_external.m4])
diff --git a/sprinkler/configure b/sprinkler/configure
index 447241b..664b27e 100755
--- a/sprinkler/configure
+++ b/sprinkler/configure
@@ -616,6 +616,8 @@ LIBS
build_alias
host_alias
target_alias
+EXTRA_CPPFLAGS
+AM_CPPFLAGS
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -1764,9 +1766,66 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+
+ ##-- parse user's CFLAGS,CPPFLAGS
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $CFLAGS
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test xCPPFLAGS != x && CPPFLAGS="$CPPFLAGS $axdf_cppflags"
+ test xcflags != x && cflags="$cflags $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $CPPFLAGS
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test xcppflags != x && cppflags="$cppflags $axsf_safe"
+ test xEXTRA_CPPFLAGS != x && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+
+
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+
##-- use automake, autoheader
am__api_version="1.9"
@@ -2307,11 +2366,6 @@ fi
## 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'
@@ -3820,11 +3874,6 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
- ##-- 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
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -3908,11 +3957,19 @@ fi
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#LDFLAGS="$ULDFLAGS"
+ ##-- add platform defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+ { echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
+echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS" >&6;}
+ { echo "$as_me:$LINENO: set LDFLAGS=\"$LDFLAGS\"" >&5
+echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
ac_config_files="$ac_config_files sprinkler-help.pd Makefile"
@@ -4609,6 +4666,8 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
+AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -4667,8 +4726,6 @@ 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
@@ -4710,6 +4767,8 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
+PDEXT_WFLAGS!$PDEXT_WFLAGS$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
@@ -4718,7 +4777,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/sprinkler/configure.ac b/sprinkler/configure.ac
index c26abc3..0b20e45 100644
--- a/sprinkler/configure.ac
+++ b/sprinkler/configure.ac
@@ -17,9 +17,7 @@ dnl AC_CONFIG_AUX_DIR(config)
AC_CONFIG_AUX_DIR(.)
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+AX_PD_EARLY()
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
@@ -104,11 +102,5 @@ fi
## /local: debug
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#LDFLAGS="$ULDFLAGS"
-
-
+AX_PD_LATE()
AC_OUTPUT(sprinkler-help.pd Makefile)
diff --git a/weightmap/Makefile.in b/weightmap/Makefile.in
index 0257032..edf67d3 100644
--- a/weightmap/Makefile.in
+++ b/weightmap/Makefile.in
@@ -51,7 +51,8 @@ DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(top_srcdir)/configure COPYING depcomp install-sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -86,6 +87,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -103,6 +105,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
diff --git a/weightmap/aclocal.m4 b/weightmap/aclocal.m4
index 0cdbeac..e7dee1b 100644
--- a/weightmap/aclocal.m4
+++ b/weightmap/aclocal.m4
@@ -889,4 +889,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([common/m4/ax_hack_cflags.m4])
m4_include([common/m4/ax_pd_external.m4])
diff --git a/weightmap/configure b/weightmap/configure
index 635356a..3114072 100755
--- a/weightmap/configure
+++ b/weightmap/configure
@@ -616,6 +616,8 @@ LIBS
build_alias
host_alias
target_alias
+EXTRA_CPPFLAGS
+AM_CPPFLAGS
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
@@ -1756,9 +1758,66 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+
+ ##-- parse user's CFLAGS,CPPFLAGS
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_DISTRIBUTE_CFLAGS
+ axdf_cppflags=
+ axdf_cflags=
+
+ for axdf_flag in $CFLAGS
+ do
+ case "$axdf_flag" in
+ -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+ axdf_cppflags="$axdf_cppflags $axdf_flag"
+ ;;
+ *)
+ axdf_cflags="$axdf_cflags $axdf_flag"
+ ;;
+ esac
+ done
+
+ test xCPPFLAGS != x && CPPFLAGS="$CPPFLAGS $axdf_cppflags"
+ test xcflags != x && cflags="$cflags $axdf_cflags"
+
+ ## END AX_DISTRIBUTE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+ ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+ ## BEGIN AX_SAFE_CFLAGS
+ axsf_safe=
+ axsf_unsafe=
+
+ for axsf_flag in $CPPFLAGS
+ do
+ axsf_flag_tmp=`echo $axsf_flag | sed -e 's/[ '\''\"\(\)]//g'`
+ if test "${axsf_flag_tmp}" = "${axsf_flag}"; then
+ axsf_safe="$axsf_safe $axsf_flag"
+ else
+ axsf_unsafe="$axsf_unsafe $axsf_flag"
+ fi
+ done
+
+ test xcppflags != x && cppflags="$cppflags $axsf_safe"
+ test xEXTRA_CPPFLAGS != x && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS $axsf_unsafe"
+ ## END AX_SAFE_CFLAGS
+ ##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+ CFLAGS="$cflags"
+ CPPFLAGS="$cppflags"
+
+ AM_CPPFLAGS="\${EXTRA_CPPFLAGS}"
+
+
+
+ ##-- save (hacked) user's CFLAGS,CPPFLAGS
+ UCPPFLAGS="$CPPFLAGS"
+ UCFLAGS="$CFLAGS"
+ ULDFLAGS="$LDFLAGS"
+
##-- use automake, autoheader
am__api_version="1.9"
@@ -2299,11 +2358,6 @@ fi
## 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'
@@ -3812,11 +3866,6 @@ echo "$as_me: will use pd extension \".$PDEXT\" for pd externals" >&6;}
- ##-- 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
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -3909,12 +3958,22 @@ fi
## /local: debug
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#LDFLAGS="$ULDFLAGS"
-
##-- local: output
+
+ ##-- add platform defaults to user flags
+ CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS"
+ CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS"
+ LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS"
+
+ { echo "$as_me:$LINENO: set CPPFLAGS=\"$CPPFLAGS\"" >&5
+echo "$as_me: set CPPFLAGS=\"$CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&5
+echo "$as_me: set EXTRA_CPPFLAGS=\"$EXTRA_CPPFLAGS\"" >&6;}
+ { echo "$as_me:$LINENO: set CFLAGS=\"$CFLAGS" >&5
+echo "$as_me: set CFLAGS=\"$CFLAGS" >&6;}
+ { echo "$as_me:$LINENO: set LDFLAGS=\"$LDFLAGS\"" >&5
+echo "$as_me: set LDFLAGS=\"$LDFLAGS\"" >&6;}
+
ac_config_files="$ac_config_files src/Makefile Makefile"
cat >confcache <<\_ACEOF
@@ -4610,6 +4669,8 @@ LIBS!$LIBS$ac_delim
build_alias!$build_alias$ac_delim
host_alias!$host_alias$ac_delim
target_alias!$target_alias$ac_delim
+EXTRA_CPPFLAGS!$EXTRA_CPPFLAGS$ac_delim
+AM_CPPFLAGS!$AM_CPPFLAGS$ac_delim
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -4668,8 +4729,6 @@ 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
@@ -4711,11 +4770,13 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+PDEXT_OFLAGS!$PDEXT_OFLAGS$ac_delim
+PDEXT_WFLAGS!$PDEXT_WFLAGS$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` = 2; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 4; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/weightmap/configure.ac b/weightmap/configure.ac
index 9ef521e..f341174 100644
--- a/weightmap/configure.ac
+++ b/weightmap/configure.ac
@@ -17,9 +17,7 @@ AC_CONFIG_AUX_DIR(.)
dnl AC_CONFIG_AUX_DIR(config)
##-- save user's CFLAGS,CPPFLAGS
-UCPPFLAGS="$CPPFLAGS"
-UCFLAGS="$CFLAGS"
-ULDFLAGS="$LDFLAGS"
+AX_PD_EARLY()
##-- use automake, autoheader
AM_INIT_AUTOMAKE(THE_PACKAGE_NAME, THE_PACKAGE_VERSION)
@@ -73,10 +71,6 @@ fi
## /local: debug
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL)
-#CFLAGS="$UCFLAGS"
-#CPPFLAGS="$UCPPFLAGS"
-#LDFLAGS="$ULDFLAGS"
-
##-- local: output
+AX_PD_LATE()
AC_OUTPUT(src/Makefile Makefile)
diff --git a/weightmap/src/Makefile.in b/weightmap/src/Makefile.in
index d1f52e9..ae55886 100644
--- a/weightmap/src/Makefile.in
+++ b/weightmap/src/Makefile.in
@@ -52,7 +52,8 @@ pdexterns_PROGRAMS = weightmap$(EXEEXT)
EXTRA_PROGRAMS = weightmap$(EXEEXT)
subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_pd_external.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/common/m4/ax_hack_cflags.m4 \
+ $(top_srcdir)/common/m4/ax_pd_external.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@@ -91,6 +92,7 @@ ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
+AM_CPPFLAGS = -I$(top_srcdir)/common
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -108,6 +110,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
ENABLE_DEBUG = @ENABLE_DEBUG@
EXEEXT = .@PDEXT@
+EXTRA_CPPFLAGS = @EXTRA_CPPFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -238,7 +241,6 @@ pddoc_DATA = weightmap-help.pd
# sources
#-----------------------------------------------------------------------
weightmap_SOURCES = weightmap.c $(top_srcdir)/common/mooPdUtils.h
-AM_CPPFLAGS = -I$(top_srcdir)/common
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am