summaryrefslogtreecommitdiffstats
path: root/acgeneral.m4
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:27:05 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-08-26 10:27:05 +0000
commit4a8fa3e7b3a9f858274100d865fdcbff908eaa94 (patch)
treeeba8b15a3276a836325d884608f58368bf100f3c /acgeneral.m4
parentAdding upstream version 2.52+20231210. (diff)
downloadautoconf-dickey-upstream.tar.xz
autoconf-dickey-upstream.zip
Adding upstream version 2.52+20240618.upstream/2.52+20240618upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'acgeneral.m4')
-rw-r--r--acgeneral.m412
1 files changed, 8 insertions, 4 deletions
diff --git a/acgeneral.m4 b/acgeneral.m4
index 5f8aa69..77b0499 100644
--- a/acgeneral.m4
+++ b/acgeneral.m4
@@ -1,7 +1,7 @@
# This file is part of Autoconf. -*- Autoconf -*-
# Parameterized macros.
#------------------------------------------------------------------------------
-# Copyright 2003-2022,2023 Thomas E. Dickey
+# Copyright 2003-2023,2024 Thomas E. Dickey
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
# Free Software Foundation, Inc.
#
@@ -1020,6 +1020,10 @@ do
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
+ -*dir | -dvi* | -doc* | -html* | -local* | -pdf* | -ps* )
+ AC_MSG_WARN([unsupported option: $ac_option])
+ ;;
+
-*) AC_MSG_ERROR([unrecognized option: $ac_option
Try `$[0] --help' for more information.])
;;
@@ -2076,7 +2080,7 @@ m4_define([_AC_SUBST_SED_PROGRAM])
# AC_SUBST(VARIABLE, [VALUE])
# ---------------------------
# Create an output variable from a shell VARIABLE. If VALUE is given
-# assign it to VARIABLE. Use `""' is you want to set VARIABLE to an
+# assign it to VARIABLE. Use `""' if you want to set VARIABLE to an
# empty value, not an empty second argument.
#
# Beware that if you change this macro, you also have to change the
@@ -3998,14 +4002,14 @@ dnl Here, there are 2 cmd per line, and two cmd are added later.
# is no need to browse any of the substitutions).
# These are the two extra sed commands mentioned above.
(echo [':t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b'] && cat "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b'] && sed -e 's/[\\][\\]*$//g' -e 's/$/\\/' -e 's/;t t\\/;t t/' -e 't' -e '3,'$ac_max_sed_lines's/$/\\/' "$tmp"/subs.frag) >"$tmp"/subs-$ac_sed_frag.sed
# It is possible to make a multiline substitution using escaped newlines.
# Ensure that we do not split the substitution between script fragments.
ac_BEG=$ac_end
ac_END=`expr "$ac_end" + "$ac_max_sed_lines"`
sed "1,${ac_BEG}d; ${ac_END}p; q" "$tmp"/subs.sed >"$tmp"/subs.next
if test -s "$tmp"/subs.next; then
- grep '^s,@[[^@,]][[^@,]]*@,.*\\$' "$tmp"/subs.next >"$tmp"/subs.edit
+ grep '^s,@[[^@,]][[^@,]]*@,.*$' "$tmp"/subs.next | grep -v '^s,@.*;t t$' >"$tmp"/subs.edit
if test ! -s "$tmp"/subs.edit; then
grep "^s,@[[^@,]][[^@,]]*@,.*,;t t$" "$tmp"/subs.next >"$tmp"/subs.edit
if test ! -s "$tmp"/subs.edit; then