diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-06-26 14:08:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-26 14:09:37 +0100 |
commit | 13b6a02ed34e469faa2530537b1595e7f06459d3 (patch) | |
tree | e4dd7b276ee496b70e5a93e7a922c8730c2d67a7 /scp2 | |
parent | Fix more bugs in ImplgetTopDockingAreaHeight(). (diff) | |
download | core-13b6a02ed34e469faa2530537b1595e7f06459d3.tar.gz core-13b6a02ed34e469faa2530537b1595e7f06459d3.zip |
move the nss stuff in scp2 to be dependent on xmlsec
Change-Id: Icb6d5cbc00135559b2e7b85a3c627dad974834a5
Diffstat (limited to 'scp2')
-rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 117f6d6242f8..b1c38c3ce9bc 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -1326,37 +1326,6 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ucpdav1,ucpdav1) #endif #endif -#ifndef SYSTEM_NSS -SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3) -SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3) -SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4) -SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3) -SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3) -SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi) -SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4) -SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4) -SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3) -SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3) -#ifdef WNT -SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) -#else -/* - For MacOSX >= 10.6 we can apparently use the system sqlite. - - For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration - of the build to avoid #i106132#. Now we need to put it into the program dir of - the install. -*/ -#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) -File gid_File_Lib_Sqlite3 - Name = "sqlite/" SPECIAL_NAME(sqlite3); - PACKED_LIB_FILE_BODY; -End -#endif -#endif -SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) -#endif - SPECIAL_LIB_FILE(gid_File_Lib_Ucpfile1,ucpfile1) SPECIAL_LIB_FILE(gid_File_Lib_Ucpftp1,ucpftp1) @@ -1497,6 +1466,37 @@ File gid_File_Lib_XSec_XmlSec Styles = (PACKED); End +#ifndef SYSTEM_NSS +SPECIAL_LIB_FILE(gid_File_Lib_Freebl3,freebl3) +SPECIAL_LIB_FILE(gid_File_Lib_Nss3,nss3) +SPECIAL_LIB_FILE(gid_File_Lib_Nspr,nspr4) +SPECIAL_LIB_FILE(gid_File_Lib_Nssdbm3,nssdbm3) +SPECIAL_LIB_FILE(gid_File_Lib_Nssutil3,nssutil3) +SPECIAL_LIB_FILE(gid_File_Lib_Nssckbi,nssckbi) +SPECIAL_LIB_FILE(gid_File_Lib_Plc4,plc4) +SPECIAL_LIB_FILE(gid_File_Lib_Plds4,plds4) +SPECIAL_LIB_FILE(gid_File_Lib_Softokn3,softokn3) +SPECIAL_LIB_FILE(gid_File_Lib_Smime3,smime3) +#ifdef WNT +SPECIAL_LIB_FILE(gid_File_Lib_Sqlite3,sqlite3) +#else +/* + For MacOSX >= 10.6 we can apparently use the system sqlite. + + For MacOSX 10.4 we've delivered sqlite into a sqlite subdir for the duration + of the build to avoid #i106132#. Now we need to put it into the program dir of + the install. +*/ +#if !defined(MACOS) || (MAC_OS_X_VERSION_MIN_REQUIRED < 1060) +File gid_File_Lib_Sqlite3 + Name = "sqlite/" SPECIAL_NAME(sqlite3); + PACKED_LIB_FILE_BODY; +End +#endif +#endif +SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) +#endif + #ifdef WNT File gid_File_Lib_LibXMLSec_xmlseccore LIB_FILE_BODY; |