From ec4af7032d89d1e69fec3c4afb2836693b852ae9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 27 Aug 2009 06:46:44 +0000
Subject: [PATCH] 2009-08-27 08:45 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * mpkg_deb.sh   * mpkg_tgz.sh   * bin/hb-func.sh   *
 harbour.spec     + HB_GPM_MOUSE -> HB_INC_GPM and HB_HAS_GPM depending on
 whether       it's a config var or a reaction to config (in postinst)      
 I've left some value in hbmk script which may need further       attention.  
     I didn't test these changes, please do.

---
 harbour/ChangeLog      | 11 +++++++++++
 harbour/bin/hb-func.sh | 12 ++++++------
 harbour/harbour.spec   |  2 +-
 harbour/mpkg_deb.sh    |  6 +++---
 harbour/mpkg_tgz.sh    | 12 ++++++------
 5 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 99b217bc24..21b3ff2c00 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-27 08:45 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * mpkg_deb.sh
+  * mpkg_tgz.sh
+  * bin/hb-func.sh
+  * harbour.spec
+    + HB_GPM_MOUSE -> HB_INC_GPM and HB_HAS_GPM depending on whether
+      it's a config var or a reaction to config (in postinst)
+      I've left some value in hbmk script which may need further
+      attention.
+      I didn't test these changes, please do.
+
 2009-08-27 08:39 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/detfun.mk
     + Accept 'yes' for HB_INC_* variables. Same meaning as leaving
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 8da84566a8..0b40e45c16 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -260,7 +260,7 @@ mk_hbtools()
     if [ -n "${CC_HB_USER_LIBS}" ]; then
         echo "libs=${hb_mkdef}${CC_HB_USER_LIBS}">> ${hb_hbmkcfg}
     fi
-    if [ "${HB_GPM_MOUSE}" = "yes" ]; then
+    if [ -n "${HB_HAS_GPM}" ]; then
         echo "libs=${hb_mkdef}gpm">> ${hb_hbmkcfg}
     fi
 
@@ -354,14 +354,14 @@ HB_STATIC="${hb_static}"
 HB_MT=""
 HB_GT="${HB_GT_LIB#gt}"
 
-if [ -z "$HB_GPM_MOUSE" ]; then
+if [ -z "$HB_INC_GPM" ]; then
     if [ "$HB_PLATFORM" = "linux" ] && \
        ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then
-        HB_GPM_MOUSE=yes
+        HB_INC_GPM=yes
     else
-        HB_GPM_MOUSE=no
+        HB_INC_GPM=no
     fi
-    export HB_GPM_MOUSE
+    export HB_INC_GPM
 fi
 
 if [ -z "${HB_WITHOUT_GTSLN}" ]; then
@@ -398,7 +398,7 @@ if [ -z "$HB_COMMERCE" ]; then
 fi
 
 if [ "$HB_COMMERCE" = yes ]; then
-    HB_GPM_MOUSE=no
+    HB_INC_GPM=no
     HB_WITHOUT_GTSLN=yes
 fi
 
diff --git a/harbour/harbour.spec b/harbour/harbour.spec
index b4a206585f..9e970911af 100644
--- a/harbour/harbour.spec
+++ b/harbour/harbour.spec
@@ -73,7 +73,7 @@
 %define hb_cc    export HB_COMPILER=gcc
 %define hb_cflag export HB_USER_CFLAGS=
 %define hb_lflag export HB_USER_LDFLAGS="${CC_HB_USER_LDFLAGS} %{?_with_static:-static}"
-%define hb_gpm   export HB_GPM_MOUSE=%{!?_without_gpm:yes}%{?_without_gpm:no}
+%define hb_gpm   export HB_INC_GPM=%{!?_without_gpm:yes}%{?_without_gpm:no}
 %define hb_crs   export HB_WITHOUT_GTCRS=%{?_without_gtcrs:yes}%{!?_without_gtcrs:no}
 %define hb_sln   export HB_WITHOUT_GTSLN=%{?_without_gtsln:yes}%{!?_without_gtsln:no}
 %define hb_x11   export HB_WITHOUT_X11=%{?_without_x11:yes}%{!?_without_x11:no}
diff --git a/harbour/mpkg_deb.sh b/harbour/mpkg_deb.sh
index f2e9e866cd..4339f88ae1 100755
--- a/harbour/mpkg_deb.sh
+++ b/harbour/mpkg_deb.sh
@@ -31,12 +31,12 @@ done
 
 if [ "$HB_COMMERCE" = yes ]
 then
-    export HB_GPM_MOUSE=no
+    export HB_INC_GPM=no
     export HB_WITHOUT_GTSLN=yes
 else
-    if [ -z "$HB_GPM_MOUSE" ] && ( test_reqpkg libgpmg1-dev || test_reqpkg libgpm-dev )
+    if [ -z "$HB_INC_GPM" ] && ( test_reqpkg libgpmg1-dev || test_reqpkg libgpm-dev )
     then
-        export HB_GPM_MOUSE=yes
+        export HB_INC_GPM=yes
     fi
     if [ -z "$HB_WITHOUT_GTSLN" ] && \
        ! test_reqpkg libslang2-dev && \
diff --git a/harbour/mpkg_tgz.sh b/harbour/mpkg_tgz.sh
index 5f670383fb..8d03bf1355 100755
--- a/harbour/mpkg_tgz.sh
+++ b/harbour/mpkg_tgz.sh
@@ -142,14 +142,14 @@ elif ! make --version >/dev/null 2>&1; then
 fi
 
 # Set other platform-specific build options
-if [ -z "$HB_GPM_MOUSE" ]; then
+if [ -z "$HB_INC_GPM" ]; then
     if [ "$HB_PLATFORM" = "linux" ] && \
        ( [ -f /usr/include/gpm.h ] || [ -f /usr/local/include/gpm.h ]); then
-        HB_GPM_MOUSE=yes
+        HB_INC_GPM=yes
     else
-        HB_GPM_MOUSE=no
+        HB_INC_GPM=no
     fi
-    export HB_GPM_MOUSE
+    export HB_INC_GPM
 fi
 
 if [ -z "${HB_WITHOUT_GTSLN}" ]; then
@@ -188,7 +188,7 @@ esac
 
 if [ "$HB_COMMERCE" = yes ]
 then
-   export HB_GPM_MOUSE=no
+   export HB_INC_GPM=no
    export HB_WITHOUT_GTSLN=yes
 fi
 
@@ -266,7 +266,7 @@ then
         sunos)      ADD_LIBS="$ADD_LIBS -lcurses" ;;
         *)          ADD_LIBS="$ADD_LIBS -lncurses" ;;
     esac
-    [ "${HB_GPM_MOUSE}" = yes ] && ADD_LIBS="$ADD_LIBS -lgpm"
+    [ "${HB_INC_GPM}" = yes ] && ADD_LIBS="$ADD_LIBS -lgpm"
     [ "${HB_WITHOUT_GTSLN}" != yes ] && ADD_LIBS="$ADD_LIBS -lslang"
     [ "${HB_WITHOUT_X11}" != yes ] && ADD_LIBS="$ADD_LIBS -L/usr/X11R6/$HB_LIBDIRNAME -lX11"