nmap: allow build with automake 1.17

This commit is contained in:
Rudi Heitbaum 2024-07-29 11:34:30 +00:00
parent e1557b6e42
commit 7186f13746

View File

@ -0,0 +1,74 @@
diff -Nur a/libpcre/aclocal.m4 b/libpcre/aclocal.m4
--- a/libpcre/aclocal.m4 2023-06-24 01:53:07.000000000 +0000
+++ b/libpcre/aclocal.m4 2024-07-29 11:29:45.699525807 +0000
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -Nur a/libpcre/configure b/libpcre/configure
--- a/libpcre/configure 2024-02-28 16:06:30.000000000 +0000
+++ b/libpcre/configure 2024-07-29 11:25:14.134081052 +0000
@@ -2758,7 +2758,7 @@
-am__api_version='1.16'
+am__api_version='1.17'
diff -Nur a/libssh2/aclocal.m4 b/libssh2/aclocal.m4
--- a/libssh2/aclocal.m4 2024-02-28 17:39:06.000000000 +0000
+++ b/libssh2/aclocal.m4 2024-07-29 11:30:13.873078377 +0000
@@ -32,10 +32,10 @@
# generated from the m4 files accompanying Automake X.Y.
# (This private macro should not be called outside this file.)
AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.16'
+[am__api_version='1.17'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.16.5], [],
+m4_if([$1], [1.17], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -51,7 +51,7 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.16.5])dnl
+[AM_AUTOMAKE_VERSION([1.17])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff -Nur a/libssh2/configure b/libssh2/configure
--- a/libssh2/configure 2024-02-28 17:39:06.000000000 +0000
+++ b/libssh2/configure 2024-07-29 11:25:39.590945455 +0000
@@ -3236,7 +3236,7 @@
fi
LIBSSH2VER=`$SED -ne 's/^#define LIBSSH2_VERSION *"\(.*\)"/\1/p' ${srcdir}/include/libssh2.h`
-am__api_version='1.16'
+am__api_version='1.17'
# Find a good install program. We prefer a C program (faster),