diff options
| author | David Tardon <dtardon@redhat.com> | 2012-10-31 12:20:06 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-31 13:22:29 +0100 |
| commit | a6f97a750dda531deabc00223c89abf043640701 (patch) | |
| tree | 8b6dbec5f68fce61074b02b8145ba70f72286f83 /scp2 | |
| parent | 6b9e9763681cbc85332bf8dde843fb9c485dc536 (diff) | |
fdo#54327 put system nss dlls into the install set
Change-Id: Ie809bba726c4d17eac25d36381d93ea9781d74be
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 20 |
2 files changed, 14 insertions, 7 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index d33d6db8b267..c130b50da044 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -131,6 +131,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\ MINGW_RAPTOR_DLL \ MINGW_RASQAL_DLL \ MINGW_REDLAND_DLL \ + MINGW_SMIME3_DLL \ MINGW_SQLITE3_DLL \ MINGW_SSH2_DLL \ MINGW_SSL3_DLL \ diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 4588225a961e..0fcf0b8fd39c 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/scp2/source/ooo/mingw_dlls.scp @@ -85,13 +85,7 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdb, MINGW_DB_DLL ) #endif #endif -#ifdef SYSTEM_CURL -#ifdef NEEDS_MINGW_INTL_DLL -MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl, MINGW_INTL_DLL ) -#endif -#ifdef NEEDS_MINGW_IDN_DLL -MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn, MINGW_IDN_DLL ) -#endif +#if defined SYSTEM_CURL || defined SYSTEM_NSS #ifdef NEEDS_MINGW_NSPR4_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libnspr, MINGW_NSPR4_DLL ) #endif @@ -110,12 +104,24 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_nss, MINGW_NSS3_DLL ) #ifdef NEEDS_MINGW_SSL3_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_ssl, MINGW_SSL3_DLL ) #endif +#ifdef NEEDS_MINGW_SMIME3_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_smime, MINGW_SMIME3_DLL ) +#endif +#endif + +#ifdef SYSTEM_CURL #ifdef NEEDS_MINGW_GPG_ERROR_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgpgerror, MINGW_GPG_ERROR_DLL ) #endif #ifdef NEEDS_MINGW_GCRYPT_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgcrypt, MINGW_GCRYPT_DLL ) #endif +#ifdef NEEDS_MINGW_INTL_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Libintl, MINGW_INTL_DLL ) +#endif +#ifdef NEEDS_MINGW_IDN_DLL +MINGW_DLL( gid_Brand_File_Lib_Mingw_Libdn, MINGW_IDN_DLL ) +#endif #ifdef NEEDS_MINGW_SSH2_DLL MINGW_DLL( gid_Brand_File_Lib_Mingw_Libssh, MINGW_SSH2_DLL ) #endif |