From ed9059b8f86bb8b99f8508686dd5f4b109f03fc9 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 27 Mar 2009 14:36:28 +0000
Subject: [PATCH] 2009-03-27 15:35 UTC+0100 Viktor Szakats (harbour.01 syenar
 hu)   * external/sqlite3/Makefile     * Don't build it for linux and darwin.

  * contrib/hbsqlit3/Makefile
    * Changed to plain standard external dependency search method.
    + Added searching in local sqlite3 copy for win and os2.
---
 harbour/ChangeLog                 |  8 ++++++++
 harbour/contrib/hbsqlit3/Makefile | 26 +++++++-------------------
 harbour/external/sqlite3/Makefile |  6 ++++++
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 02fc2ec5d6..d23e4cdc32 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-27 15:35 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * external/sqlite3/Makefile
+    * Don't build it for linux and darwin.
+
+  * contrib/hbsqlit3/Makefile
+    * Changed to plain standard external dependency search method.
+    + Added searching in local sqlite3 copy for win and os2.
+
 2009-03-27 15:01 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * contrib/hbodbc/odbc.c
     ! Fixed potential buffer overrun in SQLDRIVERCONNECT() in UNICODE mode.
diff --git a/harbour/contrib/hbsqlit3/Makefile b/harbour/contrib/hbsqlit3/Makefile
index 25ad96c614..576053f1d3 100644
--- a/harbour/contrib/hbsqlit3/Makefile
+++ b/harbour/contrib/hbsqlit3/Makefile
@@ -6,32 +6,20 @@ ROOT = ../../
 
 LIBNAME=hbsqlit3
 
-ifeq ($(HB_WITHOUT_SQLIT3),)
-ifeq ($(HB_ARCHITECTURE),dos)
-HB_WITHOUT_SQLIT3=yes
-endif
-ifeq ($(HB_ARCHITECTURE),bsd)
-HB_WITHOUT_SQLIT3=yes
-endif
-ifeq ($(HB_ARCHITECTURE),hpux)
-HB_WITHOUT_SQLIT3=yes
-endif
-endif
-
-ifneq ($(HB_WITHOUT_SQLIT3),yes)
-
-HB_INC_SQLITE3_OK =
-
 ifeq ($(HB_INC_SQLITE3),)
 ifeq ($(HB_XBUILD),)
-HB_INC_SQLITE3 = /usr/include $(TOP)$(ROOT)/external/sqlite3
+HB_INC_SQLITE3 = /usr/include
+ifeq ($(HB_ARCHITECTURE),win)
+HB_INC_SQLITE3 += $(TOP)$(ROOT)/external/sqlite3
+endif
+ifeq ($(HB_ARCHITECTURE),os2)
+HB_INC_SQLITE3 += $(TOP)$(ROOT)/external/sqlite3
+endif
 endif
 endif
 
 HB_INC_SQLITE3_OK += $(foreach d, $(HB_INC_SQLITE3), $(if $(wildcard $(d)/sqlite3.h),$(d),))
 
-endif
-
 ifneq ($(strip $(HB_INC_SQLITE3_OK)),)
 
 HB_USER_CFLAGS += $(foreach d, $(HB_INC_SQLITE3_OK), -I$(d))
diff --git a/harbour/external/sqlite3/Makefile b/harbour/external/sqlite3/Makefile
index cad2903969..becfe5a423 100644
--- a/harbour/external/sqlite3/Makefile
+++ b/harbour/external/sqlite3/Makefile
@@ -16,6 +16,12 @@ endif
 ifeq ($(HB_ARCHITECTURE),hpux)
 HB_WITHOUT_SQLIT3=yes
 endif
+ifeq ($(HB_ARCHITECTURE),linux)
+HB_WITHOUT_SQLIT3=yes
+endif
+ifeq ($(HB_ARCHITECTURE),darwin)
+HB_WITHOUT_SQLIT3=yes
+endif
 endif
 
 ifneq ($(HB_WITHOUT_SQLIT3),yes)