[Libreoffice-commits] .: 2 commits - configure.in distro-configs/LibreOfficeMinGW.conf libxmlsec/makefile.mk README.cross xmlsecurity/Module_xmlsecurity.mk

[Jan Holesovsky]

 README.cross                         |   51 +++++++----------------------------
 configure.in                         |    8 ++---
 distro-configs/LibreOfficeMinGW.conf |   30 ++++++++++++++++++++
 libxmlsec/makefile.mk                |    2 -
 xmlsecurity/Module_xmlsecurity.mk    |    2 -
 5 files changed, 47 insertions(+), 46 deletions(-)

New commits:
commit 9d65c893cd68bdf0d4ac2f78a6ad2c5ff820d342
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 3 21:06:33 2011 +0100

    Introduce LibreOfficeMinGW distro-config.

diff --git a/README.cross b/README.cross
index 6aec90b..816d7ab 100644
--- a/README.cross
+++ b/README.cross
@@ -122,7 +122,17 @@ for MinGW inside the OOo-originated code in LibreOffice actually
 are. What I have noticed of it seems a bit randomish, with
 copy-pasting having been preferred to factoring out differences.
 
-The autogen.lastrun I use for my MinGW cross-compilation experimentation is:
+Most of the configuration settings are maintained in the LibreOfficeMinGW
+distro-config, so in your autogen.lastrun, you can use:
+
+CC=ccache i686-w64-mingw32-gcc
+CXX=ccache i686-w64-mingw32-g++
+CC_FOR_BUILD=ccache gcc
+CXX_FOR_BUILD=ccache g++
+--with-distro=LibreOfficeMinGW
+
+Alternatively, you can use something like the following; but the preferred way
+is to keep LibreOfficeMinGW distro up-to-date.
 
 CC=ccache i686-w64-mingw32-gcc
 CXX=ccache i686-w64-mingw32-g++
@@ -177,45 +187,6 @@ CXX_FOR_BUILD=ccache g++
 --without-helppack-integration
 --without-myspell-dicts
 
-For reference, Kendy's autogen.lastrun is:
-
-CC=ccache i686-w64-mingw32-gcc
-CXX=ccache i686-w64-mingw32-g++
-CC_FOR_BUILD=ccache gcc
-CXX_FOR_BUILD=ccache g++
---build=x86_64-unknown-linux-gnu
---host=i686-w64-mingw32
---with-num-cpus=4
---with-max-jobs=8
---without-junit
---disable-binfilter
---disable-build-mozilla
---disable-mozilla
---disable-nss-module
---with-system-altlinuxhyph
---with-system-boost
---with-system-cairo
---with-system-cppunit
---with-system-curl
---with-system-db
---with-system-expat
---with-system-gettext
---with-system-graphite
---with-system-hunspell
---with-system-icu
---with-system-libpng
---with-system-libxml
---with-system-libxslt
---with-system-lpsolve
---with-system-mythes
---with-system-neon
---with-system-openssl
---with-system-redland
---without-myspell-dicts
---disable-directx
---disable-activex
---disable-extension-integration
-
 Once you have compiled it, you may want to try to run it:
 
 $ cd /tmp
diff --git a/distro-configs/LibreOfficeMinGW.conf b/distro-configs/LibreOfficeMinGW.conf
new file mode 100644
index 0000000..aad9039
--- /dev/null
+++ b/distro-configs/LibreOfficeMinGW.conf
@@ -0,0 +1,30 @@
+--build=x86_64-unknown-linux-gnu
+--host=i686-w64-mingw32
+--with-system-altlinuxhyph
+--with-system-boost
+--with-system-cairo
+--with-system-cppunit
+--with-system-curl
+--with-system-db
+--with-system-expat
+--with-system-gettext
+--with-system-graphite
+--with-system-hunspell
+--with-system-icu
+--with-system-libpng
+--with-system-libxml
+--with-system-libxslt
+--with-system-lpsolve
+--with-system-mythes
+--with-system-neon
+--with-system-openssl
+--with-system-redland
+--without-junit
+--without-myspell-dicts
+--disable-activex
+--disable-binfilter
+--disable-build-mozilla
+--disable-directx
+--disable-extension-integration
+--disable-mozilla
+--disable-xmlsec
commit a1c23a44b90caf3d0360070c78b0cd05775b99b7
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Nov 3 21:05:23 2011 +0100

    Fix the --disable-xmlsec build.

diff --git a/configure.in b/configure.in
index 392cd15..808ec57 100644
--- a/configure.in
+++ b/configure.in
@@ -4862,12 +4862,11 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \
     else
         PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.0)
     fi
-    BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
     MINGW_EXTERNAL_DLLS="$MINGW_EXTERNAL_DLLS zlib1.dll libxml2-2.dll"
 else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBXML=NO
-    BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC"
+    BUILD_TYPE="$BUILD_TYPE LIBXML2"
 fi
 AC_SUBST(SYSTEM_LIBXML)
 AC_SUBST(LIBXML_CFLAGS)
@@ -5697,9 +5696,10 @@ fi
 AC_MSG_CHECKING([whether to build XML Security support])
 if test "$enable_xmlsec" = "no"; then
     AC_MSG_RESULT([no])
-    ENABLE_XMLSEC=no
+    ENABLE_XMLSEC=
 else
-    ENABLE_XMLSEC=yes
+    ENABLE_XMLSEC="YES"
+    BUILD_TYPE="$BUILD_TYPE LIBXMLSEC"
     AC_MSG_RESULT([yes])
 fi
 AC_SUBST(ENABLE_XMLSEC)
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index caefaad..84489f6 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -35,7 +35,7 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
 
 .INCLUDE :	settings.mk
 
-.IF "$(ENABLE_XMLSEC)" == "NO"
+.IF "$(ENABLE_XMLSEC)" != "YES"
 @all:
     @echo "XMLSec module disabled"
 .ENDIF
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index 2e6e8d9..ea5f5aa 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
 	AllLangResTarget_xsec \
 	Library_xmlsecurity \
 	Library_xsec_fw \
-	Library_xsec_xmlsec \
+	$(if $(filter YES,$(ENABLE_XMLSEC)),Library_xsec_xmlsec) \
 ))
 
 # failing