mingw: check for jpeg dll

config_host.mk.in

@@ -298,6 +298,7 @@ export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@
 export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@
 export MINGW_IDN_DLL=@MINGW_IDN_DLL@
 export MINGW_INTL_DLL=@MINGW_INTL_DLL@
+export MINGW_JPEG_DLL=@MINGW_JPEG_DLL@
 export MINGW_LCMS2_DLL=@MINGW_LCMS2_DLL@
 export MINGW_LIBXML_DLL=@MINGW_LIBXML_DLL@
 export MINGW_LIBXSLT_DLL=@MINGW_LIBXSLT_DLL@

configure.in

@@ -5765,12 +5765,14 @@ if test "$with_system_jpeg" = "yes"; then
         [AC_MSG_ERROR(jpeg.h not found. install libjpeg)], [])
     AC_CHECK_LIB(jpeg, jpeg_resync_to_restart, [ JPEG3RDLIB=-ljpeg ],
     [AC_MSG_CHECKING(jpeg library not found or fuctional)], [])
+    libo_MINGW_CHECK_DLL([JPEG], [libjpeg])
 else
     AC_MSG_RESULT([internal])
     SYSTEM_JPEG=NO
     BUILD_TYPE="$BUILD_TYPE JPEG"
 fi
 AC_SUBST(SYSTEM_JPEG)
+AC_SUBST([MINGW_JPEG_DLL])
 
 dnl ===================================================================
 dnl Check for system clucene

external/mingw-dlls/makefile.mk

@@ -61,6 +61,7 @@ MINGW_DLLS:= \
     $(MINGW_ICUUC_DLL) \
     $(MINGW_IDN_DLL) \
     $(MINGW_INTL_DLL) \
+    $(MINGW_JPEG_DLL) \
     $(MINGW_LCMS2_DLL) \
     $(MINGW_LIBXML_DLL) \
     $(MINGW_LIBXSLT_DLL) \

scp2/source/ooo/makefile.mk

@@ -172,6 +172,10 @@ SCPDEFS+=-DSYSTEM_HUNSPELL
 SCPDEFS+=-DSYSTEM_HYPH
 .ENDIF
 
+.IF "$(SYSTEM_JPEG)" == "YES"
+SCPDEFS+=-DSYSTEM_JPEG
+.ENDIF
+
 .IF "$(SYSTEM_MYTHES)" == "YES"
 SCPDEFS+=-DSYSTEM_MYTHES
 .ENDIF
@@ -333,6 +337,10 @@ SCPDEFS += -DNEEDS_MINGW_IDN_DLL -DMINGW_IDN_DLL=\""$(MINGW_IDN_DLL)"\"
 SCPDEFS += -DNEEDS_MINGW_INTL_DLL -DMINGW_INTL_DLL=\""$(MINGW_INTL_DLL)"\"
 .ENDIF
 
+.IF "$(MINGW_JPEG_DLL)" != ""
+SCPDEFS += -DNEEDS_MINGW_JPEG_DLL -DMINGW_JPEG_DLL=\""$(MINGW_JPEG_DLL)"\"
+.ENDIF
+
 .IF "$(MINGW_LCMS2_DLL)" != ""
 SCPDEFS += -DNEEDS_MINGW_LCMS2_DLL -DMINGW_LCMS2_DLL=\""$(MINGW_LCMS2_DLL)"\"
 .ENDIF

scp2/source/ooo/mingw_dlls.scp

@@ -121,6 +121,12 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Icudata, MINGW_ICUDATA_DLL )
 #endif
 #endif
 
+#ifdef SYSTEM_JPEG
+#ifdef NEEDS_MINGW_JPEG_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Jpeg, MINGW_JPEG_DLL )
+#endif
+#endif
+
 #ifdef SYSTEM_GRAPHITE
 #ifdef NEEDS_MINGW_GRAPHITE2_DLL
 MINGW_DLL( gid_Brand_File_Lib_Mingw_Libgrahpite, MINGW_GRAPHITE2_DLL )