[Pcre-svn] [1297] code/trunk: Update configure.ac for latest…

Page principale
Supprimer ce message
Auteur: Subversion repository
Date:  
À: pcre-svn
Sujet: [Pcre-svn] [1297] code/trunk: Update configure.ac for latest version of autoconf.
Revision: 1297
          http://www.exim.org/viewvc/pcre2?view=rev&revision=1297
Author:   ph10
Date:     2021-02-02 17:02:55 +0000 (Tue, 02 Feb 2021)
Log Message:
-----------
Update configure.ac for latest version of autoconf.


Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/configure.ac


Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2021-02-02 09:24:05 UTC (rev 1296)
+++ code/trunk/ChangeLog    2021-02-02 17:02:55 UTC (rev 1297)
@@ -25,7 +25,13 @@
   (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.


+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
------------------------------


Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac    2021-02-02 09:24:05 UTC (rev 1296)
+++ code/trunk/configure.ac    2021-02-02 17:02:55 UTC (rev 1297)
@@ -22,8 +22,8 @@
 # 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.


-AC_PREREQ(2.57)
-AC_INIT(PCRE2, pcre2_major.pcre2_minor[]pcre2_prerelease, , pcre2)
+AC_PREREQ([2.70])
+AC_INIT([PCRE2],pcre2_major.pcre2_minor[]pcre2_prerelease,[],[pcre2])
AC_CONFIG_SRCDIR([src/pcre2.h.in])
AM_INIT_AUTOMAKE([dist-bzip2 dist-zip])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@@ -64,8 +64,7 @@
AC_TYPE_INT64_T

AC_PROG_INSTALL
-AC_LIBTOOL_WIN32_DLL
-LT_INIT
+LT_INIT([win32-dll])
AC_PROG_LN_S

 # Check for GCC visibility feature
@@ -424,7 +423,7 @@
   anycrlf) ac_pcre2_newline_value=5 ;;
   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


@@ -453,7 +452,7 @@
case "$with_link_size" in
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

@@ -486,7 +485,6 @@
sure both macros are undefined; an emulation function will then be used. */])

# Checks for header files.
-AC_HEADER_STDC
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([sys/wait.h], [HAVE_SYS_WAIT_H=1])