-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
15 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,18 @@ | ||
diff --git a/configure.ac b/configure.ac | ||
index fba79ee..4fadb94 100644 | ||
index 9a73f50..a35395e 100644 | ||
--- a/configure.ac | ||
+++ b/configure.ac | ||
@@ -19,7 +19,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros | ||
@@ -19,7 +19,8 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros | ||
|
||
AC_INIT([PostgreSQL], [15.2], [[email protected]], [], [https://www.postgresql.org/]) | ||
|
||
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. | ||
+cross_compiling=yes # Avoid conftest loading shared objects | ||
+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_warn([unsupported],[Autoconf version 2.69 is required. | ||
Untested combinations of 'autoconf' and PostgreSQL versions are not | ||
recommended. You can remove the check from 'configure.ac' but it is then | ||
your responsibility whether the result works or not.])]) | ||
@@ -1184,7 +1184,8 @@ if test "$enable_thread_safety" = yes; then | ||
@@ -1274,7 +1275,8 @@ if test "$enable_thread_safety" = yes; then | ||
fi | ||
|
||
if test "$with_readline" = yes; then | ||
|
@@ -21,7 +22,7 @@ index fba79ee..4fadb94 100644 | |
if test x"$pgac_cv_check_readline" = x"no"; then | ||
AC_MSG_ERROR([readline library not found | ||
If you have readline already installed, see config.log for details on the | ||
@@ -1194,7 +1195,7 @@ Use --without-readline to disable readline support.]) | ||
@@ -1284,7 +1286,7 @@ Use --without-readline to disable readline support.]) | ||
fi | ||
|
||
if test "$with_zlib" = yes; then | ||
|
@@ -30,7 +31,7 @@ index fba79ee..4fadb94 100644 | |
[AC_MSG_ERROR([zlib library not found | ||
If you have zlib already installed, see config.log for details on the | ||
failure. It is possible the compiler isn't looking in the proper directory. | ||
@@ -1243,6 +1244,9 @@ if test "$with_ssl" = openssl ; then | ||
@@ -1333,6 +1335,9 @@ if test "$with_ssl" = openssl ; then | ||
# Minimum required OpenSSL version is 1.0.1 | ||
AC_DEFINE(OPENSSL_API_COMPAT, [0x10001000L], | ||
[Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.]) | ||
|
@@ -40,15 +41,15 @@ index fba79ee..4fadb94 100644 | |
if test "$PORTNAME" != "win32"; then | ||
AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) | ||
AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) | ||
@@ -1250,6 +1254,7 @@ if test "$with_ssl" = openssl ; then | ||
@@ -1340,6 +1345,7 @@ if test "$with_ssl" = openssl ; then | ||
AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])]) | ||
AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])]) | ||
fi | ||
+ fi | ||
# Function introduced in OpenSSL 1.0.2. | ||
AC_CHECK_FUNCS([X509_get_signature_nid]) | ||
# Functions introduced in OpenSSL 1.1.0. We used to check for | ||
@@ -1365,15 +1365,18 @@ if test "$with_pam" = yes ; then | ||
@@ -1363,19 +1369,23 @@ if test "$with_pam" = yes ; then | ||
fi | ||
|
||
if test "$with_libxml" = yes ; then | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters