From 9c07ce4cd2bb36f6315195d633e45a22405db7c5 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 29 Aug 2010 10:54:30 +0000
Subject: [PATCH] 2010-08-29 12:52 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbcurl/hbcurl.hbc     ! Fixed for mingw64     + Added
 libssh2 libs for win static mode.

  * contrib/hbtip/hbtip.hbc
    + hbtipssl can now be requested using HB_TIP_OPENSSL=yes

  * contrib/hbssl/hbssl.hbc
    + Updated static lib names.
---
 harbour/ChangeLog                 | 11 +++++++++++
 harbour/contrib/hbcurl/hbcurl.hbc |  9 +++++----
 harbour/contrib/hbssl/hbssl.hbc   |  5 +++--
 harbour/contrib/hbtip/hbtip.hbc   |  4 +++-
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f0e6f5cd0a..f14bafbf7e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,17 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-08-29 12:52 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbcurl/hbcurl.hbc
+    ! Fixed for mingw64
+    + Added libssh2 libs for win static mode.
+
+  * contrib/hbtip/hbtip.hbc
+    + hbtipssl can now be requested using HB_TIP_OPENSSL=yes
+
+  * contrib/hbssl/hbssl.hbc
+    + Updated static lib names.
+
 2010-08-28 13:08 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.pt_BR.po
   * utils/hbmk2/hbmk2.hu_HU.po
diff --git a/harbour/contrib/hbcurl/hbcurl.hbc b/harbour/contrib/hbcurl/hbcurl.hbc
index 4ccc0902b2..0c8b3e8c3d 100644
--- a/harbour/contrib/hbcurl/hbcurl.hbc
+++ b/harbour/contrib/hbcurl/hbcurl.hbc
@@ -7,10 +7,11 @@ incpaths=.
 {!HB_STATIC_CURL}libs=${hb_name}${__HB_DYN__}
 {HB_STATIC_CURL}libs=${hb_name}s${__HB_DYN__}
 
-{allwin&!mingw}libs=libcurl
 {!allwin}libs=curl
-{!HB_STATIC_CURL&mingw}libs=curldll
-{HB_STATIC_CURL&mingw}libs=curl
+{ allwin&!HB_STATIC_CURL&!allmingw}libs=libcurl
+{ allwin&!HB_STATIC_CURL& allmingw}libs=curldll
+{ allwin& HB_STATIC_CURL&!allmingw}libs=libcurl libssh2
+{ allwin& HB_STATIC_CURL& allmingw}libs=curl ssh2
 
 # NOTE: Static mode requires additional libs be linked:
-#       libssh2 and OpenSSL
+#       OpenSSL
diff --git a/harbour/contrib/hbssl/hbssl.hbc b/harbour/contrib/hbssl/hbssl.hbc
index 3514f1272f..3426c8b276 100644
--- a/harbour/contrib/hbssl/hbssl.hbc
+++ b/harbour/contrib/hbssl/hbssl.hbc
@@ -12,5 +12,6 @@ incpaths=.
 {unix}libs=ssl crypto
 {os2}libs=openssl ssl crypto libosslfips
 {!HB_STATIC_OPENSSL&win}libs=ssleay32 libeay32
-{HB_STATIC_OPENSSL&win&!mingw}libs=ssleay32 libeay32
-{HB_STATIC_OPENSSL&mingw}libs=ssl ssl32 crypto eay32
+{HB_STATIC_OPENSSL&win&!allmingw}libs=ssleay32 libeay32
+{HB_STATIC_OPENSSL&allmingw}libs=ssl crypto
+{HB_STATIC_OPENSSL&allwin}libs=crypt32
diff --git a/harbour/contrib/hbtip/hbtip.hbc b/harbour/contrib/hbtip/hbtip.hbc
index 29bd564988..aad66f2300 100644
--- a/harbour/contrib/hbtip/hbtip.hbc
+++ b/harbour/contrib/hbtip/hbtip.hbc
@@ -4,4 +4,6 @@
 
 incpaths=.
 
-libs=${hb_name}${__HB_DYN__}
+{!HB_TIP_OPENSSL|dos}libs=${hb_name}${__HB_DYN__}
+{HB_TIP_OPENSSL&!dos}libs=${hb_name}ssl${__HB_DYN__}
+{HB_TIP_OPENSSL&!dos}libs=../hbssl/hbssl.hbc