From 6a7620a2eeabf5500715b4a6ade4cfb92cc9dd0f Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Fri, 22 Feb 2008 02:43:14 +0000
Subject: [PATCH] 2008-02-22 03:42 UTC+0100 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/bin/hb-func.sh     * added -xhgtk switch
 for linking with xHGtk library

  * harbour/source/pp/hbppgen.c
  * harbour/utils/hbpp/hbpp.c
    ! added missing #include "hbset.h"
---
 harbour/ChangeLog           | 8 ++++++++
 harbour/bin/hb-func.sh      | 8 ++++++++
 harbour/source/pp/hbppgen.c | 1 +
 harbour/utils/hbpp/hbpp.c   | 1 +
 4 files changed, 18 insertions(+)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ddc5655b96..5aa80b6aa3 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-02-22 03:42 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/bin/hb-func.sh
+    * added -xhgtk switch for linking with xHGtk library
+
+  * harbour/source/pp/hbppgen.c
+  * harbour/utils/hbpp/hbpp.c
+    ! added missing #include "hbset.h"
+
 2008-02-22 00:20 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/rtl/cdpapi.c
     ! fixed unicode values for control codes in default CP437 unicode table
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index ac5df01149..879d7cf4ec 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -220,6 +220,7 @@ if [ \$# = 0 ]; then
                         # link with more GTs. The first one will be
                         #      the default at runtime
     -xbgtk              # link with xbgtk library (xBase GTK+ interface)
+    -xhgtk              # link with xHGtk library (GTK+ interface)
     -hwgui              # link with HWGUI library (GTK+ interface)
     -l<libname>         # link with <libname> library
     -L<libpath>         # additional path to search for libraries
@@ -270,6 +271,7 @@ HB_FM_REQ=""
 HB_STRIP="yes"
 HB_MAIN_FUNC=""
 HB_XBGTK=""
+HB_XHGTK=""
 HB_HWGUI=""
 HB_USRLIBS=""
 HB_USRLPATH=""
@@ -299,6 +301,7 @@ while [ \$n -lt \${#P[@]} ]; do
         -fullstatic) HB_STATIC="full" ;;
         -shared)     HB_STATIC="no" ;;
         -xbgtk)      HB_XBGTK="yes" ;;
+        -xhgtk)      HB_XHGTK="yes" ;;
         -hwgui)      HB_HWGUI="yes" ;;
         -mt)         HB_MT="MT" ;;
         -gt*)        HB_GT_REQ="\${HB_GT_REQ} \${v#-gt}" ;;
@@ -374,6 +377,8 @@ fi
 
 if [ "\${HB_XBGTK}" = "yes" ]; then
     SYSTEM_LIBS="\${SYSTEM_LIBS} \`pkg-config --libs gtk+-2.0\`"
+elif [ "\${HB_XHGTK}" = "yes" ]; then
+    SYSTEM_LIBS="\${SYSTEM_LIBS} \`pkg-config --libs gtk+-2.0 libglade-2.0\`"
 elif [ "\${HB_HWGUI}" = "yes" ]; then
     SYSTEM_LIBS="\${SYSTEM_LIBS} \`pkg-config --libs gtk+-2.0 --libs libgnomeprint-2.2\`"
 fi
@@ -437,6 +442,9 @@ if [ "\${HB_XBGTK}" = "yes" ]; then
     HARBOUR_LIBS="\${HARBOUR_LIBS} -lxbgtk"
     HB_PATHS="\${HB_PATHS} -I\`PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --variable=xbgtkincludedir xbgtk\`"
 fi
+if [ "\${HB_XHGTK}" = "yes" ]; then
+    HARBOUR_LIBS="\${HARBOUR_LIBS} -lxhgtk"
+fi
 if [ "\${HB_HWGUI}" = "yes" ]; then
     HARBOUR_LIBS="\${HARBOUR_LIBS} -lhwgui -lprocmisc -lhbxml"
 fi
diff --git a/harbour/source/pp/hbppgen.c b/harbour/source/pp/hbppgen.c
index 48b2a124f6..b802305914 100644
--- a/harbour/source/pp/hbppgen.c
+++ b/harbour/source/pp/hbppgen.c
@@ -53,6 +53,7 @@
  */
 
 #include "ppcore.c"
+#include "hbset.h"
 
 #if defined(__MINGW32CE__) || defined(HB_WINCE)
 #include <windows.h>
diff --git a/harbour/utils/hbpp/hbpp.c b/harbour/utils/hbpp/hbpp.c
index c0784e6009..e75ef4425e 100644
--- a/harbour/utils/hbpp/hbpp.c
+++ b/harbour/utils/hbpp/hbpp.c
@@ -69,6 +69,7 @@
 
 #include "hbppdef.h"
 #include "hbcomp.h"
+#include "hbset.h"
 
 extern int hb_pp_ParseDefine_( char * );