summaryrefslogtreecommitdiffstats
path: root/src/postgresql-1-fixes.patch
blob: 0be138e1c19ed3859ebb7a4fb5d8f828f8479730 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
This file is part of mingw-cross-env.
See doc/index.html for further information.

Contains ad hoc patches for cross building.

From 778910e8d10e548c50abe80342490b8725ea6244 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
--- a/configure.in
+++ b/configure.in
@@ -941,13 +941,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_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])])
-  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.7


From ebeea4b87a1b11205b5870e738882117ad0f628c 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
--- 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])
 
-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.7