[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - config_host.mk.in

David Tardon dtardon at redhat.com
Fri Jun 26 04:37:30 PDT 2015


 config_host.mk.in |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit ba6feca9d5f268d9639f2d2916959104763b6e68
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Jun 24 15:15:22 2015 +0200

    allow to skip check for mdds in bundled projects
    
    PKG_CHECK_MODULES requires both _CFLAGS and _LIBS to be set to skip the
    check.
    
    Change-Id: Ia4ae0576f186eb0c002c40bdb66f3a11a972a0c3
    (cherry picked from commit 969255f05bdffe5b92804a003cd0c8f1bfda5a1a)
    Reviewed-on: https://gerrit.libreoffice.org/16505
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index e0e01e3..5e5851e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -389,6 +389,7 @@ export LIBMARIADB_PATH=@LIBMARIADB_PATH@
 export BUNDLE_MARIADB=@BUNDLE_MARIADB@
 export MD5SUM=@MD5SUM@
 export MDDS_CFLAGS=$(gb_SPACE)@MDDS_CFLAGS@
+export MDDS_LIBS=$(gb_SPACE)@MDDS_LIBS@
 export MERGELIBS=@MERGELIBS@
 export MINGWCXX=@MINGWCXX@
 export MINGWSTRIP=@MINGWSTRIP@


More information about the Libreoffice-commits mailing list