From 45b307180542b422529ca26d00af9c65270e068a Mon Sep 17 00:00:00 2001 From: Bryan Jurish Date: Sun, 26 Apr 2009 22:36:09 +0000 Subject: + yet more quoted-command-line-macro hell svn path=/trunk/externals/moocow/pdstring/; revision=11161 --- Makefile.in | 5 ++- aclocal.m4 | 1 + config/Makefile.in | 5 ++- configure | 103 ++++++++++++++++++++++++++++++++++++++++++----------- configure.ac | 10 ++---- src/Makefile.in | 14 ++++---- 6 files changed, 101 insertions(+), 37 deletions(-) diff --git a/Makefile.in b/Makefile.in index 550f18c..403f039 100644 --- a/Makefile.in +++ b/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/aclocal.m4 b/aclocal.m4 index 0cdbeac..e7dee1b 100644 --- a/aclocal.m4 +++ b/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/config/Makefile.in b/config/Makefile.in index 049c594..a8a1b93 100644 --- a/config/Makefile.in +++ b/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/configure b/configure index d4cdddc..6eebccb 100755 --- a/configure +++ b/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 @@ _ACEOF fi -##-- 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_links="$ac_config_links src/any2string-help.pd:src/any2bytes-help.pd" ac_config_links="$ac_config_links src/string2any-help.pd:src/bytes2any-help.pd" @@ -4622,6 +4681,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 @@ -4680,8 +4741,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 @@ -4723,11 +4782,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/configure.ac b/configure.ac index f404800..fa0c4f7 100644 --- a/configure.ac +++ b/configure.ac @@ -16,9 +16,7 @@ AC_CONFIG_MACRO_DIR(common/m4) 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) @@ -68,12 +66,8 @@ if test "$enable_debug" = "yes" ; then fi -##-- local: restore user's CFLAGS (now done by AX_PD_EXTERNAL) -#CFLAGS="$UCFLAGS" -#CPPFLAGS="$UCPPFLAGS" -#LDFLAGS="$ULDFLAGS" - ##-- local: output +AX_PD_LATE() AC_CONFIG_LINKS([src/any2string-help.pd:src/any2bytes-help.pd]) AC_CONFIG_LINKS([src/string2any-help.pd:src/bytes2any-help.pd]) AC_OUTPUT(config/Makefile src/Makefile Makefile) diff --git a/src/Makefile.in b/src/Makefile.in index cd8365d..d3e7e39 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -69,7 +69,8 @@ EXTRA_PROGRAMS = pdstring$(EXEEXT) any2bytes$(EXEEXT) \ printbytes$(EXEEXT) printwchars$(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) @@ -146,6 +147,11 @@ ACLOCAL = @ACLOCAL@ AMDEP_FALSE = @AMDEP_FALSE@ AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ + +#----------------------------------------------------------------------- +# Paths, etc. +#----------------------------------------------------------------------- +AM_CPPFLAGS = -I$(top_srcdir)/common AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -163,6 +169,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@ @@ -317,11 +324,6 @@ pddoc_DATA = \ printbytes-help.pd \ printwchars-help.pd - -#----------------------------------------------------------------------- -# Paths, etc. -#----------------------------------------------------------------------- -AM_CPPFLAGS = -I$(top_srcdir)/common all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am -- cgit v1.2.1