+ yet more *FLAGS madness

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

1 files changed, 111 insertions, 35 deletions

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 <<EOF
-#line 9815 "configure"
+#line 9835 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9912,7 +9932,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9915 "configure"
+#line 9935 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12248,11 +12268,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:12251: $lt_compile\"" >&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