summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-15 07:10:18 +0200
committerAndrzej J.R. Hunt <andrzej@ahunt.org>2013-07-15 21:13:39 +0200
commit2588015e744ff8b46b23354968d813e65e3b82e4 (patch)
treeedd3c4330cc37d16c8affde46c34b6e0cca0f260
parentd5753044ed89a34f8b17a2219eef3e81bd930309 (diff)
Fix --disable-firebird-sdbc.
Change-Id: I040049b4c034858f4be4aa580a17fd8bb5986396
-rw-r--r--Repository.mk2
-rw-r--r--scp2/Module_scp2.mk4
-rw-r--r--scp2/source/base/module_base.scp20
3 files changed, 4 insertions, 22 deletions
diff --git a/Repository.mk b/Repository.mk
index 593f38b61195..c60628891cbc 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -251,7 +251,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
flat \
file \
filterconfig \
- firebird_sdbc \
+ $(if $(ENABLE_FIREBIRD_SDBC),firebird_sdbc) \
fpicker \
fps_office \
for \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index dcec65682fe7..bd304773d87b 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -17,7 +17,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_calc \
InstallModule_draw \
InstallModule_extensions \
- InstallModule_firebird \
+ $(if $(filter TRUE,$(ENABLE_FIREBIRD_SDBC)),\
+ InstallModule_firebird \
+ ) \
InstallModule_graphicfilter \
InstallModule_impress \
InstallModule_math \
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index b2bfe4a5cf28..7a46408563ce 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -37,29 +37,9 @@ Module gid_Module_Prg_Base_Bin
Styles = (HIDDEN_ROOT);
Files = (auto_base_ALL,
gid_File_Share_Registry_Base_Xcd
-/* This should be conditional, but the condition is not working!! */
-/* #if defined ENABLE_FIREBIRD_SDBC */
- ,gid_File_FirebirdSdbc_Rdb
- ,gid_File_FirebirdSdbc_Xcd
-/* #endif */
);
End
-File gid_File_FirebirdSdbc_Rdb
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program_Services;
- Name = "firebird_sdbc.rdb";
- Styles = (PACKED);
-End
-
-File gid_File_FirebirdSdbc_Xcd
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "firebirdsdbc.xcd";
- Styles = (PACKED);
-End
-
-
Module gid_Module_Brand_Prg_Base
PackageInfo = "packinfo_brand.txt";
Name = "gid_Module_Brand_Prg_Base";