ncurses 6.0 - patch 20160903

[ncurses.git] / test / aclocal.m4

diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 4ac571ce26f55c03791b1acf09ea378dcaa83b56..93fdbaf3f81d2fd6e027dbf8a3b4b77d7f7b6cb9 100644 (file)
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -26,7 +26,7 @@ dnl sale, use or other dealings in this Software without prior written       *
 dnl authorization.                                                           *
 dnl***************************************************************************
 dnl
-dnl $Id: aclocal.m4,v 1.133 2016/08/27 16:27:51 tom Exp $
+dnl $Id: aclocal.m4,v 1.134 2016/09/04 00:10:41 tom Exp $
 dnl
 dnl Author: Thomas E. Dickey
 dnl
@@ -376,7 +376,7 @@ ifelse([$3],,[    :]dnl
 ])dnl
 ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CC_ENV_FLAGS version: 5 updated: 2016/08/27 11:24:46
+dnl CF_CC_ENV_FLAGS version: 6 updated: 2016/08/29 20:57:00
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
 dnl into CC.  This will not help with broken scripts that wrap the compiler
@@ -401,7 +401,17 @@ case "$CC" in
        # humor him...
        cf_flags=`echo "$CC" | sed -e 's/^.*[[  ]]\(-[[^        ]]\)/\1/'`
        CC=`echo "$CC " | sed -e 's/[[  ]]-[[^  ]].*$//' -e 's/[[       ]]*$//'`
-       CF_ADD_CFLAGS($cf_flags)
+       for cf_arg in $cf_flags
+       do
+               case "x$cf_arg" in
+               (x-[[IUDfgOW]]*)
+                       CF_ADD_CFLAGS($cf_flags)
+                       ;;
+               (*)
+                       CC="$CC $cf_arg"
+                       ;;
+               esac
+       done
        CF_VERBOSE(resulting CC: '$CC')
        CF_VERBOSE(resulting CFLAGS: '$CFLAGS')
        CF_VERBOSE(resulting CPPFLAGS: '$CPPFLAGS')