Update configure.ac for latest version of autoconf.

This commit is contained in:
Philip.Hazel 2021-02-02 17:02:55 +00:00
parent 6cb388d55b
commit 91485e5d5a
2 changed files with 11 additions and 7 deletions

View File

@ -25,6 +25,12 @@ now the same as Perl.
(b) A sequence such as {65536 that has no terminating } so is not a (b) A sequence such as {65536 that has no terminating } so is not a
quantifier was nevertheless complaining that a quantifier number was too big. quantifier was nevertheless complaining that a quantifier number was too big.
5. A run of autoconf suggested that configure.ac was out-of-date with respect
to the lastest autoconf. Running autoupdate made some valid changes, some valid
suggestions, and also some invalid changes, which were fixed by hand. Autoconf
now runs clean and the resulting "configure" seems to work, so I hope nothing
is broken.
Version 10.36 04-December-2020 Version 10.36 04-December-2020
------------------------------ ------------------------------

View File

@ -22,8 +22,8 @@ m4_define(libpcre2_posix_version, [2:3:0])
# NOTE: The CMakeLists.txt file searches for the above variables in the first # NOTE: The CMakeLists.txt file searches for the above variables in the first
# 50 lines of this file. Please update that if the variables above are moved. # 50 lines of this file. Please update that if the variables above are moved.
AC_PREREQ(2.57) AC_PREREQ([2.70])
AC_INIT(PCRE2, pcre2_major.pcre2_minor[]pcre2_prerelease, , pcre2) AC_INIT([PCRE2],pcre2_major.pcre2_minor[]pcre2_prerelease,[],[pcre2])
AC_CONFIG_SRCDIR([src/pcre2.h.in]) AC_CONFIG_SRCDIR([src/pcre2.h.in])
AM_INIT_AUTOMAKE([dist-bzip2 dist-zip]) AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@ -64,8 +64,7 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
AC_TYPE_INT64_T AC_TYPE_INT64_T
AC_PROG_INSTALL AC_PROG_INSTALL
AC_LIBTOOL_WIN32_DLL LT_INIT([win32-dll])
LT_INIT
AC_PROG_LN_S AC_PROG_LN_S
# Check for GCC visibility feature # Check for GCC visibility feature
@ -424,7 +423,7 @@ case "$enable_newline" in
anycrlf) ac_pcre2_newline_value=5 ;; anycrlf) ac_pcre2_newline_value=5 ;;
nul) ac_pcre2_newline_value=6 ;; nul) ac_pcre2_newline_value=6 ;;
*) *)
AC_MSG_ERROR([invalid argument \"$enable_newline\" to --enable-newline option]) AC_MSG_ERROR([invalid argument "$enable_newline" to --enable-newline option])
;; ;;
esac esac
@ -453,7 +452,7 @@ fi
case "$with_link_size" in case "$with_link_size" in
2|3|4) ;; 2|3|4) ;;
*) *)
AC_MSG_ERROR([invalid argument \"$with_link_size\" to --with-link-size option]) AC_MSG_ERROR([invalid argument "$with_link_size" to --with-link-size option])
;; ;;
esac esac
@ -486,7 +485,6 @@ HAVE_BCOPY is defined. If your system has neither bcopy() nor memmove(), make
sure both macros are undefined; an emulation function will then be used. */]) sure both macros are undefined; an emulation function will then be used. */])
# Checks for header files. # Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS(limits.h sys/types.h sys/stat.h dirent.h) AC_CHECK_HEADERS(limits.h sys/types.h sys/stat.h dirent.h)
AC_CHECK_HEADERS([windows.h], [HAVE_WINDOWS_H=1]) AC_CHECK_HEADERS([windows.h], [HAVE_WINDOWS_H=1])
AC_CHECK_HEADERS([sys/wait.h], [HAVE_SYS_WAIT_H=1]) AC_CHECK_HEADERS([sys/wait.h], [HAVE_SYS_WAIT_H=1])