2012-12-01 12:17 UTC+0100 Viktor Szakats (harbour syenar.net)

* utils/hbmk2/hbmk2.prg
    + automatically define HBMK_HAS_<packagename> macro
      if a given package is linked or loaded when running
      as script. F.e. HBMK_HAS_HBGD. The macro will have
      the value zero if there is no version information
      about the package and it will be 0x010203 if there
      is, via .hbc version=x[.y[.z]] directive.

  * extras/httpsrv/modules/showcounter.prg
  * extras/httpsrv/modulesg.hbp
  * extras/httpsrv/uhttpd.prg
  * extras/httpsrv/uhttpdgd.hbp
    + use HBMK_HAS_* macro instead of manually rolled solution

harbour/extras/httpsrv/modules/showcounter.prg

@@ -50,13 +50,11 @@
  *
  */
 
-#if defined( GD_SUPPORT )
+#if defined( HBMK_HAS_HBGD )
 
 MEMVAR _SERVER // defined in uHTTPD
 MEMVAR _REQUEST // defined in uHTTPD
 
-#include "gd.ch"
-
 #define IMAGES_IN  ".." + hb_ps() + ".." + hb_ps() + ".." + hb_ps() + "contrib" + hb_ps() + "hbgd" + hb_ps() + "tests" + hb_ps() + "digits" + hb_ps()
 #define IMAGES_OUT ( _SERVER[ "DOCUMENT_ROOT" ] + hb_ps() + "counter" + hb_ps() )
 

harbour/extras/httpsrv/modulesg.hbp

@@ -3,4 +3,5 @@
 #
 
 @modules.hbp
-hbgd.hbc -DGD_SUPPORT
+
+hbgd.hbc

harbour/extras/httpsrv/uhttpd.prg

@@ -94,7 +94,7 @@ REQUEST __HB_EXTERN__
 
 #include "hbsocket.ch"
 
-#ifdef GD_SUPPORT
+#if defined( HBMK_HAS_HBGD )
 // adding GD support
 REQUEST GDIMAGE, GDIMAGECHAR, GDCHART
 #  define APP_GD_SUPPORT "_GD"

harbour/extras/httpsrv/uhttpdgd.hbp

@@ -4,4 +4,4 @@
 
 @uhttpd.hbp
 
-hbgd.hbc -DGD_SUPPORT
+hbgd.hbc