From 03d182ec3ff6f1f57a6a15369c2c802e36ca8a0e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 30 Jul 2012 10:46:56 +0000
Subject: [PATCH] 2012-07-30 12:43 UTC+0200 Viktor Szakats (harbour syenar.net)
   * contrib/hbhttpd/hbhttpd.hbc     + added comment about HB_HTTPD_OPENSSL
 (similar purpose       as HB_TIP_OPENSSL)

  * utils/hbmk2/hbmk2.prg
    + added env= .hbc command to be able to control envars
      also from .hbc files.

  - contrib/hbhttpd/hbhttpds.hbc
  - contrib/hbtip/hbtipssl.hbc
    - deleted alternate .hbc files that enabled OpenSSL
      flavor of these libs. Autofind didn't work with these.
      Use HB_[HTTPD|TIP]_OPENSSL=yes envvar setting to enable
      these. You can use -env: hbmk2 option or env= .hbc
      command to enable it, so f.e. hbtipssl.hbc can be
      emulated by this .hbc file:
      -- hbtipssl.hbc
         env=HB_TIP_OPENSSL=yes
         hbtip.hbc
      --
---
 harbour/ChangeLog                    | 22 ++++++++++++++++++++++
 harbour/contrib/hbhttpd/hbhttpd.hbc  |  3 +++
 harbour/contrib/hbhttpd/hbhttpds.hbc | 11 -----------
 harbour/contrib/hbtip/hbtipssl.hbc   |  8 --------
 harbour/utils/hbmk2/hbmk2.prg        |  4 ++++
 5 files changed, 29 insertions(+), 19 deletions(-)
 delete mode 100644 harbour/contrib/hbhttpd/hbhttpds.hbc
 delete mode 100644 harbour/contrib/hbtip/hbtipssl.hbc

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f7f73d4718..f473b40539 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,28 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-07-30 12:43 UTC+0200 Viktor Szakats (harbour syenar.net)
+  * contrib/hbhttpd/hbhttpd.hbc
+    + added comment about HB_HTTPD_OPENSSL (similar purpose
+      as HB_TIP_OPENSSL)
+
+  * utils/hbmk2/hbmk2.prg
+    + added env= .hbc command to be able to control envars
+      also from .hbc files.
+
+  - contrib/hbhttpd/hbhttpds.hbc
+  - contrib/hbtip/hbtipssl.hbc
+    - deleted alternate .hbc files that enabled OpenSSL
+      flavor of these libs. Autofind didn't work with these.
+      Use HB_[HTTPD|TIP]_OPENSSL=yes envvar setting to enable
+      these. You can use -env: hbmk2 option or env= .hbc
+      command to enable it, so f.e. hbtipssl.hbc can be
+      emulated by this .hbc file:
+      -- hbtipssl.hbc
+         env=HB_TIP_OPENSSL=yes
+         hbtip.hbc
+      --
+
 2012-07-30 12:24 UTC+0200 Viktor Szakats (harbour syenar.net)
   * package/winuni/mpkg_win_uni.bat
   * utils/hbmk2/hbmk2.prg
diff --git a/harbour/contrib/hbhttpd/hbhttpd.hbc b/harbour/contrib/hbhttpd/hbhttpd.hbc
index 209824690e..c3a795aa17 100644
--- a/harbour/contrib/hbhttpd/hbhttpd.hbc
+++ b/harbour/contrib/hbhttpd/hbhttpd.hbc
@@ -2,6 +2,9 @@
 # $Id$
 #
 
+# Set HB_HTTPD_OPENSSL envvar to 'yes' or use -env:HB_HTTPD_OPENSSL=yes
+# hbmk2 option to switch to the SSL-enabled version of this library.
+
 incpaths=.
 
 {!HB_HTTPD_OPENSSL|dos}libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
diff --git a/harbour/contrib/hbhttpd/hbhttpds.hbc b/harbour/contrib/hbhttpd/hbhttpds.hbc
deleted file mode 100644
index e41928eded..0000000000
--- a/harbour/contrib/hbhttpd/hbhttpds.hbc
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id$
-#
-
-incpaths=.
-
-libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
-
-mt=yes
-
-libs=hbssl.hbc
diff --git a/harbour/contrib/hbtip/hbtipssl.hbc b/harbour/contrib/hbtip/hbtipssl.hbc
deleted file mode 100644
index fe4d106367..0000000000
--- a/harbour/contrib/hbtip/hbtipssl.hbc
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# $Id$
-#
-
-incpaths=.
-
-libs=${_HB_DYNPREF}${hb_name}${_HB_DYNSUFF}
-libs=hbssl.hbc
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index b5e1c9011c..9907a57240 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -10017,6 +10017,10 @@ STATIC FUNCTION HBC_ProcessOne( hbmk, cFileName, nNestingLevel )
             ENDIF
          ENDIF
 
+      CASE Lower( Left( cLine, Len( "env="          ) ) ) == "env="          ; cLine := SubStr( cLine, Len( "env="          ) + 1 )
+
+         ProcEnvOption( cLine )
+
       CASE Lower( Left( cLine, Len( "deppkgname="   ) ) ) == "deppkgname="   ; cLine := SubStr( cLine, Len( "deppkgname="   ) + 1 )
 
          IF dep_split_arg( hbmk, cLine, @cName, @cLine )