ncurses 6.4 - patch 20230520

[ncurses.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index bc5350e3ec99200babb108e1e76b2680788d9aa4..0a0770de5742df110483b6344fbbcaa36b1cadb3 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -29,7 +29,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.1040 2023/04/22 15:51:54 tom Exp $
+dnl $Id: aclocal.m4,v 1.1046 2023/05/13 21:42:47 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -5844,7 +5844,7 @@ AC_ARG_WITH(manpage-tbl,
 AC_MSG_RESULT($MANPAGE_TBL)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MAN_PAGES version: 56 updated: 2023/01/21 16:49:25
+dnl CF_MAN_PAGES version: 57 updated: 2023/05/13 19:14:15
 dnl ------------
 dnl Try to determine if the man-pages on the system are compressed, and if
 dnl so, what format is used.  Use this information to construct a script that
@@ -6064,6 +6064,14 @@ esac
 
 cat >>$cf_edit_man <<CF_EOF
        suffix=\`basename "\$cf_target" | sed -e 's%^[[^.]]*%%'\`
+       extra_suffix=
+       if test -n "$EXTRA_SUFFIX" ; then
+               case \$cf_target in
+               (*${EXTRA_SUFFIX}\$suffix)
+                       extra_suffix="$EXTRA_SUFFIX"
+                       ;;
+               esac
+       fi
        if test "\$verb" = installing ; then
                echo "\$verb \$cf_target"
                \$INSTALL_DATA \$TMP "\$cf_target"
@@ -6078,6 +6086,7 @@ cat >>$cf_edit_man <<CF_EOF
                                        if test "\$section" = 1 ; then
                                                cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`
                                        fi
+                                       cf_alias="\${cf_alias}\${extra_suffix}"
 
                                        if test "$MANPAGE_SYMLINKS" = yes ; then
                                                if test -f "\$cf_alias\${suffix}" ; then
@@ -6134,6 +6143,7 @@ cat >>$cf_edit_man <<CF_EOF
                                        if test "\$section" = 1 ; then
                                                cf_alias=\`echo "\$cf_alias" |sed "\${transform}"\`
                                        fi
+                                       cf_alias="\${cf_alias}\${extra_suffix}"
 
                                        echo ".. \$verb alias \$cf_alias\${suffix}"
                                        rm -f "\$cf_alias\${suffix}"
@@ -6386,15 +6396,15 @@ case ".$with_cflags" in
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NUMBER_SYNTAX version: 2 updated: 2015/04/17 21:13:04
+dnl CF_NUMBER_SYNTAX version: 3 updated: 2023/05/06 16:14:29
 dnl ----------------
-dnl Check if the given variable is a number.  If not, report an error.
+dnl Check if the given variable is a positive integer.  Report an error if not.
 dnl $1 is the variable
 dnl $2 is the message
 AC_DEFUN([CF_NUMBER_SYNTAX],[
 if test -n "$1" ; then
-  case $1 in
-  ([[0-9]]*)
+  case `echo "$1" | sed -e 's/^[[0-9]]*$/0/g'` in
+  (0)
        ;;
   (*)
        AC_MSG_ERROR($2 is not a number: $1)
@@ -9610,7 +9620,7 @@ if test "$with_pthread" != no ; then
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49
+dnl CF_WITH_REL_VERSION version: 2 updated: 2023/05/06 18:18:18
 dnl -------------------
 dnl Allow library's release-version to be overridden.  Generally this happens when a
 dnl packager has incremented the release-version past that used in the original package,
@@ -9630,6 +9640,7 @@ ifelse($1,,[
 ],[
  $1_MAJOR=`echo "$cf_cv_rel_version" | sed -e 's/\..*//'`
  $1_MINOR=`echo "$cf_cv_rel_version" | sed -e 's/^[[^.]]*//' -e 's/^\.//' -e 's/\..*//'`
+ test -n "$1_MINOR" || $1_MINOR=0
  CF_NUMBER_SYNTAX([$]$1_MAJOR,Release major-version)
  CF_NUMBER_SYNTAX([$]$1_MINOR,Release minor-version)
 ])