From 4bcee3a895aabf092d1814d56e8095872b8084f9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 28 Feb 2011 19:02:16 +0000
Subject: [PATCH] 2011-02-28 20:00 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbmzip/hbmzip.hbp     * Changed header used for
 minizip autodetection.       zip.h is also used by component named libzip.   
    Thanks to Przemek for the hint.       [ looking for multiple headers
 (possibly connected by various       bool operators) is too huge work for so
 far too little gain, so       for now I pass it.]

  * contrib/hbrun/hbrun.prg
    + Use HB_GTI_FULLSCREEN to detect if the GT is capable of non-console
      mode of operation (formely hard-wired check for GTCGI was done).
      Pls verify me.

  * config/postinst.hbs
    + Show msg that postinst.hbs is finished (and errlev) [Tamas]
---
 harbour/ChangeLog                 | 17 +++++++++++++++++
 harbour/config/postinst.hbs       |  3 +++
 harbour/contrib/hbmzip/hbmzip.hbp |  4 +++-
 harbour/contrib/hbrun/hbrun.prg   |  4 ++--
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c5b99c12f0..5cdb7c654f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,23 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-28 20:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbmzip/hbmzip.hbp
+    * Changed header used for minizip autodetection.
+      zip.h is also used by component named libzip.
+      Thanks to Przemek for the hint.
+      [ looking for multiple headers (possibly connected by various
+      bool operators) is too huge work for so far too little gain, so
+      for now I pass it.]
+
+  * contrib/hbrun/hbrun.prg
+    + Use HB_GTI_FULLSCREEN to detect if the GT is capable of non-console
+      mode of operation (formely hard-wired check for GTCGI was done).
+      Pls verify me.
+
+  * config/postinst.hbs
+    + Show msg that postinst.hbs is finished (and errlev) [Tamas]
+
 2011-02-28 18:12 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/utils/hbmk2/Makefile
     ! fixed list of linked libraries - hbpp and hbcommon libs were
diff --git a/harbour/config/postinst.hbs b/harbour/config/postinst.hbs
index 7e255c03f5..12054f4806 100644
--- a/harbour/config/postinst.hbs
+++ b/harbour/config/postinst.hbs
@@ -327,6 +327,9 @@ PROCEDURE Main( ... )
       mk_extern_core()
    ENDIF
 
+   OutStd( "! postinst.hbs finished" + ;
+      iif( nErrorLevel == 0, "", " with with errorlevel=" + hb_ntos( nErrorLevel ) ) + hb_eol() )
+
    ErrorLevel( nErrorLevel )
 
    RETURN
diff --git a/harbour/contrib/hbmzip/hbmzip.hbp b/harbour/contrib/hbmzip/hbmzip.hbp
index 3b1e5273ec..bd24b914ad 100644
--- a/harbour/contrib/hbmzip/hbmzip.hbp
+++ b/harbour/contrib/hbmzip/hbmzip.hbp
@@ -9,7 +9,9 @@
 
 -w3 -es2
 
--depkeyhead=minizip:zip.h
+# component named libzip also has a header
+# named zip.h, so we look for unzip.h to detect minizip
+-depkeyhead=minizip:unzip.h
 -depcontrol=minizip:local{HB_BUILD_3RDEXT='no'}
 -depcontrol=minizip:${HB_WITH_MINIZIP}
 -depincpath=minizip:/usr/include
diff --git a/harbour/contrib/hbrun/hbrun.prg b/harbour/contrib/hbrun/hbrun.prg
index 349f9c2f63..faa91c894d 100644
--- a/harbour/contrib/hbrun/hbrun.prg
+++ b/harbour/contrib/hbrun/hbrun.prg
@@ -337,8 +337,8 @@ STATIC PROCEDURE hbrun_Prompt( aParams, cCommand )
    LOCAL cDomain := ""
    LOCAL tmp
 
-   IF hb_gtVersion( 0 ) == "CGI"
-      OutErr( "hbrun: Error: Interactive session not possible with GTCGI terminal driver" + hb_eol() )
+   IF ! hb_gtInfo( HB_GTI_FULLSCREEN )
+      OutErr( "hbrun: Error: Interactive session not possible with " + hb_gtVersion( 0 ) + " terminal driver" + hb_eol() )
       RETURN
    ENDIF