[Libreoffice-commits] .: 3 commits - configure.ac cppunit/ExternalPackage_cppunit.mk distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86.conf

[Libreoffice Gerrit user]

 configure.ac                              |    1 -
 cppunit/ExternalPackage_cppunit.mk        |    4 ++++
 distro-configs/LibreOfficeAndroid.conf    |    1 -
 distro-configs/LibreOfficeAndroidX86.conf |    1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 3de4b440a27aa0f9f6bb42af08bb143526be6358
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Dec 8 20:21:47 2012 +0200

    No .libs directory when DISABLE_DYNLOADING
    
    Change-Id: I4e72093ade16bde4715cd60bf98779c462dd09e5

diff --git a/cppunit/ExternalPackage_cppunit.mk b/cppunit/ExternalPackage_cppunit.mk
index bfcfdc0..3a24f52 100644
--- a/cppunit/ExternalPackage_cppunit.mk
+++ b/cppunit/ExternalPackage_cppunit.mk
@@ -21,7 +21,11 @@ $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/cppunit.dll.a,src/cppunit/
 $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester.exe,src/DllPlugInTester/.libs/DllPlugInTester.exe))
 endif
 else
+ifneq ($(DISABLE_DYNLOADING),TRUE)
 $(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/.libs/DllPlugInTester))
+else
+$(eval $(call gb_ExternalPackage_add_file,cppunit,bin/DllPlugInTester,src/DllPlugInTester/DllPlugInTester))
+endif
 ifeq ($(OS),MACOSX)
 $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit-1.13.0.dylib,src/cppunit/.libs/libcppunit-1.13.0.dylib))
 $(eval $(call gb_ExternalPackage_add_file,cppunit,lib/libcppunit.dylib,src/cppunit/.libs/libcppunit.dylib))
commit f3fc7bd5c893f57c2f27e634af353c4eefc7f9e4
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Dec 8 20:21:09 2012 +0200

    There is no --disable-mozilla option
    
    Change-Id: I279b20d30c0c7ccbe82583ad97e2c4e65cb30221

diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 0758a8a..c2574ff 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -9,7 +9,6 @@
 --disable-gstreamer
 --disable-liblangtag
 --disable-lockdown
---disable-mozilla
 --disable-odk
 --disable-opengl
 --disable-postgresql-sdbc
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index a453fa3..0d8f4fd 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -9,7 +9,6 @@
 --disable-gstreamer
 --disable-liblangtag
 --disable-lockdown
---disable-mozilla
 --disable-odk
 --disable-opengl
 --disable-postgresql-sdbc
commit aee92768a4eb0ec2b60d05ce952d1865f9b282ce
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Dec 8 20:20:34 2012 +0200

    There is no --disable-build-mozilla option
    
    Change-Id: Ib879ae35358d0f45cc874de501d42532f69ac460

diff --git a/configure.ac b/configure.ac
index 5cc0d71..6a5b769 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4197,7 +4197,6 @@ if test "$cross_compiling" = "yes"; then
     # Don't bother having configure look for stuff not needed for the build platform anyway
     ./configure \
         --disable-graphite \
-        --disable-build-mozilla \
         --disable-postgresql-sdbc \
         --disable-zenity \
         --with-parallelism="$with_parallelism" \