From 31d0d15e4d53c0fc5a4cc4d336caf217c2385207 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 5 Nov 2010 18:22:39 +0000
Subject: [PATCH] 2010-11-05 19:21 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * utils/hbmk2/hbmk2.prg     ! Fixed bad typo in watcom platform
 redetection. win was misdetected       as dos. (this fixes expat watcom
 build)     + Added experimental -depcontrol=<name>:strict:/opt/mingw/include 
      option, which will make the given path the only one where header      
 detection is done.

  * contrib/hbexpat/3rd/expat/expat.hbp
    ! Deleted unnecessary input files.
    ! Fixed os2 build by setting HAVE_MEMMOVE.
---
 harbour/ChangeLog                           | 12 +++++++
 harbour/contrib/hbexpat/3rd/expat/expat.hbp |  3 +-
 harbour/utils/hbmk2/hbmk2.prg               | 35 ++++++++++++---------
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index df6428d2c9..3c8920705f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-05 19:21 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/hbmk2.prg
+    ! Fixed bad typo in watcom platform redetection. win was misdetected
+      as dos. (this fixes expat watcom build)
+    + Added experimental -depcontrol=<name>:strict:/opt/mingw/include
+      option, which will make the given path the only one where header
+      detection is done.
+
+  * contrib/hbexpat/3rd/expat/expat.hbp
+    ! Deleted unnecessary input files.
+    ! Fixed os2 build by setting HAVE_MEMMOVE.
+
 2010-11-05 18:11 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbexpat/hbexpat.hbp
   * contrib/hbexpat/hbexpat.hbc
diff --git a/harbour/contrib/hbexpat/3rd/expat/expat.hbp b/harbour/contrib/hbexpat/3rd/expat/expat.hbp
index 906fe6244c..b53e6a6072 100644
--- a/harbour/contrib/hbexpat/3rd/expat/expat.hbp
+++ b/harbour/contrib/hbexpat/3rd/expat/expat.hbp
@@ -14,11 +14,10 @@
 xmlparse.c
 xmlrole.c
 xmltok.c
-xmltok_i.c
-xmltok_n.c
 
 {hblib}-cflag=-DXML_STATIC
 {allwin}-cflag=-DCOMPILED_FROM_DSP
+{os2}-cflag=-DHAVE_MEMMOVE
 {bcc}-cflag=-w-8057
 {bcc}-cflag=-w-8008
 {bcc}-cflag=-w-8066
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index ce432d4822..2b8666139b 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -1619,6 +1619,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
                            CASE FindInPath( "dirent.h", GetEnv( "INCLUDE" ) ) != NIL
                               hbmk[ _HBMK_cPLAT ] := "linux"
                            CASE FindInPath( "windows.h", GetEnv( "INCLUDE" ) ) != NIL
+                              hbmk[ _HBMK_cPLAT ] := "win"
+                           OTHERWISE
                               hbmk[ _HBMK_cPLAT ] := "dos"
                            ENDCASE
                         ENDIF
@@ -7125,6 +7127,7 @@ STATIC FUNCTION dep_split_arg( hbmk, cParam, /* @ */ cName, /* @ */ cData )
 STATIC PROCEDURE dep_postprocess( hbmk )
    LOCAL dep
    LOCAL tmp
+   LOCAL cControlL
 
    FOR EACH dep IN hbmk[ _HBMK_hDEP ]
 
@@ -7139,9 +7142,11 @@ STATIC PROCEDURE dep_postprocess( hbmk )
          dep[ _HBMKDEP_cControl ] := GetEnv( _HBMK_WITH_PREF + StrToDefine( dep:__enumKey() ) )
       ENDIF
 
-      SWITCH Lower( dep[ _HBMKDEP_cControl ] )
-      CASE "no"
-         dep[ _HBMKDEP_cControl ] := Lower( dep[ _HBMKDEP_cControl ] )
+      cControlL := Lower( dep[ _HBMKDEP_cControl ] )
+
+      DO CASE
+      CASE cControlL == "no"
+         dep[ _HBMKDEP_cControl ] := cControlL
          dep[ _HBMKDEP_aKeyHeader ] := {}
          dep[ _HBMKDEP_aPKG ] := {}
          dep[ _HBMKDEP_aINCPATH ] := {}
@@ -7149,18 +7154,19 @@ STATIC PROCEDURE dep_postprocess( hbmk )
          dep[ _HBMKDEP_aIMPLIBSRC ] := {}
          dep[ _HBMKDEP_cIMPLIBDST ] := NIL
          dep[ _HBMKDEP_lForced ] := .T.
-         EXIT
-      CASE "local"
-         dep[ _HBMKDEP_cControl ] := Lower( dep[ _HBMKDEP_cControl ] )
+      CASE cControlL == "local"
+         dep[ _HBMKDEP_cControl ] := cControlL
          dep[ _HBMKDEP_aINCPATH ] := {}
-         EXIT
-      CASE "nolocal"
-         dep[ _HBMKDEP_cControl ] := Lower( dep[ _HBMKDEP_cControl ] )
+      CASE cControlL == "nolocal"
+         dep[ _HBMKDEP_cControl ] := cControlL
          dep[ _HBMKDEP_aINCPATHLOCAL ] := {}
-         EXIT
-      CASE "yes" /* do nothing */
-         EXIT
-      CASE "force"
+      CASE Left( cControlL, Len( "strict:" ) ) == "strict:"
+         dep[ _HBMKDEP_cControl ] := cControlL
+         dep[ _HBMKDEP_aINCPATH ] := { SubStr( dep[ _HBMKDEP_cControl ], Len( "strict:" ) + 1 ) }
+         dep[ _HBMKDEP_aINCPATHLOCAL ] := {}
+      CASE cControlL == "yes"
+         /* do nothing */
+      CASE cControlL == "force"
          dep[ _HBMKDEP_aKeyHeader ] := {}
          dep[ _HBMKDEP_aPKG ] := {}
          dep[ _HBMKDEP_aINCPATH ] := {}
@@ -7170,7 +7176,6 @@ STATIC PROCEDURE dep_postprocess( hbmk )
          dep[ _HBMKDEP_lFoundLOCAL ] := .F.
          dep[ _HBMKDEP_lForced ] := .T.
          AAdd( hbmk[ _HBMK_aOPTC ], "-D" + _HBMK_HAS_PREF + StrToDefine( dep:__enumKey() ) )
-         EXIT
       OTHERWISE
          /* If control is not a recognized control keyword, interpret it
             as a header search path and add it to the search path list
@@ -7181,7 +7186,7 @@ STATIC PROCEDURE dep_postprocess( hbmk )
                EXIT
             ENDIF
          NEXT
-      ENDSWITCH
+      ENDCASE
    NEXT
 
    RETURN