From 0593b0ede5aebbd066b5c8646bd6b58b867c3a5c Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 31 May 2010 19:00:30 +0000
Subject: [PATCH] 2010-05-31 20:59 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbtip/hbtipssl/Makefile   * contrib/hbtip/Makefile    
 + Always create hbtipssl. (not just when       openssl is detected)

  * config/detect.mk
  * contrib/hbssl/hbssls/Makefile
  * contrib/hbssl/Makefile
    * Moved openssl detection from central (core) location
      to hbssl lib.
    ! Fixed hbssl GNU Make files after recent change in
      static/dynamic selection.
---
 harbour/ChangeLog                       | 14 ++++++++++++++
 harbour/config/detect.mk                | 12 ------------
 harbour/contrib/hbssl/Makefile          | 13 ++++++++++---
 harbour/contrib/hbssl/hbssls/Makefile   |  2 ++
 harbour/contrib/hbtip/Makefile          |  8 +++-----
 harbour/contrib/hbtip/hbtipssl/Makefile | 11 +++--------
 6 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index e4ab22f1c6..ef631d8156 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-31 20:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbtip/hbtipssl/Makefile
+  * contrib/hbtip/Makefile
+    + Always create hbtipssl. (not just when
+      openssl is detected)
+
+  * config/detect.mk
+  * contrib/hbssl/hbssls/Makefile
+  * contrib/hbssl/Makefile
+    * Moved openssl detection from central (core) location
+      to hbssl lib.
+    ! Fixed hbssl GNU Make files after recent change in
+      static/dynamic selection.
+
 2010-05-31 20:35 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   + contrib/hbtip/hbtip.hbp
   + contrib/hbtip/hbtipssl.hbp
diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk
index 502947f582..5a910ac812 100644
--- a/harbour/config/detect.mk
+++ b/harbour/config/detect.mk
@@ -66,18 +66,6 @@ _DET_INC_HEAD := /pcre.h
 
 include $(TOP)$(ROOT)config/detfun.mk
 
-# Detect OpenSSL
-
-_DET_DSP_NAME := openssl
-_DET_VAR_INC_ := HB_INC_OPENSSL
-_DET_VAR_HAS_ := HB_HAS_OPENSSL
-_DET_FLT_PLAT := !wce
-_DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /usr/local/include /usr/local/ssl/include /boot/common/include
-_DET_INC_HEAD := /openssl/ssl.h
-
-include $(TOP)$(ROOT)config/detfun.mk
-
 # Detect GPM mouse
 
 _DET_DSP_NAME := gpm
diff --git a/harbour/contrib/hbssl/Makefile b/harbour/contrib/hbssl/Makefile
index ceadb56f4b..02460a2ed7 100644
--- a/harbour/contrib/hbssl/Makefile
+++ b/harbour/contrib/hbssl/Makefile
@@ -28,15 +28,22 @@ C_SOURCES := \
 PRG_HEADERS := \
    hbssl.ch \
 
+_DET_DSP_NAME := openssl
+_DET_VAR_INC_ := HB_INC_OPENSSL
+_DET_VAR_HAS_ := HB_HAS_OPENSSL
+_DET_FLT_PLAT := !wce
+_DET_FLT_COMP :=
+_DET_INC_DEFP := /usr/include /usr/local/include /usr/local/ssl/include /boot/common/include
+_DET_INC_HEAD := /openssl/ssl.h
+
+include $(TOP)$(ROOT)config/detfun.mk
+
 ifneq ($(HB_HAS_OPENSSL),)
 
    HB_CFLAGS += $(foreach d,$(HB_HAS_OPENSSL),-I$(d))
    ifeq ($(HB_PLATFORM),darwin)
       HB_CFLAGS += -DOPENSSL_NO_SHA256 -DOPENSSL_NO_SHA512 -DOPENSSL_NO_CAMELLIA -DOPENSSL_NO_SEED -DOPENSSL_NO_DGRAM -DHB_OPENSSL_OLD_OSX_
    endif
-   ifneq ($(filter $(HB_PLATFORM),win wce),)
-      HB_CFLAGS += -DOPENSSL_OPT_WINDLL
-   endif
    # Patent will expire in 2010/2011
    HB_CFLAGS += -DOPENSSL_NO_IDEA
 
diff --git a/harbour/contrib/hbssl/hbssls/Makefile b/harbour/contrib/hbssl/hbssls/Makefile
index 373728c777..3a2029bacc 100644
--- a/harbour/contrib/hbssl/hbssls/Makefile
+++ b/harbour/contrib/hbssl/hbssls/Makefile
@@ -31,6 +31,8 @@ ifneq ($(HB_HAS_OPENSSL),)
 
    HB_CFLAGS += $(foreach d,$(HB_HAS_OPENSSL),-I$(d))
 
+   HB_CFLAGS += -DHB_OPENSSL_STATIC
+
    # Patent will expire in 2010/2011
    HB_CFLAGS += -DOPENSSL_NO_IDEA
 
diff --git a/harbour/contrib/hbtip/Makefile b/harbour/contrib/hbtip/Makefile
index 3b464076a1..a679e3e213 100644
--- a/harbour/contrib/hbtip/Makefile
+++ b/harbour/contrib/hbtip/Makefile
@@ -36,10 +36,8 @@ PRG_HEADERS := \
    thtml.ch \
    tip.ch \
 
+DIRS := hbtipssl
+
 include $(TOP)$(ROOT)config/header.mk
 include $(TOP)$(ROOT)config/lib.mk
-
-ifneq ($(HB_HAS_OPENSSL),)
-   DIRS := hbtipssl
-   include $(TOP)$(ROOT)config/dir.mk
-endif
+include $(TOP)$(ROOT)config/dir.mk
diff --git a/harbour/contrib/hbtip/hbtipssl/Makefile b/harbour/contrib/hbtip/hbtipssl/Makefile
index e19fe9cc5e..35299f917e 100644
--- a/harbour/contrib/hbtip/hbtipssl/Makefile
+++ b/harbour/contrib/hbtip/hbtipssl/Makefile
@@ -35,12 +35,7 @@ PRG_SOURCES := \
    thtml.prg \
    url.prg \
 
-ifneq ($(HB_HAS_OPENSSL),)
+HB_PRGFLAGS += -DHB_HAS_OPENSSL
+HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbssl
 
-   HB_PRGFLAGS += -DHB_HAS_OPENSSL
-   HB_INC_DEPEND := -I$(TOP)$(ROOT)contrib/hbssl
-
-   include $(TOP)$(ROOT)config/lib.mk
-else
-   include $(TOP)$(ROOT)config/none.mk
-endif
+include $(TOP)$(ROOT)config/lib.mk