Tag: cws_src680_systemmozilla User: rene Date: 05/03/03 05:40:26 Modified: /tools/config_office/ configure, configure.in, set_soenv.in /dba/connectivity/source/drivers/mozab/ makefile.mk /dba/connectivity/source/drivers/mozab/bootstrap/ makefile.mk /dba/connectivity/source/drivers/mozab/mozillasrc/ makefile.mk /util/extensions/source/config/ldap/ makefile.mk /external/libxmlsec/ makefile.mk /external/moz/zipped/ makefile.mk /installation/scp2/source/ooo/ file_library_ooo.scp, file_resource_ooo.scp, makefile.mk, module_hidden_ooo.scp /xml/xmlsecurity/source/xmlsec/ makefile.mk /xml/xmlsecurity/source/xmlsec/nss/ makefile.mk /xml/xmlsecurity/util/ makefile.mk
Log: #i17187# reanimate --disable-mozilla File Changes: Directory: /tools/config_office/ ================================ File [changed]: configure Url: http://tools.openoffice.org/source/browse/tools/config_office/configure?r1=1.63.14.8&r2=1.63.14.9 Delta lines: +88 -13 --------------------- --- configure 25 Feb 2005 04:05:38 -0000 1.63.14.8 +++ configure 3 Mar 2005 13:40:09 -0000 1.63.14.9 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision . +# From configure.in Revision: 1.80.12.9 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -309,7 +309,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH HAVE_GCC_VISIBILITY_FEATURE RPM GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVADOC JAVA_HOME JDK XSLTPROC XMKMF PERL DMAKE BUILD_DMAKE EPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS SYSTEM_NAS NAS_INCLUDES ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK CUSTOM_IMAGE_SETS LOCAL_SOLENV UPD SOURCEVERSION LOCAL_SOLVER LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN TCSH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH HAVE_GCC_VISIBILITY_FEATURE RPM GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVADOC JAVA_HOME JDK XSLTPROC XMKMF PERL DMAKE BUILD_DMAKE EPM SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSS_CFLAGS MOZ_NSS_LIBS SYSTEM_MOZILLA MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_XRENDER_HEADERS SYSTEM_NAS NAS_INCLUDES ENABLE_PASF SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE NEON_CFLAGS NEON_LIBS SYSTEM_NEON PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB WITH_LANG WITH_DICT ENABLE_STATIC_GTK CUSTOM_IMAGE_SETS LOCAL_SOLENV UPD SOURCEVERSION LOCAL_SOLVER LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -864,6 +864,12 @@ --enable-libsn Enables the use of libstartup-notification + --disable-mozilla OO.o usually includes a strangely hacked up mozilla + binary for your platform, to build without this + version, use this option. + + Usage: --disable-mozilla + --disable-epm OO.o includes self-packaging code, that requires epm, however epm is useless for large scale package building. @@ -1647,6 +1653,13 @@ enableval="$enable_libsn" fi; +# Check whether --enable-mozilla or --disable-mozilla was given. +if test "${enable_mozilla+set}" = set; then + enableval="$enable_mozilla" + +else + enable_mozilla="yes" +fi; # Check whether --with-fonts or --without-fonts was given. if test "${with_fonts+set}" = set; then @@ -9274,9 +9287,65 @@ fi -echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 +echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 +echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6 +if test "$enable_mozilla" = "no"; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + WITH_MOZILLA=NO +else + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + WITH_MOZILLA=YES +fi + + +echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5 +echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6 +if test "$enable_mozilla" = "no"; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +elif test -n "$with_system_mozilla"; then + echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5 +echo "${ECHO_T}no, not possible with system-mozilla" >&6 +else + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +fi + +echo "$as_me:$LINENO: checking whether to build XML Security support" >&5 +echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6 +if test "$enable_mozilla" = "no"; then + echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5 +echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6 +elif test "$with_system_mozilla" = "yes"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +fi + +echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5 +echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6 +if test "$enable_mozilla" = "no" && test "$enable_openldap" != "yes"; then + echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed." >&5 +echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed." >&6 + WITH_LDAP=NO +elif test "$with_system_mozilla" = "yes" || test "$enable_openldap" = "yes"; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + WITH_LDAP=YES +else + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + WITH_LDAP=YES +fi + +if test "$WITH_LDAP" = "YES"; then + echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6 -if test -n "$enable_openldap"; then + if test -n "$enable_openldap"; then echo "$as_me:$LINENO: result: OpenLDAP" >&5 echo "${ECHO_T}OpenLDAP" >&6 WITH_OPENLDAP=YES @@ -9589,12 +9658,13 @@ { (exit 1); exit 1; }; } fi -else + else echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5 echo "${ECHO_T}Netscape/Mozilla" >&6 # TODO. Actually do a sanity check and check for # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT WITH_OPENLDAP=NO + fi fi @@ -9895,6 +9965,10 @@ if test "$WITH_OPENLDAP" != "YES"; then MOZ_LDAP_CFLAGS="-I$MOZ_INC" fi +elif test "$enable_mozilla" = "no"; then + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 + WITH_MOZILLA=NO else echo "$as_me:$LINENO: result: internal" >&5 echo "${ECHO_T}internal" >&6 @@ -16206,6 +16280,7 @@ s,@CURL_LIBS@,$CURL_LIBS,;t t s,@SYSTEM_BOOST@,$SYSTEM_BOOST,;t t s,@SYSTEM_ODBC_HEADERS@,$SYSTEM_ODBC_HEADERS,;t t +s,@WITH_MOZILLA@,$WITH_MOZILLA,;t t s,@WITH_OPENLDAP@,$WITH_OPENLDAP,;t t s,@MOZILLAXPCOM_CFLAGS@,$MOZILLAXPCOM_CFLAGS,;t t s,@MOZILLAXPCOM_LIBS@,$MOZILLAXPCOM_LIBS,;t t File [changed]: configure.in Url: http://tools.openoffice.org/source/browse/tools/config_office/configure.in?r1=1.80.12.9&r2=1.80.12.10 Delta lines: +73 -21 --------------------- --- configure.in 25 Feb 2005 04:05:51 -0000 1.80.12.9 +++ configure.in 3 Mar 2005 13:40:12 -0000 1.80.12.10 @@ -3,7 +3,7 @@ dnl * dnl * Name: configure.in dnl * Auth: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems Ireland -dnl * Date: $Date: 2005/02/25 04:05:51 $ +dnl * Date: $Date: 2005/03/03 13:40:12 $ dnl * dnl * Desc: This file serves as input for the GNU autoconf package dnl * in order to create a configure script. @@ -12,7 +12,7 @@ dnl * dnl * dnl ******************************************************************/ -AC_REVISION( $Revision: 1.80.12.9 $ ) +AC_REVISION( $Revision: 1.80.12.10 $ ) AC_PREREQ(2.50) AC_INIT() echo "$@" >config.parms @@ -40,6 +40,13 @@ AC_ARG_ENABLE(libsn, [ --enable-libsn Enables the use of libstartup-notification ],,) +AC_ARG_ENABLE(mozilla, +[ --disable-mozilla OO.o usually includes a strangely hacked up mozilla + binary for your platform, to build without this + version, use this option. + + Usage: --disable-mozilla +],,enable_mozilla="yes") AC_ARG_WITH(fonts, [ --without-fonts Removes Bitstream Vera fonts from openoffice.org installation set, for people building @@ -2193,11 +2200,52 @@ fi AC_SUBST(SYSTEM_ODBC_HEADERS) -dnl =================================================================== -dnl Test whether we want to use the Mozilla or the OpenLDAP LDAP SDK -dnl =================================================================== -AC_MSG_CHECKING([which LDAP SDK to use]) -if test -n "$enable_openldap"; then +AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components]) +if test "$enable_mozilla" = "no"; then + AC_MSG_RESULT([no]) + WITH_MOZILLA=NO +else + AC_MSG_RESULT([yes]) + WITH_MOZILLA=YES +fi +AC_SUBST(WITH_MOZILLA) + +AC_MSG_CHECKING([whether to build Mozilla addressbook connectivity]) +if test "$enable_mozilla" = "no"; then + AC_MSG_RESULT([no]) +elif test -n "$with_system_mozilla"; then + AC_MSG_RESULT([no, not possible with system-mozilla]) +else + AC_MSG_RESULT([yes]) +fi + +AC_MSG_CHECKING([whether to build XML Security support]) +if test "$enable_mozilla" = "no"; then + AC_MSG_RESULT([no, since Mozilla (NSS) disabled but needed]) +elif test "$with_system_mozilla" = "yes"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([yes]) +fi + +AC_MSG_CHECKING([whether to build LDAP configuration backend]) +if test "$enable_mozilla" = "no" && test "$enable_openldap" != "yes"; then + AC_MSG_RESULT([no. Either Mozilla or OpenLDAP needed.]) + WITH_LDAP=NO +elif test "$with_system_mozilla" = "yes" || test "$enable_openldap" = "yes"; then + AC_MSG_RESULT([yes]) + WITH_LDAP=YES +else + AC_MSG_RESULT([yes]) + WITH_LDAP=YES +fi + +if test "$WITH_LDAP" = "YES"; then + dnl =================================================================== + dnl Test whether we want to use the Mozilla or the OpenLDAP LDAP SDK + dnl =================================================================== + AC_MSG_CHECKING([which LDAP SDK to use]) + if test -n "$enable_openldap"; then AC_MSG_RESULT([OpenLDAP]) WITH_OPENLDAP=YES AC_CHECK_HEADERS(ldap.h, [], @@ -2208,11 +2256,12 @@ # it has it. Test for it to be sure AC_CHECK_LIB(ldap, ldap_set_option, [], [AC_MSG_ERROR(openldap lib not found or functional)], []) -else + else AC_MSG_RESULT([Netscape/Mozilla]) # TODO. Actually do a sanity check and check for # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT WITH_OPENLDAP=NO + fi fi AC_SUBST(WITH_OPENLDAP) @@ -2243,6 +2292,9 @@ if test "$WITH_OPENLDAP" != "YES"; then MOZ_LDAP_CFLAGS="-I$MOZ_INC" fi +elif test "$enable_mozilla" = "no"; then + AC_MSG_RESULT([none]) + WITH_MOZILLA=NO else AC_MSG_RESULT([internal]) SYSTEM_MOZILLA=NO File [changed]: set_soenv.in Url: http://tools.openoffice.org/source/browse/tools/config_office/set_soenv.in?r1=1.29.12.8&r2=1.29.12.9 Delta lines: +3 -2 ------------------- --- set_soenv.in 25 Feb 2005 04:06:01 -0000 1.29.12.8 +++ set_soenv.in 3 Mar 2005 13:40:12 -0000 1.29.12.9 @@ -1,8 +1,8 @@ [EMAIL PROTECTED]@ -w # # Program: set_soenv.in -# Version: $Revision: 1.29.12.8 $ -# Date: $Date: 2005/02/25 04:06:01 $ +# Version: $Revision: 1.29.12.9 $ +# Date: $Date: 2005/03/03 13:40:12 $ # Author: Willem van Dorp, Ross Nicholson, Oisin Boydell - Sun Microsystems, Ireland. # #--------------------------------------------------------------------------- @@ -1748,6 +1748,7 @@ ToFile( "LIBSN_CFLAGS", "@LIBSN_CFLAGS@", "e" ); ToFile( "LIBSN_LIBS", "@LIBSN_LIBS@", "e" ); ToFile( "WITH_OPENLDAP", "@WITH_OPENLDAP@", "e" ); +ToFile( "WITH_MOZILLA", "@WITH_MOZILLA@", "e" ); ToFile( "SYSTEM_MOZILLA", "@SYSTEM_MOZILLA@", "e" ); ToFile( "MOZ_INC", "@MOZ_INC@", "e" ); ToFile( "MOZ_LIB", "@MOZ_LIB@", "e" ); Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/makefile.mk?r1=1.15.36.2&r2=1.15.36.3 Delta lines: +5 -4 ------------------- --- makefile.mk 25 Feb 2005 03:56:12 -0000 1.15.36.2 +++ makefile.mk 3 Mar 2005 13:40:13 -0000 1.15.36.3 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15.36.2 $ +# $Revision: 1.15.36.3 $ # -# last change: $Author: rene $ $Date: 2005/02/25 03:56:12 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:13 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -64,7 +64,8 @@ PRJNAME=connectivity TARGET=$(MOZAB_TARGET) TARGET2=$(MOZAB_TARGET)drv -.IF "$(OS)"=="MACOSX" || "$(SYSTEM_MOZILLA)" == "YES" + +.IF "$(.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" all: @echo " Not building the mozabsrc stuff in OpenOffice.org build" @echo " dependency to Mozilla developer snapshots not feasable at the moment" Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/makefile.mk?r1=1.2&r2=1.2.2.1 Delta lines: +3 -3 ------------------- --- makefile.mk 21 Feb 2005 12:29:51 -0000 1.2 +++ makefile.mk 3 Mar 2005 13:40:14 -0000 1.2.2.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.2 $ +# $Revision: 1.2.2.1 $ # -# last change: $Author: vg $ $Date: 2005/02/21 12:29:51 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,7 +84,7 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" || "$(WITH_MOZILLA)" == "NO" +.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" Directory: /dba/connectivity/source/drivers/mozab/mozillasrc/ ============================================================= File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/mozillasrc/makefile.mk?r1=1.13.52.2&r2=1.13.52.3 Delta lines: +4 -4 ------------------- --- makefile.mk 25 Feb 2005 03:58:31 -0000 1.13.52.2 +++ makefile.mk 3 Mar 2005 13:40:14 -0000 1.13.52.3 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.13.52.2 $ +# $Revision: 1.13.52.3 $ # -# last change: $Author: rene $ $Date: 2005/02/25 03:58:31 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:14 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -84,7 +84,7 @@ .INCLUDE : settings.mk -.IF "$(OS)"=="MACOSX" || "$(SYSTEM_MOZILLA)" == "YES" +.IF "$(OS)"=="MACOSX" || ( "$(SYSTEM_MOZILLA)" == "YES" && "$(WITH_MOZILLA)" == "YES") || "$(WITH_MOZILLA)" == "NO" dummy: @echo " Not building the mozillasrc stuff in OpenOffice.org build" Directory: /util/extensions/source/config/ldap/ =============================================== File [changed]: makefile.mk Url: http://util.openoffice.org/source/browse/util/extensions/source/config/ldap/makefile.mk?r1=1.4.24.2&r2=1.4.24.3 Delta lines: +8 -3 ------------------- --- makefile.mk 27 Jan 2005 19:26:59 -0000 1.4.24.2 +++ makefile.mk 3 Mar 2005 13:40:15 -0000 1.4.24.3 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4.24.2 $ +# $Revision: 1.4.24.3 $ # -# last change: $Author: rene $ $Date: 2005/01/27 19:26:59 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:15 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -74,6 +74,11 @@ .INCLUDE : settings.mk DLLPRE = + +.IF "$(WITH_MOZILLA)" == "NO" && "$(WITH_OPENLDAP)" != "YES" [EMAIL PROTECTED]: + @echo "Mozilla disabled and no OpenLDAP wanted -> LDAP disabled." +.ENDIF .IF "$(LDAPSDKINCLUDES)" == "" Directory: /external/libxmlsec/ =============================== File [changed]: makefile.mk Url: http://external.openoffice.org/source/browse/external/libxmlsec/makefile.mk?r1=1.1.1.1.12.1&r2=1.1.1.1.12.2 Delta lines: +7 -2 ------------------- --- makefile.mk 6 Jan 2005 18:58:34 -0000 1.1.1.1.12.1 +++ makefile.mk 3 Mar 2005 13:40:15 -0000 1.1.1.1.12.2 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1.1.1.12.1 $ +# $Revision: 1.1.1.1.12.2 $ # -# last change: $Author: rene $ $Date: 2005/01/06 18:58:34 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:15 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -68,6 +68,11 @@ # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk + +.IF "$(WITH_MOZILLA)" == "NO" [EMAIL PROTECTED]: + @echo "Mozilla disabled -> no nss -> no libxmlsec...." +.ENDIF # --- Files -------------------------------------------------------- Directory: /external/moz/zipped/ ================================ File [changed]: makefile.mk Url: http://external.openoffice.org/source/browse/external/moz/zipped/makefile.mk?r1=1.10.10.1&r2=1.10.10.2 Delta lines: +3 -3 ------------------- --- makefile.mk 6 Jan 2005 18:58:36 -0000 1.10.10.1 +++ makefile.mk 3 Mar 2005 13:40:16 -0000 1.10.10.2 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.10.10.1 $ +# $Revision: 1.10.10.2 $ # -# last change: $Author: rene $ $Date: 2005/01/06 18:58:36 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:16 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -71,7 +71,7 @@ # --- Files -------------------------------------------------------- -.IF "$(OS)" == "MACOSX" || "$(SYSTEM_MOZILLA)" == "YES" +.IF "$(OS)" == "MACOSX" || "$(SYSTEM_MOZILLA)" == "YES" || "$(WITH_MOZILLA)" == "NO" dummy: @echo "Nothing to build for OS $(OS)" Directory: /installation/scp2/source/ooo/ ========================================= File [changed]: file_library_ooo.scp Url: http://installation.openoffice.org/source/browse/installation/scp2/source/ooo/file_library_ooo.scp?r1=1.74.6.7&r2=1.74.6.8 Delta lines: +9 -5 ------------------- --- file_library_ooo.scp 25 Feb 2005 04:06:57 -0000 1.74.6.7 +++ file_library_ooo.scp 3 Mar 2005 13:40:18 -0000 1.74.6.8 @@ -2,9 +2,9 @@ * * $RCSfile: file_library_ooo.scp,v $ * -* $Revision: 1.74.6.7 $ +* $Revision: 1.74.6.8 $ * -* last change: $Author: rene $ $Date: 2005/02/25 04:06:57 $ +* last change: $Author: rene $ $Date: 2005/03/03 13:40:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -186,6 +186,7 @@ End #ifndef WITHOUT_LDAP +#if !defined WITHOUT_MOZILLA || defined WITH_OPENLDAP File gid_File_Lib_Ldapbe2 TXT_FILE_BODY; Styles = (PACKED,UNO_COMPONENT); @@ -198,6 +199,7 @@ #endif End #endif +#endif // BM: #117495# remove chart2 from setup. I just comment this // out, because it will later be re-added @@ -1103,7 +1105,7 @@ #endif End -#if !defined(MACOSX) && !defined(SYSTEM_MOZILLA) +#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) ) File gid_File_Lib_Mozab_2 TXT_FILE_BODY; @@ -1121,7 +1123,7 @@ STD_UNO_LIB_FILE(GID_FILE_LIB_WPD,wpft) -#if !defined(MACOSX) && !defined(SYSTEM_MOZILLA) +#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) ) File gid_File_Lib_Mozabdrv TXT_FILE_BODY; @@ -2056,6 +2058,7 @@ #endif #endif +#ifndef WITHOUT_MOZILLA File gid_File_Lib_XSec_Framework TXT_FILE_BODY; #ifdef UNX @@ -2121,6 +2124,7 @@ End #endif //i20156 - end +#endif File gid_File_Lib_Migrationoo2 TXT_FILE_BODY; File [changed]: file_resource_ooo.scp Url: http://installation.openoffice.org/source/browse/installation/scp2/source/ooo/file_resource_ooo.scp?r1=1.17&r2=1.17.14.1 Delta lines: +6 -3 ------------------- --- file_resource_ooo.scp 11 Feb 2005 15:54:55 -0000 1.17 +++ file_resource_ooo.scp 3 Mar 2005 13:40:18 -0000 1.17.14.1 @@ -2,9 +2,9 @@ * * $RCSfile: file_resource_ooo.scp,v $ * -* $Revision: 1.17 $ +* $Revision: 1.17.14.1 $ * -* last change: $Author: hr $ $Date: 2005/02/11 15:54:55 $ +* last change: $Author: rene $ $Date: 2005/03/03 13:40:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -185,4 +185,7 @@ STD_RES_FILE( gid_File_Res_AVMedia, avmedia ) +#ifndef WITHOUT_MOZILLA STD_RES_FILE( gid_File_Res_XMLSecurity, xmlsec ) +#endif + File [changed]: makefile.mk Url: http://installation.openoffice.org/source/browse/installation/scp2/source/ooo/makefile.mk?r1=1.13.46.6&r2=1.13.46.7 Delta lines: +9 -1 ------------------- --- makefile.mk 25 Feb 2005 04:07:06 -0000 1.13.46.6 +++ makefile.mk 3 Mar 2005 13:40:19 -0000 1.13.46.7 @@ -118,8 +118,16 @@ SCPDEFS+=-DUSE_SYSTEM_STL .ENDIF +.IF "$(WITH_MOZILLA)" == "NO" +SCPDEFS+=-DWITHOUT_MOZILLA +.ENDIF + .IF "$(SYSTEM_MOZILLA)" == "YES" SCPDEFS+=-DSYSTEM_MOZILLA +.ENDIF + +.IF "$(WITH_OPENLDAP)" == "YES" +SCPDEFS+=-DWITH_OPENLDAP .ENDIF .IF "$(SYSTEM_CURL)" == "YES" File [changed]: module_hidden_ooo.scp Url: http://installation.openoffice.org/source/browse/installation/scp2/source/ooo/module_hidden_ooo.scp?r1=1.2&r2=1.2.18.1 Delta lines: +8 -2 ------------------- --- module_hidden_ooo.scp 31 Jan 2005 11:01:15 -0000 1.2 +++ module_hidden_ooo.scp 3 Mar 2005 13:40:19 -0000 1.2.18.1 @@ -2,9 +2,9 @@ * * $RCSfile: module_hidden_ooo.scp,v $ * -* $Revision: 1.2 $ +* $Revision: 1.2.18.1 $ * -* last change: $Author: rt $ $Date: 2005/01/31 11:01:15 $ +* last change: $Author: rene $ $Date: 2005/03/03 13:40:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -338,11 +338,13 @@ gid_File_Jar_AVmedia, gid_File_Lib_AVMediaWin, gid_File_Lib_XSec_Framework, +#ifndef WITHOUT_MOZILLA gid_File_Lib_XSec_XmlSec, gid_File_Lib_XSec_XMLSecurity, gid_File_Lib_LibXMLSec_xmlseccore, gid_File_Lib_LibXMLSec_xmlsecmscrypto, gid_File_Lib_LibXMLSec_xmlsecnss, +#endif gid_File_Lib_Migrationoo2); End @@ -799,8 +801,12 @@ gid_File_Res_Uui, gid_File_Res_Vcl, gid_File_Res_Xsltdlg, +#ifndef WITHOUT_MOZILLA gid_File_Res_AVMedia, gid_File_Res_XMLSecurity); +#else + gid_File_Res_AVMedia); +#endif End #ifndef WITHOUT_FONTS Directory: /xml/xmlsecurity/source/xmlsec/ ========================================== File [changed]: makefile.mk Url: http://xml.openoffice.org/source/browse/xml/xmlsecurity/source/xmlsec/makefile.mk?r1=1.6&r2=1.6.8.1 Delta lines: +7 -3 ------------------- --- makefile.mk 26 Nov 2004 14:57:29 -0000 1.6 +++ makefile.mk 3 Mar 2005 13:40:20 -0000 1.6.8.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.6 $ +# $Revision: 1.6.8.1 $ # -# last change: $Author: rt $ $Date: 2004/11/26 14:57:29 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:20 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -82,6 +82,10 @@ CDEFS += -DXMLSEC_CRYPTO_MSCRYPTO -DXMLSEC_NO_XSLT .ELSE CDEFS += -DXMLSEC_CRYPTO_NSS -DXMLSEC_NO_XSLT +.IF "$(WITH_MOZILLA)" == "NO" [EMAIL PROTECTED]: + @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity.." +.ENDIF .ENDIF # --- Files -------------------------------------------------------- Directory: /xml/xmlsecurity/source/xmlsec/nss/ ============================================== File [changed]: makefile.mk Url: http://xml.openoffice.org/source/browse/xml/xmlsecurity/source/xmlsec/nss/makefile.mk?r1=1.3.14.3&r2=1.3.14.4 Delta lines: +7 -2 ------------------- --- makefile.mk 17 Jan 2005 19:03:45 -0000 1.3.14.3 +++ makefile.mk 3 Mar 2005 13:40:21 -0000 1.3.14.4 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3.14.3 $ +# $Revision: 1.3.14.4 $ # -# last change: $Author: rene $ $Date: 2005/01/17 19:03:45 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:21 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -83,6 +83,11 @@ .ENDIF .IF "$(CRYPTO_ENGINE)" == "nss" + +.IF "$(WITH_MOZILLA)" == "NO" [EMAIL PROTECTED]: + @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity/nss" +.ENDIF .IF "$(SYSTEM_MOZILLA)" != "YES" MOZ_INC = $(SOLARVERSION)$/$(INPATH)$/inc$(UPDMINOREXT)$/mozilla Directory: /xml/xmlsecurity/util/ ================================= File [changed]: makefile.mk Url: http://xml.openoffice.org/source/browse/xml/xmlsecurity/util/makefile.mk?r1=1.15&r2=1.15.22.1 Delta lines: +6 -2 ------------------- --- makefile.mk 8 Sep 2004 12:40:53 -0000 1.15 +++ makefile.mk 3 Mar 2005 13:40:23 -0000 1.15.22.1 @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.15 $ +# $Revision: 1.15.22.1 $ # -# last change: $Author: kz $ $Date: 2004/09/08 12:40:53 $ +# last change: $Author: rene $ $Date: 2005/03/03 13:40:23 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -74,6 +74,10 @@ .INCLUDE : settings.mk .INCLUDE : $(PRJ)$/util$/target.pmk +.IF "$(WITH_MOZILLA)" == "NO" [EMAIL PROTECTED]: + @echo "No mozilla -> no nss -> no libxmlsec -> no xmlsecurity..." +.ENDIF # --- Allgemein ---------------------------------------------------- NO_BSYMBOLIC=TRUE --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
