From b55b114949c31c185bdc93ca2fce2afea098d1df Mon Sep 17 00:00:00 2001
From: Brian Boru <aolar68@gmail.com>
Date: Sun, 12 Sep 2021 00:46:25 +0300
Subject: [PATCH] building

---
 Jamfile            |  8 --------
 Jamrules.configure | 18 ++++++++++++------
 src/excel/Jamfile  |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/Jamfile b/Jamfile
index 3836f33..a006519 100644
--- a/Jamfile
+++ b/Jamfile
@@ -6,11 +6,6 @@ if $(windoze) {
 if $(UNIX)      { SUFSHR = .so ; }
 else if $(NT)   { SUFSHR = .dll ; }
 
-if $(debug) {
-    CFLAGS.all += -O0 -g3 ;
-} else {
-    set-profile ;
-}
 set-default-locations ;
 
 CFLAGS.all += -fPIC -D_GNU_SOURCE -Iinclude/libxsql -I$(HONE)/include ;
@@ -19,9 +14,6 @@ LINKLIBS.all += -ldl -L. ;
 SubDir TOP ;
 SubInclude TOP src ;
 SubInclude TOP src config ;
-if $(debug) {
-    SubInclude TOP test ;
-}
 
 softinclude $(TOP)/Jamrules.configure ;
 
diff --git a/Jamrules.configure b/Jamrules.configure
index 0e04fbc..14ce5f1 100644
--- a/Jamrules.configure
+++ b/Jamrules.configure
@@ -142,12 +142,12 @@ rule -configure- {
     }
     HAVE_VISTA = 'no' ;
     if $(USE_VISTA) {
-    	if [ -configure-test-dbvista- ] == 1 {
-    		-configure-add-line- "SubInclude TOP src rdm ;" ;
-    		-configure-add-line- "SubInclude TOP src vista ;" ;
-    		HAVE_VISTA = 'yes' ;
-    		Command config.sh $(TOP) $(PREFIX) $(HAVE_VISTA) ;
-    	}
+        if [ -configure-test-dbvista- ] == 1 {
+            -configure-add-line- "SubInclude TOP src rdm ;" ;
+            -configure-add-line- "SubInclude TOP src vista ;" ;
+            HAVE_VISTA = 'yes' ;
+            Command config.sh $(TOP) $(PREFIX) $(HAVE_VISTA) ;
+        }
     }
     HAVE_XLSX = 'no' ;
     if $(USE_XLSX) {
@@ -156,6 +156,12 @@ rule -configure- {
             HAVE_XLSX = 'yes' ;
         }
     }
+    if $(debug) {
+        -configure-add-line- "CFLAGS.all += -O0 -g3 ;" ;
+        -configure-add-line- "SubInclude TOP test ;" ;
+    } else {
+        -configure-add-line- "set-profile ;" ;
+    }
     Echo ;
     Echo 'Main' ;
     Echo '  console utilite (ixsql):            ' $(HAVE_IXSQL) ;
diff --git a/src/excel/Jamfile b/src/excel/Jamfile
index b457f2c..312e251 100644
--- a/src/excel/Jamfile
+++ b/src/excel/Jamfile
@@ -1,4 +1,4 @@
 SubDir TOP src excel ;
 SharedLibrary libxsql_xlsx$(SUFSHR) : xsql_xlsx.c ;
 InstallBin lib : libxsql_xlsx$(SUFSHR) ;
-LINKLIBS on libxsql_xlsx$(SUFSHR) = -lxlsxwriter -lminizip ;
+LINKLIBS on libxsql_xlsx$(SUFSHR) = -lxlsxwriter ;
-- 
2.11.4.GIT