# HG changeset patch
# User Volker Grabsch <vog@notjusthosting.com>
# Date 1260541000 -3600
# Node ID 64f1de2933628ec444289dfa87b5d744bbbeacc5
# Parent  14274c6db4532e180e70b45d550682c8065f7ca2# Parent  226e462a8a734f35f374c5c5fe520c42a0e1f3b8
merge

diff -r 14274c6db453 -r 64f1de293362 src/postgresql.mk
--- a/src/postgresql.mk	Fri Dec 11 15:09:22 2009 +0100
+++ b/src/postgresql.mk	Fri Dec 11 15:16:40 2009 +0100
@@ -30,7 +30,7 @@
 $(PKG)_WEBSITE  := http://www.postgresql.org/
 $(PKG)_URL      := http://ftp2.nl.postgresql.org/source/v$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_URL_2    := http://ftp10.us.postgresql.org/postgresql/source/v$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc zlib readline
+$(PKG)_DEPS     := gcc zlib openssl readline
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/' | \
@@ -41,8 +41,14 @@
 endef
 
 define $(PKG)_BUILD
+    # The static OpenSSL libraries are in unix (not win32) naming style.
+    $(SED) 's,SSLEAY32,SSL,' -i '$(1)'/configure
+    $(SED) 's,ssleay32,ssl,' -i '$(1)'/configure
+    $(SED) 's,EAY32,CRYPTO,' -i '$(1)'/configure
+    $(SED) 's,eay32,crypto,' -i '$(1)'/configure
+    $(SED) 's,ssleay32,ssl,' -i '$(1)'/src/interfaces/libpq/Makefile
+    $(SED) 's,eay32,crypto,' -i '$(1)'/src/interfaces/libpq/Makefile
     # Since we build only client libary, use bogus tzdata to satisfy configure.
-    # We have to build the shared library, but we won't install it.
     cd '$(1)' && ./configure \
         --prefix='$(PREFIX)/$(TARGET)' \
         --host='$(TARGET)' \
@@ -56,14 +62,14 @@
         --without-pam \
         --without-ldap \
         --without-bonjour \
-        --without-openssl \
+        --with-openssl \
         --with-readline \
         --without-ossp-uuid \
         --without-libxml \
         --without-libxslt \
         --with-zlib \
         --with-system-tzdata=/dev/null \
-        LIBS='-lsecur32'
+        LIBS='-lsecur32 -lws2_32 -lgdi32'
     $(MAKE) -C '$(1)'/src/interfaces/libpq -j '$(JOBS)' install haslibarule= shlib=
     $(MAKE) -C '$(1)'/src/port             -j '$(JOBS)'         haslibarule= shlib=
     $(MAKE) -C '$(1)'/src/bin/psql         -j '$(JOBS)' install haslibarule= shlib=