Kaydet (Commit) d3720991 authored tarafından Jan Holesovsky's avatar Jan Holesovsky

Decouple NSS build from the Mozilla build.

This allows xmlsecurity to be built even when --disable-mozilla is provided.
üst 5f3a31f6
......@@ -2321,13 +2321,11 @@ if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then
fi
if test $_os = WINNT -a \
\( "$enable_mozilla" = yes -o \
"$enable_nss_module" = yes -o \
"$enable_build_mozilla" = yes \); then
# We can't build against the Mozilla stuff if using _DEBUG, will get linking errors
# See connectivity/drivers/mozab
AC_MSG_WARN([Also disabling Mozilla stuff then])
enable_mozilla=no
enable_nss_module=no
enable_build_mozilla=no
fi
else
......@@ -5679,11 +5677,10 @@ else
fi
AC_SUBST(SYSTEM_ODBC_HEADERS)
AC_MSG_CHECKING([whether to enable build of Mozilla/Mozilla NSS-using components])
AC_MSG_CHECKING([whether to enable build of Mozilla])
if test "$enable_mozilla" = "no"; then
AC_MSG_RESULT([no])
WITH_MOZILLA=NO
ENABLE_NSS_MODULE=NO
else
AC_MSG_RESULT([yes])
WITH_MOZILLA=YES
......@@ -5700,8 +5697,8 @@ else
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])
if test "$enable_nss_module" = "no"; then
AC_MSG_RESULT([no, NSS disabled])
else
AC_MSG_RESULT([yes])
fi
......@@ -5841,8 +5838,6 @@ Please recompile $tmp with --enable-ldap or use --with-openldap.])
elif test "$enable_mozilla" = "no"; then
AC_MSG_RESULT([none])
WITH_MOZILLA=NO
ENABLE_NSS_MODULE=NO
enable_nss_module=no
else
AC_MSG_RESULT([internal])
SYSTEM_MOZILLA=NO
......@@ -5893,40 +5888,6 @@ else
AC_MSG_RESULT([no])
fi
AC_MSG_CHECKING([whether to build provided NSS module])
if test "$enable_nss_module" != "no"; then
ENABLE_NSS_MODULE="YES"
BUILD_TYPE="$BUILD_TYPE NSS"
AC_MSG_RESULT([yes])
if test "$build_os" = "cygwin"; then
AC_MSG_CHECKING([for Mozilla build tooling])
if test -z "$MOZILLABUILD" ; then
AC_MSG_ERROR([Mozilla build tooling not found.
Use the --with-mozilla-build option after installing the tools obtained
from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
else
if test \( "$WITH_MINGW" = "yes" \) ; then
if test ! -d "$MOZILLABUILD" ; then
AC_MSG_ERROR([Mozilla build tooling incomplete!])
else
AC_MSG_RESULT([ok])
fi
else
if test ! -d "$MOZILLABUILD/moztools" \
-o ! -d "$MOZILLABUILD/msys" ; then
AC_MSG_ERROR([Mozilla build tooling incomplete!])
else
AC_MSG_RESULT([ok])
fi
fi
fi
fi
else
ENABLE_NSS_MODULE="NO"
AC_MSG_RESULT([no])
fi
if test "$BUILD_MOZAB" = "TRUE"; then
if test "$_os" = "WINNT"; then
if test "$WITH_MINGW" != "yes"; then
......@@ -6008,7 +5969,6 @@ fi
AC_SUBST(BUILD_MOZAB)
fi
AC_SUBST(ENABLE_NSS_MODULE)
AC_SUBST(MOZILLABUILD)
AC_SUBST(SYSTEM_MOZILLA)
AC_SUBST(MOZ_FLAVOUR)
......@@ -6019,6 +5979,43 @@ AC_SUBST(MOZ_NSPR_CFLAGS)
AC_SUBST(MOZ_NSS_CFLAGS)
AC_SUBST(MOZ_LDAP_CFLAGS)
dnl ===================================================================
dnl Check for system NSS
dnl ===================================================================
AC_MSG_CHECKING([whether to build provided NSS module])
if test "$enable_nss_module" != "no"; then
ENABLE_NSS_MODULE="YES"
BUILD_TYPE="$BUILD_TYPE NSS"
AC_MSG_RESULT([yes])
if test "$build_os" = "cygwin"; then
AC_MSG_CHECKING([for Mozilla build tooling])
if test -z "$MOZILLABUILD" ; then
AC_MSG_ERROR([Mozilla build tooling not found.
Use the --with-mozilla-build option after installing the tools obtained
from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32])
else
if test \( "$WITH_MINGW" = "yes" \) ; then
if test ! -d "$MOZILLABUILD" ; then
AC_MSG_ERROR([Mozilla build tooling incomplete!])
else
AC_MSG_RESULT([ok])
fi
else
if test ! -d "$MOZILLABUILD/moztools" \
-o ! -d "$MOZILLABUILD/msys" ; then
AC_MSG_ERROR([Mozilla build tooling incomplete!])
else
AC_MSG_RESULT([ok])
fi
fi
fi
fi
else
ENABLE_NSS_MODULE="NO"
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_NSS_MODULE)
dnl ===================================================================
dnl Check for system sane
dnl ===================================================================
......
......@@ -35,9 +35,9 @@ EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
.INCLUDE : settings.mk
.IF "$(WITH_MOZILLA)" == "NO"
.IF "$(ENABLE_NSS_MODULE)" == "NO"
@all:
@echo "Mozilla disabled -> no nss -> no libxmlsec...."
@echo "NSS module disabled => no libxmlsec...."
.ENDIF
# --- Files --------------------------------------------------------
......
......@@ -276,7 +276,7 @@ my_components += \
my_components += ldapbe2
.END
.IF "$(WITH_MOZILLA)" != "NO"
.IF "$(ENABLE_NSS_MODULE)" != "NO"
my_components += \
component/xmlsecurity/util/xsec_fw \
pl
......
......@@ -1432,7 +1432,7 @@ File gid_File_Lib_XSec_XMLSecurity
Styles = (PACKED);
End
#ifndef WITHOUT_MOZILLA
#ifdef ENABLE_NSS_MODULE
File gid_File_Lib_XSec_Framework
TXT_FILE_BODY;
#ifdef UNX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment