diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-19 09:19:26 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-19 09:22:51 +0100 |
| commit | 28eaee81ac06866435351d87846868732d5afeb6 (patch) | |
| tree | cbc1321123055205a2b6c2c164bf5c77116a8f31 | |
| parent | 9339da8659d0807bb8306a670facacc55821aca0 (diff) | |
mingw: check for jpeg dll
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | external/mingw-dlls/makefile.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/mingw_dlls.scp | 6 |
5 files changed, 18 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 002ff8e24f97..828fd8224725 100644 --- a/config_host.mk.in +++ b/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@ diff --git a/configure.in b/configure.in index 68a0e3b9b952..055e0610a3e1 100644 --- a/configure.in +++ b/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 diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk index bc64b273441b..50aa73b8ec77 100644 --- a/external/mingw-dlls/makefile.mk +++ b/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) \ diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk index 3d8c06857b2e..501ee3e7d5cc 100644 --- a/scp2/source/ooo/makefile.mk +++ b/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 diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp index 4dff90cc10e0..8a3098f52f5f 100644 --- a/scp2/source/ooo/mingw_dlls.scp +++ b/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 ) |