You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/10/16 16:47:08 UTC
svn commit: r1532783 - in /openoffice/branches/Remove_MOZ/main: configure.in
external_deps.lst nss/makefile.mk scp2/source/ooo/file_library_ooo.scp
scp2/source/ooo/makefile.mk set_soenv.in xmlsecurity/util/makefile.mk
Author: hdu
Date: Wed Oct 16 14:47:07 2013
New Revision: 1532783
URL: http://svn.apache.org/r1532783
Log:
#i122365# allow using the system-provided NSS library
Modified:
openoffice/branches/Remove_MOZ/main/configure.in
openoffice/branches/Remove_MOZ/main/external_deps.lst
openoffice/branches/Remove_MOZ/main/nss/makefile.mk
openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp
openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk
openoffice/branches/Remove_MOZ/main/set_soenv.in
openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk
Modified: openoffice/branches/Remove_MOZ/main/configure.in
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/configure.in?rev=1532783&r1=1532782&r2=1532783&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/configure.in (original)
+++ openoffice/branches/Remove_MOZ/main/configure.in Wed Oct 16 14:47:07 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 provided NSS module
+[ --disable-nss-module Whether to use the system provided NSS module
],,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/branches/Remove_MOZ/main/external_deps.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/external_deps.lst?rev=1532783&r1=1532782&r2=1532783&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/external_deps.lst (original)
+++ openoffice/branches/Remove_MOZ/main/external_deps.lst Wed Oct 16 14:47:07 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/branches/Remove_MOZ/main/nss/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/nss/makefile.mk?rev=1532783&r1=1532782&r2=1532783&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/nss/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/nss/makefile.mk Wed Oct 16 14:47:07 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/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp?rev=1532783&r1=1532782&r2=1532783&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/file_library_ooo.scp Wed Oct 16 14:47:07 2013
@@ -1695,7 +1695,30 @@ SPECIAL_LIB_FILE( gid_File_Lib_AVMediaWi
#endif
#endif
-#ifndef WITHOUT_MOZILLA
+
+#ifdef BUNDLE_NSS_LIBS
+
+STD_LIB_FILE( gid_File_Lib_Freebl3, freebl3)
+STD_LIB_FILE( gid_File_Lib_Nspr4, nspr4)
+STD_LIB_FILE( gid_File_Lib_Nss3, nss3)
+STD_LIB_FILE( gid_File_Lib_Nsckbi, nssckbi)
+STD_LIB_FILE( gid_File_Lib_Nssdbm3, nssdbm3)
+STD_LIB_FILE( gid_File_Lib_Nssutil3, nssutil3)
+STD_LIB_FILE( gid_File_Lib_Plc4, plc4)
+STD_LIB_FILE( gid_File_Lib_Plds4, plds4)
+STD_LIB_FILE( gid_File_Lib_Smime3, smime3)
+STD_LIB_FILE( gid_File_Lib_Softokn3, softokn3)
+STD_LIB_FILE( gid_File_Lib_Ssl3, ssl3)
+
+#ifndef MACOSX // #i122483# use system sqlite3 on MacOSX
+STD_LIB_FILE( gid_File_Lib_Sqlite3, sqlite3)
+#endif
+
+#endif // BUNDLE_NSS_LIBS
+
+
+#ifdef ENABLE_XMLSEC
+
File gid_File_Lib_XSec_Framework
TXT_FILE_BODY;
#ifdef UNX
@@ -1730,6 +1753,7 @@ File gid_File_Lib_XSec_XMLSecurity
End
#ifdef WNT
+
File gid_File_Lib_LibXMLSec_xmlseccore
TXT_FILE_BODY;
#ifdef _gcc3
@@ -1751,10 +1775,11 @@ File gid_File_Lib_LibXMLSec_xmlsecmscryp
Dir = SCP2_OOO_BIN_DIR;
Styles = (PACKED);
End
-#endif
-//i20156 - end
-#endif
+#endif // WNT
+
+#endif // ENABLE_XMLSEC
+
File gid_File_Lib_Migrationoo2
TXT_FILE_BODY;
Modified: openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk?rev=1532783&r1=1532782&r2=1532783&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/scp2/source/ooo/makefile.mk Wed Oct 16 14:47:07 2013
@@ -130,7 +130,9 @@ SCPDEFS+=-DWITHOUT_MYSPELL_DICTS
.IF "$(ENABLE_NSS_MODULE)" == "YES"
SCPDEFS+=-DENABLE_XMLSEC
-SCPDEFS+=-DBUNDLE_NSS_LIBS
+ .IF $(SYSTEM_NSS) != "YES"
+ SCPDEFS+=-DBUNDLE_NSS_LIBS
+ .ENDIF
.ENDIF
.IF "$(WITH_LDAP)" == "YES"
Modified: openoffice/branches/Remove_MOZ/main/set_soenv.in
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/set_soenv.in?rev=1532783&r1=1532782&r2=1532783&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/set_soenv.in (original)
+++ openoffice/branches/Remove_MOZ/main/set_soenv.in Wed Oct 16 14:47:07 2013
@@ -1857,6 +1857,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/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk?rev=1532783&r1=1532782&r2=1532783&view=diff
==============================================================================
--- openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk (original)
+++ openoffice/branches/Remove_MOZ/main/xmlsecurity/util/makefile.mk Wed Oct 16 14:47:07 2013
@@ -102,7 +102,7 @@ SHL2STDLIBS += \
SHL2STDLIBS +=-ldl
.ENDIF
-.IF "$(ENABLE_NSS_MODULE)"=="YES"
+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
.IF "$(NSPR_LIB)" != ""
SHL2STDLIBS += $(NSPR_LIB)
.ENDIF