This file is part of MXE. See index.html for further information. Contains ad hoc patches for cross building. From 43bdcd7403f7e58f4da47a84a324ee02f80ba4c9 Mon Sep 17 00:00:00 2001 From: "a@a.org" Date: Mon, 24 Oct 2011 14:02:33 +0200 Subject: [PATCH 1/2] use unix style names for openssl on mingw-cross-env --- configure.in | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configure.in b/configure.in index ff0063d..c64b88e 100644 --- a/configure.in +++ b/configure.in @@ -943,13 +943,8 @@ fi if test "$with_openssl" = yes ; then dnl Order matters! - 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_library_init, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) - else - 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])]) fi if test "$with_pam" = yes ; then -- 1.7.9.2 From fc01a0853f56b3ce377e0b5fd461e3ee8a89877d Mon Sep 17 00:00:00 2001 From: "a@a.org" Date: Mon, 24 Oct 2011 14:09:38 +0200 Subject: [PATCH 2/2] do not check autoconf version --- configure.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.in b/configure.in index c64b88e..ee52a70 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.4], [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 -recommended. You can remove the check from 'configure.in' but it is then -your responsibility whether the result works or not.])]) AC_COPYRIGHT([Copyright (c) 1996-2011, PostgreSQL Global Development Group]) AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) -- 1.7.9.2