From 71a63b4c22fe23d47a67be46fe42e9fe8a0ffadf Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Thu, 21 May 2009 05:47:09 +0000
Subject: [PATCH] 2009-05-21 07:46 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * config/global.cf     + Added Make version check and appropriate error
 message in case       wrong version found.

  * ChangeLog
    ! Typos.
---
 harbour/ChangeLog        | 16 ++++++++++++----
 harbour/config/global.cf | 11 +++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 4122924608..67594e5102 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to these authors: Viktor Szakats.
 */
 
+2009-05-21 07:46 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * config/global.cf
+    + Added Make version check and appropriate error message in case
+      wrong version found.
+
+  * ChangeLog
+    ! Typos.
+
 2009-05-20 23:32 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * contrib/rddsql/sddodbc/Makefile
     ! Applied logic from contrib/hbodbc/Makefile.
@@ -24,7 +32,7 @@
   * contrib/rddsql/sddodbc/odbcdd.c
     ! Fixed three warnings (2 casts + 1 uninit var) with MSVC.
 
-  ; TOFIX: These errors are shown when trying to compiler in UNICODE mode:
+  ; TOFIX: These errors are shown when trying to compile in UNICODE mode:
     ../../odbcdd.c(168) : error C2664: 'SQLDriverConnectW' : cannot convert parameter 3 from 'SQLCHAR *' to 'SQLWCHAR *'
     ../../odbcdd.c(204) : error C2664: 'SQLExecDirectW' : cannot convert parameter 2 from 'SQLCHAR *' to 'SQLWCHAR *'
     ../../odbcdd.c(239) : error C2664: 'SQLExecDirectW' : cannot convert parameter 2 from 'SQLCHAR *' to 'SQLWCHAR *'
@@ -64,8 +72,8 @@
   * contrib/hbwin/legacyc.c
     + Added GETACTIVEOBJECT(), CREATEOBJECT(), OLEERROR()
       compatibility calls. All of them are simple aliases to
-      new OLE function, which means there may be differences
-      in behviour. Users will need to adjust them for full
+      new OLE functions, which means there may be differences
+      in behaviour. Users will need to adjust them for full
       compatibility.
       However, I'd recommend changing all code to use our
       new OLE functions and classes.
@@ -210,7 +218,7 @@
          - no hkey is passed, since the default has changed.
          - using win_reg*() functions directly, since return value and
            hbResult type has changed.
-    ! Fixed potential GPF is non-string was passed for string params.
+    ! Fixed potential GPF if non-string was passed for string params.
 
   * contrib/hbwin/tests/testreg.prg
     + Added registry write test.
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index 71bb287a42..77057898d2 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -12,6 +12,15 @@
 # a performance boost on a slow system.
 .SUFFIXES:
 
+need := 3.81
+ok := $(filter $(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
+
+ifeq ($(ok),)
+
+all: ; @echo Error: GNU Make version $(MAKE_VERSION) found, $(need) or upper needed for Harbour.
+
+else
+
 GRANDP = ../../
 HB_ARCH := $(HB_ARCHITECTURE)/$(HB_COMPILER)
 
@@ -56,3 +65,5 @@ HB_LIB_COMPILE :=
 endif
 
 include $(TOP)$(ROOT)config/$(HB_ARCH).cf
+
+endif