mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Require system liblangtag 0.4.0 at least -- abi change

Browse Source 
Change-Id: I4a869e9307ebc47b1cd8d759d9dfa3bb781f47c8
This commit is contained in:
Fridrich Štrba
2012-11-06 15:00:29 +01:00
parent 6e02f49a0f
commit 739f99e2ea
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -11596,16 +11596,13 @@ SYSTEM_LIBLANGTAG=
AC_MSG_CHECKING([whether to use liblangtag]) AC_MSG_CHECKING([whether to use liblangtag])
if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != Android -a $_os != iOS \); then if test "$enable_liblangtag" = "yes" -o \( "$enable_liblangtag" = "" -a $_os != Android -a $_os != iOS \); then
ENABLE_LIBLANGTAG=YES ENABLE_LIBLANGTAG=YES
want_glib=yes
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_MSG_CHECKING([whether to use system liblangtag]) AC_MSG_CHECKING([whether to use system liblangtag])
if test "$with_system_liblangtag" = yes; then if test "$with_system_liblangtag" = yes; then
SYSTEM_LIBLANGTAG=YES SYSTEM_LIBLANGTAG=YES
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.3) PKG_CHECK_MODULES( LIBLANGTAG, liblangtag >= 0.4.0)
libo_MINGW_CHECK_DLL([LIBLANGTAG], [liblangtag]) libo_MINGW_CHECK_DLL([LIBLANGTAG], [liblangtag])
libo_MINGW_TRY_DLL([GLIB], [libglib-2.0])
libo_MINGW_TRY_DLL([GMODULE], [libgmodule-2.0])
else else
SYSTEM_LIBLANGTAG=NO SYSTEM_LIBLANGTAG=NO
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])

2
ooo.lst.in
View File

@@ -33,7 +33,7 @@ a7d6c5f2fe2d481149ed3ba807b5c043-gdk-pixbuf-2.23.0.tar.gz
0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz 0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz 861ef15fa0bc018f9ddc932c4ad8b6dd-lcms2-2.4.tar.gz
fa6a2f85bd28baab035b2c95e722713f-liblangtag-0.2.tar.bz2 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2
@AFMS_TARBALL@ @AFMS_TARBALL@
@APACHE_COMMONS_CODEC_TARBALL@ @APACHE_COMMONS_CODEC_TARBALL@
@APACHE_COMMONS_HTTPCLIENT_TARBALL@ @APACHE_COMMONS_HTTPCLIENT_TARBALL@