diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-24 18:37:54 +0100 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-02-24 20:12:55 +0000 |
| commit | 8968d6d66410d63880da4923144bec7b92ff72f7 (patch) | |
| tree | 875a2f874036c7940185594e19665255e666629b /m4 | |
| parent | 81795c344228386b6ad5d10df3d28e5ae4a2e0a6 (diff) | |
some more external check work on configure.ac
- all in libo_PUBLISH_MODULE is affecting global state, so no need to
separate
- add in AC_ARG_WITH
Change-Id: I609cd03c9208448e6883f5347da3019e0d3aea51
Reviewed-on: https://gerrit.libreoffice.org/2366
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/libo_externals.m4 | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/m4/libo_externals.m4 b/m4/libo_externals.m4 index d52254178dd4..c4584e0e6910 100644 --- a/m4/libo_externals.m4 +++ b/m4/libo_externals.m4 @@ -6,15 +6,11 @@ dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -* # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -AC_DEFUN([libo_PUBLISH_MODULE], -[ - true - AC_SUBST([SYSTEM_$1]) - AC_SUBST([$1_CFLAGS]) - AC_SUBST([$1_LIBS]) -]) - AC_DEFUN([libo_CHECK_SYSTEM_MODULE], [ +AC_ARG_WITH(system-$1, + AS_HELP_STRING([--with-system-$1], + [Use $1 already on system.]),, + [with_system_$1="$with_system_libs"]) AC_MSG_CHECKING([which $1 to use]) if test "$with_system_$1" = "yes"; then AC_MSG_RESULT([external]) @@ -27,7 +23,9 @@ else $2_LIBS=$5 BUILD_TYPE="$BUILD_TYPE $2" fi - libo_PUBLISH_MODULE([$2]) +AC_SUBST([SYSTEM_$2]) +AC_SUBST([$2_CFLAGS]) +AC_SUBST([$2_LIBS]) ]) dnl vim:set shiftwidth=4 softtabstop=4 expandtab: |