From 67b63ce6c08bffaea091063e8f106a81eb456bc6 Mon Sep 17 00:00:00 2001 From: Bryan Jurish Date: Mon, 27 Apr 2009 19:37:48 +0000 Subject: + yet more *FLAGS madness svn path=/trunk/externals/moocow/; revision=11174 --- common/m4/ax_pd_external.m4 | 51 +++++++++++----- common/pdexternal.am | 4 ++ deque/Makefile.in | 2 +- deque/config/Makefile.in | 2 +- deque/configure | 100 ++++++++++++++++++++++++++---- deque/src/Makefile.am | 2 +- deque/src/Makefile.in | 10 +-- extended/Makefile | 4 +- flite/Makefile.in | 2 +- flite/config/Makefile.in | 2 +- flite/configure | 100 ++++++++++++++++++++++++++---- gfsm/Makefile.in | 2 +- gfsm/config/Makefile.in | 2 +- gfsm/configure | 146 +++++++++++++++++++++++++++++++++----------- gfsm/src/Makefile.in | 2 +- locale/Makefile.in | 2 +- locale/config/Makefile.in | 2 +- locale/configure | 100 ++++++++++++++++++++++++++---- locale/src/Makefile.in | 2 +- readdir/Makefile.in | 2 +- readdir/configure | 100 ++++++++++++++++++++++++++---- readdir/src/Makefile.in | 2 +- sprinkler/Makefile.am | 2 +- sprinkler/Makefile.in | 2 +- sprinkler/configure | 100 ++++++++++++++++++++++++++---- weightmap/Makefile.in | 2 +- weightmap/configure | 100 ++++++++++++++++++++++++++---- weightmap/src/Makefile.am | 2 +- weightmap/src/Makefile.in | 2 +- 29 files changed, 705 insertions(+), 146 deletions(-) diff --git a/common/m4/ax_pd_external.m4 b/common/m4/ax_pd_external.m4 index 25864ee..7b13262 100644 --- a/common/m4/ax_pd_external.m4 +++ b/common/m4/ax_pd_external.m4 @@ -347,8 +347,8 @@ AC_DEFUN([AX_PD_EXTERNAL], if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1 then PDEXT_DFLAGS="\ - -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \ - -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \ + -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ + -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \ " PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" @@ -385,21 +385,30 @@ AC_DEFUN([AX_PD_EXTERNAL], 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]) + AC_MSG_NOTICE([pre-processing user CFLAGS...]) + AC_MSG_NOTICE([got CFLAGS="$CFLAGS"]) + AC_MSG_NOTICE([got CPPFLAGS="$CPPFLAGS"]) + cflags= + 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}" + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + #LDFLAGS=`echo $LDFLAGS` + + AC_MSG_NOTICE([setting distributed CFLAGS...]) + AC_MSG_NOTICE([set CPPFLAGS="$CPPFLAGS"]) + AC_MSG_NOTICE([set EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS"]) + AC_MSG_NOTICE([set CFLAGS="$CFLAGS"]) + #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" AC_SUBST(EXTRA_CPPFLAGS) - AC_SUBST(AM_CPPFLAGS) + dnl AC_SUBST(AM_CPPFLAGS) ##-- save (hacked) user's CFLAGS,CPPFLAGS UCPPFLAGS="$CPPFLAGS" @@ -411,12 +420,26 @@ AC_DEFUN([AX_PD_EARLY], 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" + CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$LDFLAGS $PDEXT_LFLAGS" + + ##-- ... and re-hack + cflags= + cppflags= + AX_DISTRIBUTE_CFLAGS([$CFLAGS],CPPFLAGS,cflags) + AX_SAFE_CFLAGS([$CPPFLAGS],cppflags,EXTRA_CPPFLAGS) + CFLAGS="$cflags" + CPPFLAGS="$cppflags" + + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + LDFLAGS=`echo $LDFLAGS` AC_MSG_NOTICE([set CPPFLAGS="$CPPFLAGS"]) AC_MSG_NOTICE([set EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS"]) - AC_MSG_NOTICE([set CFLAGS="$CFLAGS]) + AC_MSG_NOTICE([set CFLAGS="$CFLAGS"]) AC_MSG_NOTICE([set LDFLAGS="$LDFLAGS"]) ]) diff --git a/common/pdexternal.am b/common/pdexternal.am index f1fd785..eeda16d 100644 --- a/common/pdexternal.am +++ b/common/pdexternal.am @@ -25,6 +25,10 @@ EXEEXT = .@PDEXT@ ## --- pseudo-deps for '.SUFFIXES' SUFFIXES = .@PDEXT@ .pod .txt .html +##----------------------------------------------------------------------- +## Additional flags +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) + ##----------------------------------------------------------------------- ## Distribution diff --git a/deque/Makefile.in b/deque/Makefile.in index 39892f3..4efa9b6 100644 --- a/deque/Makefile.in +++ b/deque/Makefile.in @@ -87,7 +87,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -185,6 +184,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/deque/config/Makefile.in b/deque/config/Makefile.in index a8a1b93..dd1b8ff 100644 --- a/deque/config/Makefile.in +++ b/deque/config/Makefile.in @@ -57,7 +57,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -155,6 +154,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/deque/configure b/deque/configure index 9416a5f..ec2366a 100755 --- a/deque/configure +++ b/deque/configure @@ -617,7 +617,6 @@ build_alias host_alias target_alias EXTRA_CPPFLAGS -AM_CPPFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -1760,7 +1759,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ##-- save user's CFLAGS,CPPFLAGS ##-- parse user's CFLAGS,CPPFLAGS + { echo "$as_me:$LINENO: pre-processing user CFLAGS..." >&5 +echo "$as_me: pre-processing user CFLAGS..." >&6;} + { echo "$as_me:$LINENO: got CFLAGS=\"$CFLAGS\"" >&5 +echo "$as_me: got CFLAGS=\"$CFLAGS\"" >&6;} + { echo "$as_me:$LINENO: got CPPFLAGS=\"$CPPFLAGS\"" >&5 +echo "$as_me: got CPPFLAGS=\"$CPPFLAGS\"" >&6;} + cflags= + cppflags= ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## BEGIN AX_DISTRIBUTE_CFLAGS @@ -1809,8 +1816,21 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. CFLAGS="$cflags" CPPFLAGS="$cppflags" - AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + #LDFLAGS=`echo $LDFLAGS` + { echo "$as_me:$LINENO: setting distributed CFLAGS..." >&5 +echo "$as_me: setting distributed CFLAGS..." >&6;} + { 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;} + #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" ##-- save (hacked) user's CFLAGS,CPPFLAGS @@ -3833,8 +3853,8 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1 then PDEXT_DFLAGS="\ - -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \ - -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \ + -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ + -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \ " PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" @@ -3968,16 +3988,73 @@ fi ##-- 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" + CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$LDFLAGS $PDEXT_LFLAGS" + + ##-- ... and re-hack + 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" + + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + LDFLAGS=`echo $LDFLAGS` { 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 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;} @@ -4678,7 +4755,6 @@ 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 @@ -4737,6 +4813,7 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -4778,13 +4855,12 @@ _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` = 4; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/deque/src/Makefile.am b/deque/src/Makefile.am index effa4d3..a68e9ad 100644 --- a/deque/src/Makefile.am +++ b/deque/src/Makefile.am @@ -40,4 +40,4 @@ deque_SOURCES = \ #----------------------------------------------------------------------- # flags #----------------------------------------------------------------------- -AM_CPPFLAGS = -I$(top_srcdir)/common +AM_CPPFLAGS += -I$(top_srcdir)/common diff --git a/deque/src/Makefile.in b/deque/src/Makefile.in index 8b7c23b..be9d460 100644 --- a/deque/src/Makefile.in +++ b/deque/src/Makefile.in @@ -94,11 +94,6 @@ 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@ @@ -196,6 +191,11 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html + +#----------------------------------------------------------------------- +# flags +#----------------------------------------------------------------------- +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) -I$(top_srcdir)/common EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/extended/Makefile b/extended/Makefile index b014e02..12485d8 100644 --- a/extended/Makefile +++ b/extended/Makefile @@ -25,7 +25,7 @@ SUBDIRS = \ MOOCOW_DIR ?=$(shell pwd) MOOCOW_BUILD ?=$(MOOCOW_DIR)/build.moo MOOCOW_MFLAGS ?=DESTDIR="" -MOOCOW_BUILD_VERSION ?=2009-04-27.001 +MOOCOW_BUILD_VERSION ?=2009-04-27.002 ##-- arguments to be passed to sh ./configure ## + we use "`echo $(CFLAGS)`" to remove ugly quotes from the CFLAGS variable, @@ -52,7 +52,7 @@ ONFAIL ?= echo "(MOOCOW) Warning: sub-target failed: '$@'" ##-- defaults #CFLAGS ?= -g -O2 -Wall -Winline -W -CFLAGS ?= -g -O0 -Wall -Winline -W -D'mooUglyQuotedMacro(x)=x' -DmooSafeMacro=1 +CFLAGS ?= -g -O0 -Wall -D'mooUglyQuotedMacro(x)=x' -DmooSafeMacro=1 pd_src ?= $(CURDIR)/../../../pd diff --git a/flite/Makefile.in b/flite/Makefile.in index 7b1d944..f7d2fad 100644 --- a/flite/Makefile.in +++ b/flite/Makefile.in @@ -114,7 +114,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -217,6 +216,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) #----------------------------------------------------------------------- # Variables: distribution diff --git a/flite/config/Makefile.in b/flite/config/Makefile.in index d7af0c6..184d945 100644 --- a/flite/config/Makefile.in +++ b/flite/config/Makefile.in @@ -57,7 +57,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -160,6 +159,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/flite/configure b/flite/configure index a03b244..7faffec 100755 --- a/flite/configure +++ b/flite/configure @@ -617,7 +617,6 @@ build_alias host_alias target_alias EXTRA_CPPFLAGS -AM_CPPFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -1766,7 +1765,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ##-- save user's CFLAGS,CPPFLAGS ##-- parse user's CFLAGS,CPPFLAGS + { echo "$as_me:$LINENO: pre-processing user CFLAGS..." >&5 +echo "$as_me: pre-processing user CFLAGS..." >&6;} + { echo "$as_me:$LINENO: got CFLAGS=\"$CFLAGS\"" >&5 +echo "$as_me: got CFLAGS=\"$CFLAGS\"" >&6;} + { echo "$as_me:$LINENO: got CPPFLAGS=\"$CPPFLAGS\"" >&5 +echo "$as_me: got CPPFLAGS=\"$CPPFLAGS\"" >&6;} + cflags= + cppflags= ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## BEGIN AX_DISTRIBUTE_CFLAGS @@ -1815,8 +1822,21 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. CFLAGS="$cflags" CPPFLAGS="$cppflags" - AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + #LDFLAGS=`echo $LDFLAGS` + { echo "$as_me:$LINENO: setting distributed CFLAGS..." >&5 +echo "$as_me: setting distributed CFLAGS..." >&6;} + { 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;} + #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" ##-- save (hacked) user's CFLAGS,CPPFLAGS @@ -3839,8 +3859,8 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1 then PDEXT_DFLAGS="\ - -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \ - -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \ + -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ + -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \ " PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" @@ -4381,16 +4401,73 @@ fi ##-- add platform defaults to user flags - CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" - CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" - LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" + CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$LDFLAGS $PDEXT_LFLAGS" + + ##-- ... and re-hack + 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" + + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + LDFLAGS=`echo $LDFLAGS` { 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 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;} @@ -5090,7 +5167,6 @@ 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 @@ -5149,6 +5225,7 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -5190,7 +5267,6 @@ _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 @@ -5201,7 +5277,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` = 9; 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/gfsm/Makefile.in b/gfsm/Makefile.in index bd77ae5..7b4eab8 100644 --- a/gfsm/Makefile.in +++ b/gfsm/Makefile.in @@ -89,7 +89,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -219,6 +218,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/gfsm/config/Makefile.in b/gfsm/config/Makefile.in index 01c1f04..b5548d2 100644 --- a/gfsm/config/Makefile.in +++ b/gfsm/config/Makefile.in @@ -60,7 +60,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -190,6 +189,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/gfsm/configure b/gfsm/configure index bb29320..ec572b8 100755 --- a/gfsm/configure +++ b/gfsm/configure @@ -807,7 +807,6 @@ build_alias host_alias target_alias EXTRA_CPPFLAGS -AM_CPPFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -2023,7 +2022,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ##-- save user's CFLAGS,CPPFLAGS ##-- parse user's CFLAGS,CPPFLAGS + { echo "$as_me:$LINENO: pre-processing user CFLAGS..." >&5 +echo "$as_me: pre-processing user CFLAGS..." >&6;} + { echo "$as_me:$LINENO: got CFLAGS=\"$CFLAGS\"" >&5 +echo "$as_me: got CFLAGS=\"$CFLAGS\"" >&6;} + { echo "$as_me:$LINENO: got CPPFLAGS=\"$CPPFLAGS\"" >&5 +echo "$as_me: got CPPFLAGS=\"$CPPFLAGS\"" >&6;} + cflags= + cppflags= ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## BEGIN AX_DISTRIBUTE_CFLAGS @@ -2072,8 +2079,21 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. CFLAGS="$cflags" CPPFLAGS="$cppflags" - AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + #LDFLAGS=`echo $LDFLAGS` + { echo "$as_me:$LINENO: setting distributed CFLAGS..." >&5 +echo "$as_me: setting distributed CFLAGS..." >&6;} + { 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;} + #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" ##-- save (hacked) user's CFLAGS,CPPFLAGS @@ -4411,7 +4431,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4414 "configure"' > conftest.$ac_ext + echo '#line 4434 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7143,11 +7163,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:7146: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7166: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7150: \$? = $ac_status" >&5 + echo "$as_me:7170: \$? = $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. @@ -7411,11 +7431,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:7414: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7434: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7418: \$? = $ac_status" >&5 + echo "$as_me:7438: \$? = $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. @@ -7515,11 +7535,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:7518: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7538: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7522: \$? = $ac_status" >&5 + echo "$as_me:7542: \$? = $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 @@ -9812,7 +9832,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:12271: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12255: \$? = $ac_status" >&5 + echo "$as_me:12275: \$? = $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. @@ -12352,11 +12372,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:12355: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12375: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12359: \$? = $ac_status" >&5 + echo "$as_me:12379: \$? = $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 @@ -13913,11 +13933,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:13916: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13936: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13920: \$? = $ac_status" >&5 + echo "$as_me:13940: \$? = $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. @@ -14017,11 +14037,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:14020: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14040: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14024: \$? = $ac_status" >&5 + echo "$as_me:14044: \$? = $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 @@ -16204,11 +16224,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:16207: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16227: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16211: \$? = $ac_status" >&5 + echo "$as_me:16231: \$? = $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. @@ -16472,11 +16492,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:16475: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16495: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16479: \$? = $ac_status" >&5 + echo "$as_me:16499: \$? = $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. @@ -16576,11 +16596,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:16579: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16599: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16583: \$? = $ac_status" >&5 + echo "$as_me:16603: \$? = $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 @@ -20495,8 +20515,8 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1 then PDEXT_DFLAGS="\ - -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \ - -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \ + -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ + -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \ " PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" @@ -20824,16 +20844,73 @@ fi ## ##-- add platform defaults to user flags - CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" - CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" - LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" + CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$LDFLAGS $PDEXT_LFLAGS" + + ##-- ... and re-hack + 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" + + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + LDFLAGS=`echo $LDFLAGS` { 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 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;} @@ -21606,7 +21683,6 @@ 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 @@ -21665,6 +21741,7 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -21706,7 +21783,6 @@ _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 @@ -21744,7 +21820,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` = 36; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/gfsm/src/Makefile.in b/gfsm/src/Makefile.in index cf5a640..3810c4e 100644 --- a/gfsm/src/Makefile.in +++ b/gfsm/src/Makefile.in @@ -101,7 +101,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AR = @AR@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ @@ -231,6 +230,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/locale/Makefile.in b/locale/Makefile.in index 401ba6c..9d8339d 100644 --- a/locale/Makefile.in +++ b/locale/Makefile.in @@ -87,7 +87,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -185,6 +184,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/locale/config/Makefile.in b/locale/config/Makefile.in index 5ea1d44..584131c 100644 --- a/locale/config/Makefile.in +++ b/locale/config/Makefile.in @@ -57,7 +57,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -155,6 +154,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/locale/configure b/locale/configure index 62e18bb..8964105 100755 --- a/locale/configure +++ b/locale/configure @@ -641,7 +641,6 @@ MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT EXTRA_CPPFLAGS -AM_CPPFLAGS CC CFLAGS LDFLAGS @@ -2227,7 +2226,15 @@ fi ## Pd external checks ##-- parse user's CFLAGS,CPPFLAGS + { echo "$as_me:$LINENO: pre-processing user CFLAGS..." >&5 +echo "$as_me: pre-processing user CFLAGS..." >&6;} + { echo "$as_me:$LINENO: got CFLAGS=\"$CFLAGS\"" >&5 +echo "$as_me: got CFLAGS=\"$CFLAGS\"" >&6;} + { echo "$as_me:$LINENO: got CPPFLAGS=\"$CPPFLAGS\"" >&5 +echo "$as_me: got CPPFLAGS=\"$CPPFLAGS\"" >&6;} + cflags= + cppflags= ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## BEGIN AX_DISTRIBUTE_CFLAGS @@ -2276,8 +2283,21 @@ fi CFLAGS="$cflags" CPPFLAGS="$cppflags" - AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + #LDFLAGS=`echo $LDFLAGS` + { echo "$as_me:$LINENO: setting distributed CFLAGS..." >&5 +echo "$as_me: setting distributed CFLAGS..." >&6;} + { 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;} + #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" ##-- save (hacked) user's CFLAGS,CPPFLAGS @@ -3833,8 +3853,8 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1 then PDEXT_DFLAGS="\ - -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \ - -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \ + -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ + -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \ " PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" @@ -4848,16 +4868,73 @@ fi ##-- add platform defaults to user flags - CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" - CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" - LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" + CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$LDFLAGS $PDEXT_LFLAGS" + + ##-- ... and re-hack + 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" + + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + LDFLAGS=`echo $LDFLAGS` { 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 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 @@ -5582,7 +5659,6 @@ 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 @@ -5617,6 +5693,7 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -5658,13 +5735,12 @@ _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` = 4; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/locale/src/Makefile.in b/locale/src/Makefile.in index df51b75..b7d61e2 100644 --- a/locale/src/Makefile.in +++ b/locale/src/Makefile.in @@ -95,7 +95,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -193,6 +192,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/readdir/Makefile.in b/readdir/Makefile.in index edf67d3..2a3d419 100644 --- a/readdir/Makefile.in +++ b/readdir/Makefile.in @@ -87,7 +87,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -185,6 +184,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/readdir/configure b/readdir/configure index f8c266f..d52ec3a 100755 --- a/readdir/configure +++ b/readdir/configure @@ -617,7 +617,6 @@ build_alias host_alias target_alias EXTRA_CPPFLAGS -AM_CPPFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -1760,7 +1759,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ##-- save user's CFLAGS,CPPFLAGS ##-- parse user's CFLAGS,CPPFLAGS + { echo "$as_me:$LINENO: pre-processing user CFLAGS..." >&5 +echo "$as_me: pre-processing user CFLAGS..." >&6;} + { echo "$as_me:$LINENO: got CFLAGS=\"$CFLAGS\"" >&5 +echo "$as_me: got CFLAGS=\"$CFLAGS\"" >&6;} + { echo "$as_me:$LINENO: got CPPFLAGS=\"$CPPFLAGS\"" >&5 +echo "$as_me: got CPPFLAGS=\"$CPPFLAGS\"" >&6;} + cflags= + cppflags= ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## BEGIN AX_DISTRIBUTE_CFLAGS @@ -1809,8 +1816,21 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. CFLAGS="$cflags" CPPFLAGS="$cppflags" - AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + #LDFLAGS=`echo $LDFLAGS` + { echo "$as_me:$LINENO: setting distributed CFLAGS..." >&5 +echo "$as_me: setting distributed CFLAGS..." >&6;} + { 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;} + #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" ##-- save (hacked) user's CFLAGS,CPPFLAGS @@ -3835,8 +3855,8 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1 then PDEXT_DFLAGS="\ - -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \ - -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \ + -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ + -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \ " PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" @@ -3963,16 +3983,73 @@ fi ##-- add platform defaults to user flags - CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" - CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" - LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" + CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$LDFLAGS $PDEXT_LFLAGS" + + ##-- ... and re-hack + 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" + + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + LDFLAGS=`echo $LDFLAGS` { 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 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;} @@ -4672,7 +4749,6 @@ 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 @@ -4731,6 +4807,7 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -4772,13 +4849,12 @@ _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` = 4; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/readdir/src/Makefile.in b/readdir/src/Makefile.in index 8776a06..63b568f 100644 --- a/readdir/src/Makefile.in +++ b/readdir/src/Makefile.in @@ -92,7 +92,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -190,6 +189,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/sprinkler/Makefile.am b/sprinkler/Makefile.am index cb492e9..8cebea9 100644 --- a/sprinkler/Makefile.am +++ b/sprinkler/Makefile.am @@ -55,4 +55,4 @@ pddoc_DATA = sprinkler-help.pd sprinkler_SOURCES = sprinkler.c common/mooPdUtils.h -AM_CPPFLAGS = -I$(top_srcdir)/common +AM_CPPFLAGS += -I$(top_srcdir)/common diff --git a/sprinkler/Makefile.in b/sprinkler/Makefile.in index 942d68f..45c5220 100644 --- a/sprinkler/Makefile.in +++ b/sprinkler/Makefile.in @@ -109,7 +109,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = -I$(top_srcdir)/common AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -211,6 +210,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) -I$(top_srcdir)/common EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/sprinkler/configure b/sprinkler/configure index 664b27e..ad69bf5 100755 --- a/sprinkler/configure +++ b/sprinkler/configure @@ -617,7 +617,6 @@ build_alias host_alias target_alias EXTRA_CPPFLAGS -AM_CPPFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -1768,7 +1767,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ##-- save user's CFLAGS,CPPFLAGS ##-- parse user's CFLAGS,CPPFLAGS + { echo "$as_me:$LINENO: pre-processing user CFLAGS..." >&5 +echo "$as_me: pre-processing user CFLAGS..." >&6;} + { echo "$as_me:$LINENO: got CFLAGS=\"$CFLAGS\"" >&5 +echo "$as_me: got CFLAGS=\"$CFLAGS\"" >&6;} + { echo "$as_me:$LINENO: got CPPFLAGS=\"$CPPFLAGS\"" >&5 +echo "$as_me: got CPPFLAGS=\"$CPPFLAGS\"" >&6;} + cflags= + cppflags= ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## BEGIN AX_DISTRIBUTE_CFLAGS @@ -1817,8 +1824,21 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. CFLAGS="$cflags" CPPFLAGS="$cppflags" - AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + #LDFLAGS=`echo $LDFLAGS` + { echo "$as_me:$LINENO: setting distributed CFLAGS..." >&5 +echo "$as_me: setting distributed CFLAGS..." >&6;} + { 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;} + #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" ##-- save (hacked) user's CFLAGS,CPPFLAGS @@ -3843,8 +3863,8 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1 then PDEXT_DFLAGS="\ - -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \ - -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \ + -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ + -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \ " PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" @@ -3958,16 +3978,73 @@ fi ##-- add platform defaults to user flags - CPPFLAGS="$UCPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" - CFLAGS="$UCFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" - LDFLAGS="$ULDFLAGS $PDEXT_LFLAGS" + CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$LDFLAGS $PDEXT_LFLAGS" + + ##-- ... and re-hack + 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" + + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + LDFLAGS=`echo $LDFLAGS` { 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 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;} @@ -4667,7 +4744,6 @@ 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 @@ -4726,6 +4802,7 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -4767,7 +4844,6 @@ _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 @@ -4777,7 +4853,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` = 8; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 7; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/weightmap/Makefile.in b/weightmap/Makefile.in index edf67d3..2a3d419 100644 --- a/weightmap/Makefile.in +++ b/weightmap/Makefile.in @@ -87,7 +87,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = @AM_CPPFLAGS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -185,6 +184,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ diff --git a/weightmap/configure b/weightmap/configure index 3114072..e91d9af 100755 --- a/weightmap/configure +++ b/weightmap/configure @@ -617,7 +617,6 @@ build_alias host_alias target_alias EXTRA_CPPFLAGS -AM_CPPFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA @@ -1760,7 +1759,15 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ##-- save user's CFLAGS,CPPFLAGS ##-- parse user's CFLAGS,CPPFLAGS + { echo "$as_me:$LINENO: pre-processing user CFLAGS..." >&5 +echo "$as_me: pre-processing user CFLAGS..." >&6;} + { echo "$as_me:$LINENO: got CFLAGS=\"$CFLAGS\"" >&5 +echo "$as_me: got CFLAGS=\"$CFLAGS\"" >&6;} + { echo "$as_me:$LINENO: got CPPFLAGS=\"$CPPFLAGS\"" >&5 +echo "$as_me: got CPPFLAGS=\"$CPPFLAGS\"" >&6;} + cflags= + cppflags= ##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv ## BEGIN AX_DISTRIBUTE_CFLAGS @@ -1809,8 +1816,21 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. CFLAGS="$cflags" CPPFLAGS="$cppflags" - AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + #LDFLAGS=`echo $LDFLAGS` + { echo "$as_me:$LINENO: setting distributed CFLAGS..." >&5 +echo "$as_me: setting distributed CFLAGS..." >&6;} + { 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;} + #AM_CPPFLAGS="\${EXTRA_CPPFLAGS}" ##-- save (hacked) user's CFLAGS,CPPFLAGS @@ -3835,8 +3855,8 @@ echo "$as_me: WARNING: Unknown kernel type \"$uname_s\" defaults to \"Linux\"" > if test "$uname_s" = "MINGW32_NT"; #MINGW32_NT-5.1 then PDEXT_DFLAGS="\ - -DO_NONBLOCK=1 -Dsrand48(n)=srand((n)) \ - -Ddrand48()=((double)rand()/RAND_MAX) -Dbzero(p,n)=memset(p,0,n) \ + -D'O_NONBLOCK=1' -D'srand48(n)=srand((n))' \ + -D'drand48()=((double)rand()/RAND_MAX)' -D'bzero(p,n)=memset(p,0,n)' \ " PDEXT_LFLAGS="-shared -L${pddir}/bin -L${pddir}/obj" PDEXT_CFLAGS="-mms-bitfields -DMSW -DNT" @@ -3961,16 +3981,73 @@ fi ##-- 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" + CPPFLAGS="$CPPFLAGS $PDEXT_IFLAGS $PDEXT_DFLAGS" + CFLAGS="$CFLAGS $PDEXT_OFLAGS $PDEXT_AFLAGS $PDEXT_WFLAGS" + LDFLAGS="$LDFLAGS $PDEXT_LFLAGS" + + ##-- ... and re-hack + 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" + + ##-- trim whitespace + CFLAGS=`echo $CFLAGS` + CPPFLAGS=`echo $CPPFLAGS` + EXTRA_CPPFLAGS=`echo $EXTRA_CPPFLAGS` + LDFLAGS=`echo $LDFLAGS` { 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 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;} @@ -4670,7 +4747,6 @@ 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 @@ -4729,6 +4805,7 @@ 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 _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -4770,13 +4847,12 @@ _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` = 4; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 3; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/weightmap/src/Makefile.am b/weightmap/src/Makefile.am index 235e9bb..329fe6b 100644 --- a/weightmap/src/Makefile.am +++ b/weightmap/src/Makefile.am @@ -36,4 +36,4 @@ pddoc_DATA = weightmap-help.pd weightmap_SOURCES = weightmap.c $(top_srcdir)/common/mooPdUtils.h -AM_CPPFLAGS = -I$(top_srcdir)/common +AM_CPPFLAGS += -I$(top_srcdir)/common diff --git a/weightmap/src/Makefile.in b/weightmap/src/Makefile.in index ae55886..6011219 100644 --- a/weightmap/src/Makefile.in +++ b/weightmap/src/Makefile.in @@ -92,7 +92,6 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AM_CPPFLAGS = -I$(top_srcdir)/common AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -190,6 +189,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ DEXT = @PDEXT@ SUFFIXES = .@PDEXT@ .pod .txt .html +AM_CPPFLAGS = $(EXTRA_CPPFLAGS) -I$(top_srcdir)/common EXTRA_DIST = \ $(PODS) \ $(PODS:.pod=.txt) \ -- cgit v1.2.1