diff options
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | external/mingw-dlls/makefile.mk | 1 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 20 |
5 files changed, 24 insertions, 7 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index cb38d43a8d29..581286282161 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -406,6 +406,7 @@ export MINGW_SHARED_GCCLIB=@MINGW_SHARED_GCCLIB@ export MINGW_SHARED_GXXLIB=@MINGW_SHARED_GXXLIB@ export MINGW_SHARED_LIBSTDCPP=@MINGW_SHARED_LIBSTDCPP@ export MINGW_SQLITE3_DLL=@MINGW_SQLITE3_DLL@ +export MINGW_SMIME3_DLL=@MINGW_SMIME3_DLL@ export MINGW_SSH2_DLL=@MINGW_SSH2_DLL@ export MINGW_SSL3_DLL=@MINGW_SSL3_DLL@ export MINGW_SSL_DLL=@MINGW_SSL_DLL@ diff --git a/configure.ac b/configure.ac index 2acf0d7a58f1..024aa9802dfc 100644 --- a/configure.ac +++ b/configure.ac @@ -8280,6 +8280,13 @@ if test "$with_system_nss" = "yes"; then AC_MSG_RESULT([external]) SYSTEM_NSS="YES" PKG_CHECK_MODULES(NSS, nss >= 3.9.3 nspr >= 4.8) + libo_MINGW_CHECK_DLL([NSPR4], [libnspr4]) + libo_MINGW_CHECK_DLL([PLC4], [libplc4]) + libo_MINGW_CHECK_DLL([PLDS4], [libplds4]) + libo_MINGW_CHECK_DLL([NSS3], [nss3]) + libo_MINGW_CHECK_DLL([NSSUTIL3], [nssutil3]) + libo_MINGW_CHECK_DLL([SMIME3], [smime3]) + libo_MINGW_CHECK_DLL([SSL3], [ssl3]) else SYSTEM_NSS="NO" BUILD_TYPE="$BUILD_TYPE NSS" @@ -8311,6 +8318,7 @@ fi # system nss AC_SUBST(SYSTEM_NSS) AC_SUBST(NSS_CFLAGS) AC_SUBST(NSS_LIBS) +AC_SUBST([MINGW_SMIME3_DLL]) dnl =================================================================== dnl Check for system mozilla headers diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk index b6d967cc10bb..9b9ceb28f7aa 100644 --- a/external/mingw-dlls/makefile.mk +++ b/external/mingw-dlls/makefile.mk @@ -86,6 +86,7 @@ MINGW_DLLS:= \ $(MINGW_READLINE_DLL) \ $(MINGW_REDLAND_DLL) \ $(MINGW_SQLITE3_DLL) \ + $(MINGW_SMIME3_DLL) \ $(MINGW_SSH2_DLL) \ $(MINGW_SSL3_DLL) \ $(MINGW_SSL_DLL) \ 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 |