Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2370
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/70/2370/2
move nss, neon, graphite to macro check too
Change-Id: Iaa8ee970042c5260eb3d1199bf31f6495c449f40
---
M configure.ac
1 file changed, 4 insertions(+), 47 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8c96b0f..a3bc89c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1231,16 +1231,6 @@
[Use Cairo libraries already on system.]),,
[with_system_cairo="$with_system_libs"])
-AC_ARG_WITH(system-graphite,
- AS_HELP_STRING([--with-system-graphite],
- [Use graphite library already installed on system.]),,
- [with_system_graphite="$with_system_libs"])
-
-AC_ARG_WITH(system-nss,
- AS_HELP_STRING([--with-system-nss],
- [Use NSS/nspr libraries already on system.]),,
- [with_system_nss="$with_system_libs"])
-
AC_ARG_WITH(myspell-dicts,
AS_HELP_STRING([--with-myspell-dicts],
[Adds myspell dictionaries to the LibreOffice installation set]),
@@ -1544,11 +1534,6 @@
AS_HELP_STRING([--with-system-vigra],
[Use vigra already on system.]),,
[with_system_vigra="$with_system_headers"])
-
-AC_ARG_WITH(system-neon,
- AS_HELP_STRING([--with-system-neon],
- [Use neon already on system.]),,
- [with_system_neon="$with_system_libs"])
AC_ARG_WITH(system-hunspell,
AS_HELP_STRING([--with-system-hunspell],
@@ -8202,11 +8187,8 @@
dnl ===================================================================
dnl Check for system NSS
dnl ===================================================================
-AC_MSG_CHECKING([which NSS to use])
+libo_CHECK_SYSTEM_MODULE([nss/nspr],[NSS],[nss >= 3.9.3 nspr >= 4.8])
if test "$with_system_nss" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_NSS="YES"
- PKG_CHECK_MODULES(NSS, nss >= 3.9.3 nspr >= 4.8)
libo_MINGW_CHECK_DLL([NSPR4], [libnspr4])
libo_MINGW_CHECK_DLL([PLC4], [libplc4])
libo_MINGW_CHECK_DLL([PLDS4], [libplds4])
@@ -8215,19 +8197,13 @@
libo_MINGW_CHECK_DLL([SMIME3], [smime3])
libo_MINGW_CHECK_DLL([SSL3], [ssl3])
else
- SYSTEM_NSS="NO"
NSS_MAJOR="3"
NSS_MINOR="13"
NSS_PATCH="5"
- BUILD_TYPE="$BUILD_TYPE NSS"
- AC_MSG_RESULT([internal])
-fi # system nss
-AC_SUBST(SYSTEM_NSS)
+fi
AC_SUBST(NSS_MAJOR)
AC_SUBST(NSS_MINOR)
AC_SUBST(NSS_PATCH)
-AC_SUBST(NSS_CFLAGS)
-AC_SUBST(NSS_LIBS)
AC_SUBST(MINGW_SMIME3_DLL)
dnl ===================================================================
@@ -8421,24 +8397,14 @@
AC_MSG_RESULT([yes])
ENABLE_GRAPHITE="TRUE"
AC_DEFINE(ENABLE_GRAPHITE)
- AC_MSG_CHECKING([which graphite to use])
+ libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3])
if test "$with_system_graphite" = "yes"; then
- AC_MSG_RESULT([external])
- SYSTEM_GRAPHITE=YES
- PKG_CHECK_MODULES( GRAPHITE, graphite2 >= 0.9.3 )
libo_MINGW_CHECK_DLL([GRAPHITE2], [libgraphite2])
- else
- AC_MSG_RESULT([internal])
- SYSTEM_GRAPHITE=NO
- BUILD_TYPE="$BUILD_TYPE GRAPHITE"
fi
else
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_GRAPHITE)
-AC_SUBST(SYSTEM_GRAPHITE)
-AC_SUBST(GRAPHITE_CFLAGS)
-AC_SUBST(GRAPHITE_LIBS)
AC_SUBST([MINGW_GRAPHITE2_DLL])
dnl ===================================================================
@@ -8624,24 +8590,15 @@
dnl ===================================================================
dnl Check for system neon
dnl ===================================================================
-AC_MSG_CHECKING([which neon to use])
+libo_CHECK_SYSTEM_MODULE([neon],[NEON],[neon >= 0.26.0])
if test "$with_system_neon" = "yes"; then
- AC_MSG_RESULT([external])
- PKG_CHECK_MODULES(NEON, neon >= 0.26.0, , AC_MSG_ERROR([you need neon >= 0.26.x for
system-neon]))
NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`"
- SYSTEM_NEON=YES
libo_MINGW_CHECK_DLL([NEON], [libneon])
libo_MINGW_TRY_DLL([TASN1], [libtasn1])
libo_MINGW_TRY_DLL([GNUTLS], [libgnutls])
else
- AC_MSG_RESULT([internal])
- SYSTEM_NEON=NO
- BUILD_TYPE="$BUILD_TYPE NEON"
NEON_VERSION=0295
fi
-AC_SUBST(SYSTEM_NEON)
-AC_SUBST(NEON_LIBS)
-AC_SUBST(NEON_CFLAGS)
AC_SUBST(NEON_VERSION)
AC_SUBST([MINGW_GNUTLS_DLL])
AC_SUBST([MINGW_NEON_DLL])
--
To view, visit https://gerrit.libreoffice.org/2370
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa8ee970042c5260eb3d1199bf31f6495c449f40
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Gerrit-Reviewer: LibreOffice gerrit bot <gerrit@libreoffice.org>
Context
- [PATCH] [PATCH] move nss, neon, graphite to macro check too · via Code Review
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.