MinGW: Bundle also the libpoppler-*.dll

Change-Id: I181e408e7bc585d93fbeb2ce76a32bc350845c91

config_host.mk.in

@@ -364,6 +364,7 @@ export MINGW_PIXMAN_DLL=@MINGW_PIXMAN_DLL@
 export MINGW_PLC4_DLL=@MINGW_PLC4_DLL@
 export MINGW_PLDS4_DLL=@MINGW_PLDS4_DLL@
 export MINGW_PNG15_DLL=@MINGW_PNG15_DLL@
+export MINGW_POPPLER_DLL=@MINGW_POPPLER_DLL@
 export MINGW_PYTHON_DLL=@MINGW_PYTHON_DLL@
 export MINGW_PYTHON_EXE=@MINGW_PYTHON_EXE@
 export MINGW_RAPTOR_DLL=@MINGW_RAPTOR_DLL@

configure.ac

@@ -9757,6 +9757,7 @@ if test "x$enable_pdfimport" != "xno"; then
       CXXFLAGS=$save_CXXFLAGS
       CPPFLAGS=$save_CPPFLAGS
       AC_LANG_POP([C++])
+      libo_MINGW_CHECK_DLL([POPPLER], [libpoppler])
   else
       AC_MSG_RESULT([internal])
       SYSTEM_POPPLER=NO
@@ -9771,6 +9772,7 @@ AC_SUBST(ENABLE_PDFIMPORT)
 AC_SUBST(SYSTEM_POPPLER)
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
+AC_SUBST([MINGW_POPPLER_DLL])
 
 AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
 if test "x$enable_ext_wiki_publisher" = "xyes" -a "x$enable_extension_integration" != "xno" -a "$with_java" != "no"; then

external/mingw-dlls/makefile.mk

@@ -81,6 +81,7 @@ MINGW_DLLS:= \
     $(MINGW_PLC4_DLL) \
     $(MINGW_PLDS4_DLL) \
     $(MINGW_PNG15_DLL) \
+    $(MINGW_POPPLER_DLL) \
     $(MINGW_RAPTOR_DLL) \
     $(MINGW_RASQAL_DLL) \
     $(MINGW_READLINE_DLL) \

scp2/InstallModule_ooo.mk

@@ -72,6 +72,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\
 	SYSTEM_NSS \
 	SYSTEM_OPENSSL \
 	SYSTEM_PANGO \
+	SYSTEM_POPPLER \
 	SYSTEM_PORTAUDIO \
 	SYSTEM_REDLAND \
 	SYSTEM_SNDFILE \
@@ -119,6 +120,7 @@ $(eval $(call gb_InstallModule_define_mingw_dll_if_set,scp2/ooo,\
 	MINGW_PLC4_DLL \
 	MINGW_PLDS4_DLL \
 	MINGW_PNG15_DLL \
+	MINGW_POPPLER_DLL \
 	MINGW_RAPTOR_DLL \
 	MINGW_RASQAL_DLL \
 	MINGW_REDLAND_DLL \

scp2/source/ooo/mingw_dlls.scp

@@ -226,6 +226,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libboost_date_time, MINGW_BOOST_DATE_TIME_DL
 #endif
 #endif
 
+#ifdef SYSTEM_POPPLER
+#ifdef NEEDS_MINGW_POPPLER_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libpoppler, MINGW_POPPLER_DLL )
+#endif
+#endif
+
 #if defined(MINGW_GCCDLL)
 
 File gid_Brand_File_Lib_Mingw_GccS