[Libreoffice-commits] .: configure.ac distro-configs/LibreOfficeMinGW.conf README.cross

[Libreoffice Gerrit user]

 README.cross                         |    3 ++-
 configure.ac                         |   26 +++++++++++++-------------
 distro-configs/LibreOfficeMinGW.conf |    1 +
 3 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 7861bf081e2802a16f0be31edf7b3d1667f238dc
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Sun Nov 25 12:46:10 2012 +0100

    Update to be able to at least start the MinGW build again.
    
    Change-Id: I51a3cf81bf6ba4f0d50cb3f2ac52c2d220955b56

diff --git a/README.cross b/README.cross
index 7b366d1..22f434a 100644
--- a/README.cross
+++ b/README.cross
@@ -92,7 +92,8 @@ zypper in mingw32-cross-gcc mingw32-cross-gcc-c++ mingw32-python-devel \
     mingw32-cross-pkg-config mingw32-pkg-config mingw32-libcppunit \
     mingw32-libcppunit-devel mingw32-libredland mingw32-libredland-devel \
     mingw32-libmythes mingw32-libmythes-devel mingw32-mozilla-nss \
-    mingw32-mozilla-nss-devel mingw32-mozilla-nspr mingw32-mozilla-nspr-devel
+    mingw32-mozilla-nss-devel mingw32-mozilla-nspr \
+    mingw32-mozilla-nspr-devel mingw32-libpoppler mingw32-libpoppler-devel
 
 You also need wine, ideally:
 
diff --git a/configure.ac b/configure.ac
index 605dd1a..dd4c40d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4158,6 +4158,7 @@ if test "$cross_compiling" = "yes"; then
     ./configure \
         --disable-graphite \
         --disable-build-mozilla \
+        --disable-pdfimport \
         --disable-postgresql-sdbc \
         --disable-zenity \
         --with-parallelism="$with_parallelism" \
@@ -6938,9 +6939,11 @@ if test "$with_system_expat" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_EXPAT=NO
-    EXPAT_TARBALL="dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz"
     BUILD_TYPE="$BUILD_TYPE EXPAT"
 fi
+if test "$with_system_expat" != "yes" -o "$with_system_expat_for_build" != "yes"; then
+    EXPAT_TARBALL="dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz"
+fi
 AC_SUBST(SYSTEM_EXPAT)
 AC_SUBST(EXPAT_TARBALL)
 AC_SUBST([MINGW_EXPAT_DLL])
@@ -7087,9 +7090,11 @@ if test "$with_system_cppunit" = "yes"; then
 else
     AC_MSG_RESULT([internal])
     SYSTEM_CPPUNIT=NO
-    CPPUNIT_TARBALL="fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz"
     BUILD_TYPE="$BUILD_TYPE CPPUNIT"
 fi
+if test "$with_system_cppunit" != "yes" -o "$with_system_cppunit_for_build" != "yes"; then
+    CPPUNIT_TARBALL="fa9aa839145cdf860bf596532bb8af97-cppunit-1.13.1.tar.gz"
+fi
 AC_SUBST(SYSTEM_CPPUNIT)
 AC_SUBST(CPPUNIT_CFLAGS)
 AC_SUBST(CPPUNIT_LIBS)
@@ -7924,6 +7929,8 @@ else
     AC_MSG_RESULT([internal])
     BUILD_TYPE="$BUILD_TYPE BOOST"
     SYSTEM_BOOST=NO
+fi
+if test "$with_system_boost" != "yes" -o "$with_system_boost_for_build" != "yes"; then
     BOOST_TARBALL=f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 fi
 AC_SUBST([MINGW_BOOST_DATE_TIME_DLL])
@@ -8476,6 +8483,10 @@ You can use --with-system-icu-for-build=force to use it anyway.])
 else
     AC_MSG_RESULT([internal])
     SYSTEM_ICU="NO"
+
+    BUILD_TYPE="$BUILD_TYPE ICU"
+fi
+if test "$with_system_icu" != "yes" -o "$with_system_icu_for_build" != "yes"; then
     ICU_TARBALL="7c53f83e0327343f4060c0eb83842daf-icu4c-49_1_1-src.tgz"
 
     # Save space when using a bundled ICU by leaving out unneeded parts of the ICU data. Generated by
@@ -8487,10 +8498,7 @@ else
     # appropriately. Let's not bother trying to list what stuff has been removed in the file name.
     # Describe it in the comment above instead.
     ICU_DATA_SUBSET_ZIP=fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip
-
-    BUILD_TYPE="$BUILD_TYPE ICU"
 fi
-
 AC_SUBST(SYSTEM_ICU)
 AC_SUBST(SYSTEM_GENBRK)
 AC_SUBST(SYSTEM_GENCCODE)
@@ -12490,14 +12498,6 @@ fi
 
 AC_SUBST(LO_PATH)
 
-BUILD_TARBALLS=
-# Ugly hack to get what we need for build platform into ooo.lst
-if test "$CROSS_COMPILING" = "YES" ; then
-    # ICU_DATA_SUBSET_ZIP
-    BUILD_TARBALLS="$BUILD_TARBALLS fc188d2ed5c2cbcf7a021b34b9f88478-icudt49l-subset.zip"
-fi
-AC_SUBST(BUILD_TARBALLS)
-
 # make sure config.guess is +x; we execute config.guess, so it has to be so
 chmod +x ./config.guess
 
diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
index 2ac91eb..039ce78 100644
--- a/distro-configs/LibreOfficeMinGW.conf
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -16,6 +16,7 @@
 --with-system-neon
 --with-system-nss
 --with-system-openssl
+--with-system-poppler
 --with-system-redland
 --without-junit
 --without-myspell-dicts