diff options
| author | Peter Jentsch <pjotr@guineapics.de> | 2012-09-08 22:26:50 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-09-10 07:56:42 +0200 |
| commit | 1c467763f4ca4bc1caaa3111f0ed85f388e6fe01 (patch) | |
| tree | 66bd1ea66f272ee02315a01bf41f6f5358c55259 /scp2 | |
| parent | eadb83f281b596e441a82798660f1a27c177b2c6 (diff) | |
build and deliver internal libexslt. Use LIBEXSLT_LIBS is system xslt is used
Change-Id: I7ab624bc4877af51d4182ab213ef49cd8c5bb2a4
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 18 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 11 |
2 files changed, 28 insertions, 1 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 928174b6169e..8a20d0735632 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1470,6 +1470,24 @@ File gid_File_Lib_Xslt #endif #endif End +File gid_File_Lib_eXslt + LIB_FILE_BODY; + Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef UNX + #ifdef MACOSX + Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX)); + #else + Name = STRING(CONCAT4(libexslt,UNXSUFFIX,.,0)); + #endif + #else + #ifdef _gcc3 + Name = "libexslt-0.dll"; + #else + Name = "libexslt.dll"; + #endif + #endif +End #endif diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 26ec6d6556c9..aa4ff72b2583 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -70,6 +70,13 @@ Unixlink gid_Unixlink_File_Lib_Xslt Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); Target = STRING(CONCAT3(libxslt,UNXSUFFIX,.1)); End +Unixlink gid_Unixlink_File_Lib_eXslt + BIN_FILE_BODY; + Dir = SCP2_OOO_BIN_DIR; + Name = STRING(CONCAT2(libexslt,UNXSUFFIX)); + Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); + Target = STRING(CONCAT3(libexslt,UNXSUFFIX,.0)); +End #endif #endif @@ -431,6 +438,7 @@ Module gid_Module_Root_Files_5 gid_File_Lib_Ucppkg1, gid_File_Lib_Xslt, gid_Unixlink_File_Lib_Xslt, + gid_Unixlink_File_Lib_eXslt, gid_File_Lib_LibXMLSec_xmlsecnss, gid_File_Lib_LibXMLSec_xmlseccore, gid_File_Lib_LibXMLSec_xmlsecmscrypto, @@ -499,7 +507,8 @@ Module gid_Module_Root_Files_5 gid_Unixlink_File_Lib_Raptor, gid_Unixlink_File_Lib_Rasqal, gid_Unixlink_File_Lib_Rdf, - gid_Unixlink_File_Lib_Xslt); + gid_Unixlink_File_Lib_Xslt, + gid_Unixlink_File_Lib_eXslt); End Module gid_Module_Root_Files_6 |