Author: hdu
Date: Wed Nov 6 08:10:25 2013
New Revision: 1539262
URL: http://svn.apache.org/r1539262
Log:
#i123639# allow using the system provided nss library
Modified:
openoffice/trunk/main/configure.in
openoffice/trunk/main/external_deps.lst
openoffice/trunk/main/nss/makefile.mk
openoffice/trunk/main/set_soenv.in
openoffice/trunk/main/xmlsecurity/util/makefile.mk
Modified: openoffice/trunk/main/configure.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/configure.in?rev=1539262&r1=1539261&r2=1539262&view=diff
==============================================================================
--- openoffice/trunk/main/configure.in (original)
+++ openoffice/trunk/main/configure.in Wed Nov 6 08:10:25 2013
@@ -325,7 +325,7 @@ AC_ARG_ENABLE(layout,
[ --enable-layout Enable the compilation and use of layout dialogs
],,)
AC_ARG_ENABLE(nss_module,
-[ --disable-nss-module Whether to use the system provided NSS module
+[ --disable-nss-module Whether to use the NSS module that is used for
xml-security
],,enable_nss_module=yes)
AC_ARG_ENABLE(kde,
[ --enable-kde Determines whether to use Qt/KDE vclplug on
platforms
@@ -422,6 +422,9 @@ AC_ARG_WITH(system-jars,
AC_ARG_WITH(system-zlib,
[ --with-system-zlib Use zlib already on system
],,)
+AC_ARG_WITH(system-nss,
+[ --with-system-nss Use NSS already on system
+],,)
AC_ARG_WITH(system-openssl,
[ --with-system-openssl Use OpenSSL already on system
],,)
@@ -5104,6 +5107,23 @@ AC_SUBST(XRANDR_LIBS)
AC_SUBST(ENABLE_RANDR)
dnl ===================================================================
+dnl Check for system nss
+dnl ===================================================================
+AC_MSG_CHECKING([which libnss to use])
+if test -n "$with_system_nss" -o -n "$with_system_libs" && test
"$with_system_nss" != "no"; then
+ AC_MSG_RESULT([external])
+ PKG_CHECK_MODULES( NSS, nss )
+ SYSTEM_NSS=YES
+else
+ AC_MSG_RESULT([internal])
+ SYSTEM_NSS=NO
+ BUILD_TYPE="$BUILD_TYPE NSS"
+fi
+AC_SUBST(SYSTEM_NSS)
+AC_SUBST(NSS_CFLAGS)
+AC_SUBST(NSS_LIBS)
+
+dnl ===================================================================
dnl Check for system openssl
dnl ===================================================================
if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
Modified: openoffice/trunk/main/external_deps.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/external_deps.lst?rev=1539262&r1=1539261&r2=1539262&view=diff
==============================================================================
--- openoffice/trunk/main/external_deps.lst (original)
+++ openoffice/trunk/main/external_deps.lst Wed Nov 6 08:10:25 2013
@@ -76,7 +76,7 @@ if (SOLAR_JAVA==TRUE && SYSTEM_LUCENE!=Y
URL1 =
http://archive.apache.org/dist/lucene/java/2.9.4/lucene-2.9.4-src.tar.gz
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (ENABLE_NSS_MODULE != NO)
+if (ENABLE_NSS_MODULE!=NO && SYSTEM_NSS!=YES)
MD5 = 1f24ab1d39f4a51faf22244c94a6203f
name = xmlsec1-1.2.14.tar.gz
URL1 = ftp://ftp.aleksey.com/pub/xmlsec/releases/xmlsec1-1.2.14.tar.gz
Modified: openoffice/trunk/main/nss/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/nss/makefile.mk?rev=1539262&r1=1539261&r2=1539262&view=diff
==============================================================================
--- openoffice/trunk/main/nss/makefile.mk (original)
+++ openoffice/trunk/main/nss/makefile.mk Wed Nov 6 08:10:25 2013
@@ -32,10 +32,10 @@ TARGET=nss
# --- Files --------------------------------------------------------
-.IF "$(ENABLE_NSS_MODULE)"!="YES"
+.IF "$(ENABLE_NSS_MODULE)"!="YES" || "$(SYSTEM_NSS)"=="YES"
all:
- @echo "NSS will not be built. ENABLE_NSS_MODULE is
'$(ENABLE_NSS_MODULE)'"
+ @echo "NSS will not be built because
ENABLE_NSS_MODULE='$(ENABLE_NSS_MODULE)' and SYSTEM_NSS='$(SYSTEM_NSS)'"
.ELSE
Modified: openoffice/trunk/main/set_soenv.in
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/set_soenv.in?rev=1539262&r1=1539261&r2=1539262&view=diff
==============================================================================
--- openoffice/trunk/main/set_soenv.in (original)
+++ openoffice/trunk/main/set_soenv.in Wed Nov 6 08:10:25 2013
@@ -1863,6 +1863,7 @@ ToFile( "BUILD_EPM", "@BUILD_EPM
ToFile( "PKGFORMAT", "@PKGFORMAT@", "e" );
ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" );
ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" );
+ToFile( "SYSTEM_NSS", "@SYSTEM_NSS@", "e" );
ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" );
ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
Modified: openoffice/trunk/main/xmlsecurity/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlsecurity/util/makefile.mk?rev=1539262&r1=1539261&r2=1539262&view=diff
==============================================================================
--- openoffice/trunk/main/xmlsecurity/util/makefile.mk (original)
+++ openoffice/trunk/main/xmlsecurity/util/makefile.mk Wed Nov 6 08:10:25 2013
@@ -98,7 +98,7 @@ SHL2STDLIBS += \
SHL2STDLIBS +=-ldl
.ENDIF
-.IF "$(SYSTEM_MOZILLA)" == "YES"
+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
.IF "$(NSPR_LIB)" != ""
SHL2STDLIBS += $(NSPR_LIB)
.ENDIF
