From 7947434d3abf009f422bd8a1de5366bf11b00500 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 31 May 2010 18:36:22 +0000
Subject: [PATCH] 2010-05-31 20:35 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   + contrib/hbtip/hbtip.hbp   + contrib/hbtip/hbtipssl.hbp     +
 Added hbtip hbmk2 make files.

  * contrib/hbssl/hbssl.hbp
  * contrib/hbssl/hbssls.hbp
  * contrib/hbssl/hbssl.h
  * contrib/hbssl/rand.c
    ! Fixed to avoid -U trick in build files.
      (static/dll flag reversion logic moved to .c level)

  * contrib/hbtip/Makefile
    * Formatting.
---
 harbour/ChangeLog                  | 15 +++++++++++++
 harbour/contrib/hbssl/hbssl.h      |  6 ++++++
 harbour/contrib/hbssl/hbssl.hbp    |  2 --
 harbour/contrib/hbssl/hbssls.hbp   |  2 +-
 harbour/contrib/hbssl/rand.c       |  2 ++
 harbour/contrib/hbtip/Makefile     |  2 +-
 harbour/contrib/hbtip/hbtip.hbp    | 34 ++++++++++++++++++++++++++++++
 harbour/contrib/hbtip/hbtipssl.hbp | 12 +++++++++++
 8 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 harbour/contrib/hbtip/hbtip.hbp
 create mode 100644 harbour/contrib/hbtip/hbtipssl.hbp

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 54cebe3985..e4ab22f1c6 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,21 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-31 20:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  + contrib/hbtip/hbtip.hbp
+  + contrib/hbtip/hbtipssl.hbp
+    + Added hbtip hbmk2 make files.
+
+  * contrib/hbssl/hbssl.hbp
+  * contrib/hbssl/hbssls.hbp
+  * contrib/hbssl/hbssl.h
+  * contrib/hbssl/rand.c
+    ! Fixed to avoid -U trick in build files.
+      (static/dll flag reversion logic moved to .c level)
+
+  * contrib/hbtip/Makefile
+    * Formatting.
+
 2010-05-31 19:47 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     + Added experimental support for filters containing string
diff --git a/harbour/contrib/hbssl/hbssl.h b/harbour/contrib/hbssl/hbssl.h
index be4c78ad95..5d01721a66 100644
--- a/harbour/contrib/hbssl/hbssl.h
+++ b/harbour/contrib/hbssl/hbssl.h
@@ -55,6 +55,12 @@
 
 #include "hbapi.h"
 
+#if defined( HB_OS_WIN )
+   #if ! defined( HB_OPENSSL_STATIC )
+      #define OPENSSL_OPT_WINDLL
+   #endif
+#endif
+
 #include <openssl/ssl.h>
 
 #include "hbssl.ch"
diff --git a/harbour/contrib/hbssl/hbssl.hbp b/harbour/contrib/hbssl/hbssl.hbp
index e9a87370f6..b0cc255896 100644
--- a/harbour/contrib/hbssl/hbssl.hbp
+++ b/harbour/contrib/hbssl/hbssl.hbp
@@ -28,8 +28,6 @@
 {darwin}-cflag=-DOPENSSL_NO_DGRAM
 {darwin}-cflag=-DHB_OPENSSL_OLD_OSX_
 
-{win|wce}-cflag=-DOPENSSL_OPT_WINDLL
-
 # Patent will expire in 2010/2011
 -cflag=-DOPENSSL_NO_IDEA
 
diff --git a/harbour/contrib/hbssl/hbssls.hbp b/harbour/contrib/hbssl/hbssls.hbp
index 5f442982d5..5a73be3f35 100644
--- a/harbour/contrib/hbssl/hbssls.hbp
+++ b/harbour/contrib/hbssl/hbssls.hbp
@@ -9,4 +9,4 @@ hbssl.hbp
 -o${hb_name}
 -workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
 
-{win|wce}-cflag=-UOPENSSL_OPT_WINDLL
+{win|wce}-cflag=-DHB_OPENSSL_STATIC
diff --git a/harbour/contrib/hbssl/rand.c b/harbour/contrib/hbssl/rand.c
index 5a2ed2f465..509027dc70 100644
--- a/harbour/contrib/hbssl/rand.c
+++ b/harbour/contrib/hbssl/rand.c
@@ -53,6 +53,8 @@
 #include "hbapi.h"
 #include "hbapierr.h"
 
+#include "hbssl.h"
+
 #include <openssl/rand.h>
 
 HB_FUNC( RAND_SEED )
diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile
index 80caf97dbf..3b464076a1 100644
--- a/harbour/contrib/hbtip/Makefile
+++ b/harbour/contrib/hbtip/Makefile
@@ -28,7 +28,7 @@ PRG_SOURCES := \
    popcli.prg \
    sendmail.prg \
    sessid.prg \
-   smtpcli.prg   \
+   smtpcli.prg \
    thtml.prg \
    url.prg \
 
diff --git a/harbour/contrib/hbtip/hbtip.hbp b/harbour/contrib/hbtip/hbtip.hbp
new file mode 100644
index 0000000000..dc4d436adc
--- /dev/null
+++ b/harbour/contrib/hbtip/hbtip.hbp
@@ -0,0 +1,34 @@
+#
+# $Id$
+#
+
+-hblib
+-inc
+-nohbc
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+-w3 -es2
+
+encb64c.c
+encurlc.c
+utils.c
+
+cgi.prg
+client.prg
+credent.prg
+encb64.prg
+encoder.prg
+encqp.prg
+encurl.prg
+ftpcli.prg
+httpcli.prg
+log.prg
+mail.prg
+popcli.prg
+sendmail.prg
+sessid.prg
+smtpcli.prg
+thtml.prg
+url.prg
diff --git a/harbour/contrib/hbtip/hbtipssl.hbp b/harbour/contrib/hbtip/hbtipssl.hbp
new file mode 100644
index 0000000000..61f252d541
--- /dev/null
+++ b/harbour/contrib/hbtip/hbtipssl.hbp
@@ -0,0 +1,12 @@
+#
+# $Id$
+#
+
+hbtip.hbp
+
+-o${hb_name}
+-workdir=${hb_work}/${hb_plat}/${hb_comp}/${hb_name}
+
+../../hbssl/hbssl.hbc
+
+-DHB_HAS_OPENSSL