[PATCH 11/21] build: Report ABI suffix in man pages' synopses.

[G. Branden Robinson]

[You must run `autoreconf-dickey -f` after this commit.]

* aclocal.m4 (CF_MAN_PAGES): Rewrite "curses.h" and "term.h" `#include`
  lines to prefix them with "ncurses" and "$ABI_SUFFIX" (instead of
  "$LIB_SUFFIX", which is not defined at the time this macro is expanded
  in the "configure" script) and a slash.
* configure.in: Move `CF_MAN_PAGES` macro expansion later in the file,
  after the shell variable `ABI_SUFFIX` is defined.
---
 aclocal.m4   | 4 ++--
 configure.in | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 38b69f9ab..49b4ae41e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6208,8 +6208,8 @@ CF_EOF
 
 if test "$with_overwrite" != yes ; then
 cat >>$cf_edit_man <<CF_EOF
-       sed -e "/\\#[    ]*include/s,<curses.h,<ncurses$LIB_SUFFIX/curses.h," \
-           -e "/\\#[    ]*include/s,<term.h,<ncurses$LIB_SUFFIX/term.h," \
+       sed -e "/\\#[    ]*include/s,<curses.h,<ncurses$ABI_SUFFIX/curses.h," \
+           -e "/\\#[    ]*include/s,<term.h,<ncurses$ABI_SUFFIX/term.h," \
          < \$TMP >\$TMP.out
        mv \$TMP.out \$TMP
 CF_EOF
diff --git a/configure.in b/configure.in
index c2d28b4dd..2d80b2b40 100644
--- a/configure.in
+++ b/configure.in
@@ -1093,9 +1093,6 @@ AC_ARG_WITH(rcs-ids,
 AC_MSG_RESULT($with_rcs_ids)
 test "x$with_rcs_ids" = xyes && AC_DEFINE(USE_RCS_IDS,1,[Define to 1 to 
compile-in RCS identifiers])
 
-###############################################################################
-CF_MAN_PAGES([ captoinfo clear infocmp infotocap reset tabs tic toe tput tset 
])
-
 ###############################################################################
 CF_HELP_MESSAGE(Extensions:)
 
@@ -2381,6 +2378,9 @@ case 
"x${ac_cv_header_termios_h}${ac_cv_header_termio_h}${ac_cv_header_sgtty_h}$
        ;;
 esac
 
+###############################################################################
+CF_MAN_PAGES([ captoinfo clear infocmp infotocap reset tabs tic toe tput tset 
])
+
 
################################################################################
 test "x$use_database" = xyes && \
 SUB_MAKEFILES="$SUB_MAKEFILES misc/run_tic.sh:misc/run_tic.in"
-- 
2.30.2

signature.asc
Description: PGP signature