Revert "Use CFLAGS passed to configure in tests"

This reverts commit 5486fa2.

Makefile.in

@@ -256,7 +256,6 @@ SED_PROG = @SED_PROG@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TESTS_CFLAGS = @TESTS_CFLAGS@
 VERSION = @VERSION@
 VIM_PROG = @VIM_PROG@
 abs_builddir = @abs_builddir@

configure

@@ -636,7 +636,6 @@ AWK_PROG
 COL_PROG
 MANGEN_PROG
 HAVE_FILE_PROG
-TESTS_CFLAGS
 host_os
 host_vendor
 host_cpu
@@ -6202,9 +6201,6 @@ case "$host_os" in
 		;;
 esac
 
-TESTS_CFLAGS="$CFLAGS"
-
-
 
 $as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
 

configure.ac

@@ -37,10 +37,6 @@ case "$host_os" in
 		;;
 esac
 
-dnl pass some CFLAGS to tests
-TESTS_CFLAGS="$CFLAGS"
-AC_SUBST([TESTS_CFLAGS])
-
 AC_DEFINE([_XOPEN_SOURCE_EXTENDED], [1],
           [Define to 1 to enable wide functions of ncurses in some environments.])
 

src/Makefile.in

@@ -513,7 +513,6 @@ SED_PROG = @SED_PROG@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-TESTS_CFLAGS = @TESTS_CFLAGS@
 VERSION = @VERSION@
 VIM_PROG = @VIM_PROG@
 abs_builddir = @abs_builddir@

tests/Makefile

@@ -131,15 +131,13 @@ endif
 ifdef unix_env
     MF := $(B)../src/Makefile
     ifneq ($(wildcard $(MF)),)
-        LDFLAGS += $(shell sed -n    '/LIBS =/{s/^[^=]*=//p;q}' $(MF))
-        LDFLAGS += $(shell sed -n '/LDFLAGS =/{s/^[^=]*=//p;q}' $(MF))
-
-        CFLAGS  += $(shell sed -n          '/CPPFLAGS =/{s/^[^=]*=//p;q}' $(MF))
-        CFLAGS  += $(shell sed -n      '/TESTS_CFLAGS =/{s/^[^=]*=//p;q}' $(MF))
+        LDFLAGS += $(shell sed -n     '/LIBS =/{s/^[^=]*=//p;q}' $(MF))
+        LDFLAGS += $(shell sed -n  '/LDFLAGS =/{s/^[^=]*=//p;q}' $(MF))
+        CFLAGS  += $(shell sed -n '/CPPFLAGS =/{s/^[^=]*=//p;q}' $(MF))
         CFLAGS  += $(shell sed -n '/SANITIZERS_CFLAGS =/{s/^[^=]*=//p;q}' $(MF))
     endif
 
-    CFLAGS += -I/usr/include/ncursesw
+    CFLAGS  += -I/usr/include/ncursesw
     export UBSAN_OPTIONS := halt_on_error=1
 endif
 ifdef win_env