[Libreoffice-commits] .: 2 commits - config_host.mk.in configure.in external/mingw-dlls scp2/source
David Tardon
dtardon at kemper.freedesktop.org
Mon Mar 19 01:23:15 PDT 2012
config_host.mk.in | 2 ++
configure.in | 4 ++++
external/mingw-dlls/makefile.mk | 2 ++
scp2/source/ooo/makefile.mk | 12 ++++++++++++
scp2/source/ooo/mingw_dlls.scp | 9 +++++++++
5 files changed, 29 insertions(+)
New commits:
commit 28eaee81ac06866435351d87846868732d5afeb6
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 19 09:19:26 2012 +0100
mingw: check for jpeg dll
diff --git a/config_host.mk.in b/config_host.mk.in
index 002ff8e..828fd82 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 68a0e3b..055e061 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 bc64b27..50aa73b 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 3d8c068..501ee3e 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 4dff90c..8a3098f 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 )
commit 9339da8659d0807bb8306a670facacc55821aca0
Author: David Tardon <dtardon at redhat.com>
Date: Mon Mar 19 09:10:06 2012 +0100
mingw: check for system iconv dll
libxslt in Fedora mingw packages depends on it.
diff --git a/config_host.mk.in b/config_host.mk.in
index 050417e..002ff8e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -292,6 +292,7 @@ export MINGW_GRAPHITE2_DLL=@MINGW_GRAPHITE2_DLL@
export MINGW_GXXDLL=@MINGW_GXXDLL@
export MINGW_HUNSPELL_DLL=@MINGW_HUNSPELL_DLL@
export MINGW_HYPHEN_DLL=@MINGW_HYPHEN_DLL@
+export MINGW_ICONV_DLL=@MINGW_ICONV_DLL@
export MINGW_ICUDATA_DLL=@MINGW_ICUDATA_DLL@
export MINGW_ICUI18N_DLL=@MINGW_ICUI18N_DLL@
export MINGW_ICUUC_DLL=@MINGW_ICUUC_DLL@
diff --git a/configure.in b/configure.in
index 65200c8..68a0e3b 100644
--- a/configure.in
+++ b/configure.in
@@ -6034,6 +6034,7 @@ if test "$with_system_libxml" = "yes"; then
fi
libo_MINGW_CHECK_DLL([LIBXSLT], [libxslt])
+ libo_MINGW_TRY_DLL([ICONV], [iconv])
else
AC_MSG_RESULT([internal])
SYSTEM_LIBXSLT=NO
@@ -6056,6 +6057,7 @@ AC_SUBST(LIBXSLT_CFLAGS)
AC_SUBST(LIBXSLT_LIBS)
AC_SUBST(XSLTPROC)
AC_SUBST([MINGW_LIBXSLT_DLL])
+AC_SUBST([MINGW_ICONV_DLL])
# ===================================================================
# Check for system libxml
diff --git a/external/mingw-dlls/makefile.mk b/external/mingw-dlls/makefile.mk
index d312c34..bc64b27 100644
--- a/external/mingw-dlls/makefile.mk
+++ b/external/mingw-dlls/makefile.mk
@@ -55,6 +55,7 @@ MINGW_DLLS:= \
$(MINGW_GRAPHITE2_DLL) \
$(MINGW_HUNSPELL_DLL) \
$(MINGW_HYPHEN_DLL) \
+ $(MINGW_ICONV_DLL) \
$(MINGW_ICUDATA_DLL) \
$(MINGW_ICUI18N_DLL) \
$(MINGW_ICUUC_DLL) \
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index ff840f5..3d8c068 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -309,6 +309,10 @@ SCPDEFS += -DNEEDS_MINGW_HUNSPELL_DLL -DMINGW_HUNSPELL_DLL=\""$(MINGW_HUNSPELL_D
SCPDEFS += -DNEEDS_MINGW_HYPHEN_DLL -DMINGW_HYPHEN_DLL=\""$(MINGW_HYPHEN_DLL)"\"
.ENDIF
+.IF "$(MINGW_ICONV_DLL)" != ""
+SCPDEFS += -DNEEDS_MINGW_ICONV_DLL -DMINGW_ICONV_DLL=\""$(MINGW_ICONV_DLL)"\"
+.ENDIF
+
.IF "$(MINGW_ICUDATA_DLL)" != ""
SCPDEFS += -DNEEDS_MINGW_ICUDATA_DLL -DMINGW_ICUDATA_DLL=\""$(MINGW_ICUDATA_DLL)"\"
.ENDIF
diff --git a/scp2/source/ooo/mingw_dlls.scp b/scp2/source/ooo/mingw_dlls.scp
index 0cd23b3..4dff90c 100644
--- a/scp2/source/ooo/mingw_dlls.scp
+++ b/scp2/source/ooo/mingw_dlls.scp
@@ -50,6 +50,9 @@ MINGW_DLL( gid_Brand_File_Lib_Mingw_Libexpat, MINGW_EXPAT_DLL )
#ifdef NEEDS_MINGW_LIBXSLT_DLL
MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_LIBXSLT_DLL )
#endif
+#ifdef NEEDS_MINGW_ICONV_DLL
+MINGW_DLL( gid_Brand_File_Lib_Mingw_Libxslt, MINGW_ICONV_DLL )
+#endif
#endif
#ifdef SYSTEM_LIBXML
More information about the Libreoffice-commits
mailing list