about summary refs log tree commit diff stats
path: root/aclocal.m4
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2020-09-01 08:23:58 +0000
committerThomas E. Dickey <dickey@invisible-island.net>2020-09-01 08:23:58 +0000
commit5308969168f28feb340b82be8f0417b4797f3104 (patch)
tree429f5bcb84c64cced412c7596b8bdd33500a1689 /aclocal.m4
parent0d251ee2f48c17e10042b12f74a142f51ad88269 (diff)
downloadlynx-snapshots-5308969168f28feb340b82be8f0417b4797f3104.tar.gz
snapshot of project "lynx", label v2-9-0dev_5g
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m415
1 files changed, 14 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 25fd2ad8..b123efeb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.269 2020/08/28 20:56:27 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.270 2020/09/01 08:19:14 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -3976,6 +3976,19 @@ ifelse($1,,[
 fi
 ])
 dnl ---------------------------------------------------------------------------
+dnl CF_MERGE_EXTRA_CFLAGS version: 1 updated: 2020/09/01 04:00:32
+dnl ---------------------
+dnl CF_FIX_WARNINGS moves problematic flags into EXTRA_CFLAGS, but some scripts
+dnl may depend on being able to override that variable at build-time.  Move it
+dnl all back.
+define([CF_MERGE_EXTRA_CFLAGS],[
+if ( test "$GCC" = yes || test "$GXX" = yes )
+then
+	CF_APPEND_TEXT(CFLAGS,$EXTRA_CFLAGS)
+	EXTRA_CFLAGS=
+fi
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00
 dnl ----------------------
 dnl Check if the file-system supports mixed-case filenames.  If we're able to