configure.ac | 22 +++++----------------- m4/libo_check_extension.m4 | 5 +++-- m4/libo_externals.m4 | 7 +++++-- 3 files changed, 13 insertions(+), 21 deletions(-)
New commits: commit 722c84c136f972f42717ac12a3be5ce2a6510bcd Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 20 13:18:25 2013 +0100 m4: replace silly makefile modelines Change-Id: I148941dfbf3c9c75cd07148b08646e85887846e1 diff --git a/m4/libo_check_extension.m4 b/m4/libo_check_extension.m4 index 9d5a59a..4443660 100644 --- a/m4/libo_check_extension.m4 +++ b/m4/libo_check_extension.m4 @@ -1,4 +1,4 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*- # # This file is part of the LibreOffice project. # @@ -20,4 +20,5 @@ else fi AC_SUBST($2_EXTENSION_PACK) ]) -# vim: set noet sw=4 ts=4: + +dnl vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4 index 2b142b5..d522541 100644 --- a/m4/libo_externals.m4 +++ b/m4/libo_externals.m4 @@ -1,4 +1,4 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*- # # This file is part of the LibreOffice project. # @@ -29,4 +29,5 @@ else fi libo_PUBLISH_MODULE([$2]) ]) -# vim: set noet sw=4 ts=4: + +dnl vim:set shiftwidth=4 softtabstop=4 expandtab: commit 039a1dcc9fe2af4d48bd931a4c937d502a046797 Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 20 13:15:23 2013 +0100 configure: fix WPD/WPS/WPG when no explicit option given: Consistently set WPD_CFLAGS/WPD_LIBS etc. in that case, with luck not breaking anything else in the process due to newly set FOO_CFLAGS/LIBS. Change-Id: I56bc6b86821b77c0c376d06b629646ada1ea0339 diff --git a/configure.ac b/configure.ac index ffdd3ee..97365f9 100644 --- a/configure.ac +++ b/configure.ac @@ -7287,11 +7287,7 @@ dnl =================================================================== if test $_os = iOS; then libo_PUBLISH_MODULE([WPD]) else - if test "$with_system_libwpd" = "no"; then - WPD_CFLAGS="-I${OUTDIR}/inc/external" - WPD_LIBS="-L${OUTDIR}/lib -lwpdlib" - fi - libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9]) + libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.9 libwpd-stream-0.9],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpdlib"]) fi dnl =================================================================== @@ -7337,11 +7333,7 @@ dnl =================================================================== if test $_os = iOS; then libo_PUBLISH_MODULE([WPS]) else - if test "$with_system_libwps" = "no"; then - WPS_CFLAGS="-I${OUTDIR}/inc/external" - WPS_LIBS="-L${OUTDIR}/lib -lwpslib" - fi - libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2]) + libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpslib"]) fi dnl =================================================================== @@ -7350,11 +7342,7 @@ dnl =================================================================== if test $_os = iOS; then libo_PUBLISH_MODULE([WPG]) else - if test "$with_system_libwpg" = "no"; then - WPG_CFLAGS="-I${OUTDIR}/inc/external" - WPG_LIBS="-L${OUTDIR}/lib -lwpglib" - fi - libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2]) + libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.2],["-I${OUTDIR}/inc/external"],["-L${OUTDIR}/lib -lwpglib"]) fi dnl =================================================================== diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4 index b0b45ed..2b142b5 100644 --- a/m4/libo_externals.m4 +++ b/m4/libo_externals.m4 @@ -23,6 +23,8 @@ if test "$with_system_$1" = "yes"; then else AC_MSG_RESULT([internal]) SYSTEM_$2=NO + $2_CFLAGS=$4 + $2_LIBS=$5 BUILD_TYPE="$BUILD_TYPE $2" fi libo_PUBLISH_MODULE([$2]) commit e0202de07e9cf078011d580aacebf98bae58782d Author: Michael Stahl <mst...@redhat.com> Date: Wed Feb 20 13:02:04 2013 +0100 configure: typos Change-Id: I73ffb627bea34f039af0777709794fab30b01987 diff --git a/configure.ac b/configure.ac index b0eea19..ffdd3ee 100644 --- a/configure.ac +++ b/configure.ac @@ -7195,7 +7195,7 @@ dnl Check for system clucene dnl =================================================================== dnl we should rather be using dnl libo_CHECK_SYSTEM_MODULE([clucence],[CLUCENE],[liblucence-core]) here -dnl but the contibs-lib check seems tricky +dnl but the contribs-lib check seems tricky AC_MSG_CHECKING([which clucene to use]) if test "$with_system_clucene" = "yes"; then AC_MSG_RESULT([external]) @@ -7348,7 +7348,7 @@ dnl =================================================================== dnl Check for system libwpg dnl =================================================================== if test $_os = iOS; then - libo_PUBLISH_MODULE([WPD]) + libo_PUBLISH_MODULE([WPG]) else if test "$with_system_libwpg" = "no"; then WPG_CFLAGS="-I${OUTDIR}/inc/external" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits