ncurses 6.0 - patch 20160903

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index b83176eff1a0e33a397555617ceb0a2630a398fe..5c5bc28a36ab6c09128364bf95652fc8f0c76835 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.794 2016/08/27 16:24:33 tom Exp $
+dnl $Id: aclocal.m4,v 1.795 2016/08/30 00:57:00 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -711,7 +711,7 @@ AC_SUBST(BUILD_EXEEXT)
 AC_SUBST(BUILD_OBJEXT)
 ])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
@@ -736,7 +736,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')