From 973275223a424d92b77519ce817d80bb278586c3 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 4 Jan 2010 17:42:28 +0000
Subject: [PATCH] 2010-01-04 18:39 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)    * contrib/hbgd/hbgd.hbc    + examples/httpsrv/modulesg.hbp    *
 examples/httpsrv/uhttpdgd.hbp    * examples/httpsrv/readme.txt      * Merged
 gd linking logic from uhttpdgd.hbp to hbgd.hbc.        (contains little hack,
 too) (untested)      + Added .hbp file to build GD enabled modules.      *
 Modified readme to reflect above change.      + Changed .hbp files to use
 hbgd.hbc and hbct.hbc to        build with hbgd and hbct libs. This is much
 better        method, since hbmk2 will locate them automatically        plus
 set header path as well.

---
 harbour/ChangeLog                     | 14 ++++++++++++++
 harbour/contrib/hbgd/hbgd.hbc         |  3 +++
 harbour/examples/httpsrv/modulesg.hbp |  6 ++++++
 harbour/examples/httpsrv/readme.txt   |  6 ++----
 harbour/examples/httpsrv/uhttpdgd.hbp |  7 ++-----
 5 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 harbour/examples/httpsrv/modulesg.hbp

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a144cd67a5..fa775c9764 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,20 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-04 18:39 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * contrib/hbgd/hbgd.hbc
+   + examples/httpsrv/modulesg.hbp
+   * examples/httpsrv/uhttpdgd.hbp
+   * examples/httpsrv/readme.txt
+     * Merged gd linking logic from uhttpdgd.hbp to hbgd.hbc.
+       (contains little hack, too) (untested)
+     + Added .hbp file to build GD enabled modules.
+     * Modified readme to reflect above change.
+     + Changed .hbp files to use hbgd.hbc and hbct.hbc to
+       build with hbgd and hbct libs. This is much better
+       method, since hbmk2 will locate them automatically
+       plus set header path as well.
+
 2010-01-04 08:33 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/resources/selectionlist.ui
     ! A little less-height window.
diff --git a/harbour/contrib/hbgd/hbgd.hbc b/harbour/contrib/hbgd/hbgd.hbc
index 009732894b..de734dd4f3 100644
--- a/harbour/contrib/hbgd/hbgd.hbc
+++ b/harbour/contrib/hbgd/hbgd.hbc
@@ -7,3 +7,6 @@ incpaths=.
 libs=hbgd
 {win}libs=bgd
 {linux}libs=gdlib png jpeg freetype m
+{darwin}libs=gd
+
+-L/opt/local/lib{darwin}
diff --git a/harbour/examples/httpsrv/modulesg.hbp b/harbour/examples/httpsrv/modulesg.hbp
new file mode 100644
index 0000000000..cddcdd7b28
--- /dev/null
+++ b/harbour/examples/httpsrv/modulesg.hbp
@@ -0,0 +1,6 @@
+#
+# $Id$
+#
+
+@modules.hbp
+hbgd.hbc -DGD_SUPPORT
diff --git a/harbour/examples/httpsrv/readme.txt b/harbour/examples/httpsrv/readme.txt
index 5b8da23860..a937f03b3f 100644
--- a/harbour/examples/httpsrv/readme.txt
+++ b/harbour/examples/httpsrv/readme.txt
@@ -4,16 +4,14 @@
 
 uHTTPD micro web server
 
-Build it without GD: hbmk2 uhttpd.hbp
-Build it with    GD: hbmk2 uhttpdgd.hbp
+Build it without GD: hbmk2 uhttpd.hbp   modules.hbp
+Build it with    GD: hbmk2 uhttpdgd.hbp modulesg.hbp
   [ This one needs bgd.dll. Please download it from:
   http://www.libgd.org/releases/gd-latest-win32.zip ]
 
 To see accepted parameters run: uhttpd -?
 Parameters can also be defined using uhttpd.ini file.
 
-Before starting please build modules using: hbmk2 modules.hbp
-
 Once started connect to uhttpd using:
 http://localhost:8082
 to see default index page.
diff --git a/harbour/examples/httpsrv/uhttpdgd.hbp b/harbour/examples/httpsrv/uhttpdgd.hbp
index 8d9b592740..3c62a4a3d7 100644
--- a/harbour/examples/httpsrv/uhttpdgd.hbp
+++ b/harbour/examples/httpsrv/uhttpdgd.hbp
@@ -3,8 +3,5 @@
 #
 
 @uhttpd.hbp
--DGD_SUPPORT
--lhbgd -lhbct
--lbgd{win}
--lgd{!win}
--L/opt/local/lib{darwin}
+hbgd.hbc -DGD_SUPPORT
+hbct.hbc