|
|
|
@ -3,17 +3,17 @@ See doc/index.html for further information.
|
|
|
|
|
|
|
|
|
|
Contains ad hoc patches for cross building.
|
|
|
|
|
|
|
|
|
|
From 778910e8d10e548c50abe80342490b8725ea6244 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 7985f049ed030c1f49927828a4b8e3d7552e52a4 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: mingw-cross-env
|
|
|
|
|
Date: Mon, 24 Oct 2011 14:02:33 +0200
|
|
|
|
|
Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
|
|
|
index 79b565d..db30511 100644
|
|
|
|
|
index 7c0e94e..2ee79c7 100644
|
|
|
|
|
--- a/configure.in
|
|
|
|
|
+++ b/configure.in
|
|
|
|
|
@@ -941,13 +941,8 @@ fi
|
|
|
|
|
@@ -943,13 +943,8 @@ fi
|
|
|
|
|
|
|
|
|
|
if test "$with_openssl" = yes ; then
|
|
|
|
|
dnl Order matters!
|
|
|
|
@ -21,8 +21,8 @@ index 79b565d..db30511 100644
|
|
|
|
|
- AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
|
|
|
|
|
- AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
|
|
|
|
|
- else
|
|
|
|
|
- AC_CHECK_LIB(eay32, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'eay32' is required for OpenSSL])])
|
|
|
|
|
- AC_CHECK_LIB(ssleay32, SSL_library_init, [], [AC_MSG_ERROR([library 'ssleay32' is required for OpenSSL])])
|
|
|
|
|
- AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
|
|
|
|
|
- AC_SEARCH_LIBS(SSL_library_init, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
|
|
|
|
|
- fi
|
|
|
|
|
+ AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
|
|
|
|
|
+ AC_CHECK_LIB(ssl, SSL_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
|
|
|
|
@ -30,22 +30,22 @@ index 79b565d..db30511 100644
|
|
|
|
|
|
|
|
|
|
if test "$with_pam" = yes ; then
|
|
|
|
|
--
|
|
|
|
|
1.7.7
|
|
|
|
|
1.7.9
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
From ebeea4b87a1b11205b5870e738882117ad0f628c Mon Sep 17 00:00:00 2001
|
|
|
|
|
From 9471812a4e7021fea291469d636bdeca6078c1e5 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: mingw-cross-env
|
|
|
|
|
Date: Mon, 24 Oct 2011 14:09:38 +0200
|
|
|
|
|
Subject: [PATCH 2/2] do not check autoconf version
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/configure.in b/configure.in
|
|
|
|
|
index db30511..4da0143 100644
|
|
|
|
|
index 2ee79c7..102b95b 100644
|
|
|
|
|
--- a/configure.in
|
|
|
|
|
+++ b/configure.in
|
|
|
|
|
@@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
|
|
|
|
|
|
|
|
|
|
AC_INIT([PostgreSQL], [9.1.1], [pgsql-bugs@postgresql.org])
|
|
|
|
|
AC_INIT([PostgreSQL], [9.1.3], [pgsql-bugs@postgresql.org])
|
|
|
|
|
|
|
|
|
|
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
|
|
|
|
|
-Untested combinations of 'autoconf' and PostgreSQL versions are not
|
|
|
|
@ -55,5 +55,5 @@ index db30511..4da0143 100644
|
|
|
|
|
AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
|
|
|
|
|
AC_CONFIG_AUX_DIR(config)
|
|
|
|
|
--
|
|
|
|
|
1.7.7
|
|
|
|
|
1.7.9
|
|
|
|
|
|
|
|
|
|