Commits

Anonymous committed f372ed5

#i10000# regenerated configure

  • Participants
  • Parent commits 1793c3a

Comments (0)

Files changed (1)

 MOZ_INC
 MOZ_FLAVOUR
 SYSTEM_MOZILLA
+MOZILLABUILD
+ENABLE_NSS_MODULE
 BUILD_MOZAB
 MOZLIBREQ_LIBS
 MOZLIBREQ_CFLAGS
 enable_build_mozilla
 with_mozilla_version
 with_mozilla_toolkit
+enable_nss_module
 enable_kde
 enable_kdeab
 enable_kde4
 with_frame_home
 with_psdk_home
 with_directx_home
+with_mozilla_build
 with_local_solenv
 with_local_solver
 enable_check_only
                           mozilla components from the mozilla source code but
                           take precompiled zips
 
+  --disable-nss-module    Whether to use provided NSS module
+
   --enable-kde            Determines whether to use Qt/KDE vclplug on platforms
                           where Qt and KDE are available.
 
 
                           Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
 
+  --with-mozilla-build   For Windows users, please supply the path to the
+                          mozilla build tools.
+
+                          Usage: --with-mozilla-build=<absolute path to mozilla build tools>
+
   --with-local-solenv     If you have solenv in a location other than ./solenv,
                           please supply the path here.
 
   withval=$with_mozilla_toolkit;
 fi
 
+# Check whether --enable-nss_module was given.
+if test "${enable_nss_module+set}" = set; then
+  enableval=$enable_nss_module;
+else
+  enable_nss_module=yes
+fi
+
 # Check whether --enable-kde was given.
 if test "${enable_kde+set}" = set; then
   enableval=$enable_kde;
 fi
 
 
+# Check whether --with-mozilla-build was given.
+if test "${with_mozilla_build+set}" = set; then
+  withval=$with_mozilla_build; MOZILLABUILD=$withval
+fi
+
+
 # Check whether --with-local-solenv was given.
 if test "${with_local_solenv+set}" = set; then
   withval=$with_local_solenv;
 
 
 
+
 fi
 
 if test "$_os" = "SunOS"; then
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-
-cat >conftest.$ac_ext <<_ACEOF
+   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
    { $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
    WITH_MOZILLA=NO
+   ENABLE_NSS_MODULE=NO
 else
    { $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
     { $as_echo "$as_me:$LINENO: result: external" >&5
 $as_echo "external" >&6; }
     SYSTEM_MOZILLA=YES
+    ENABLE_NSS_MODULE=NO
+    enable_nss_module=no
     { $as_echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5
 $as_echo_n "checking which Mozilla flavour to use... " >&6; }
     if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
     { $as_echo "$as_me:$LINENO: result: none" >&5
 $as_echo "none" >&6; }
     WITH_MOZILLA=NO
+    ENABLE_NSS_MODULE=NO
+    enable_nss_module=no
 else
     { $as_echo "$as_me:$LINENO: result: internal" >&5
 $as_echo "internal" >&6; }
 $as_echo "no" >&6; }
 fi
 
+{ $as_echo "$as_me:$LINENO: checking whether to build provided NSS module" >&5
+$as_echo_n "checking whether to build provided NSS module... " >&6; }
+if test "$enable_nss_module" != "no"; then
+   ENABLE_NSS_MODULE="YES"
+   BUILD_TYPE="$BUILD_TYPE NSS"
+   { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+   if test "$_os" = "WINNT"; then
+      { $as_echo "$as_me:$LINENO: checking for Mozilla build tooling" >&5
+$as_echo_n "checking for Mozilla build tooling... " >&6; }
+      if test -z "$MOZILLABUILD" ; then
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling not found. Use --with-mozilla-build=<absolut path to mozilla build tooling (mozilla-build)>" >&5
+$as_echo "$as_me: error: Mozilla build tooling not found. Use --with-mozilla-build=<absolut path to mozilla build tooling (mozilla-build)>" >&2;}
+   { (exit 1); exit 1; }; }
+      else
+         if test \( "$WITH_MINGWIN" = "yes" \) ; then
+            if test ! -d "$MOZILLABUILD" ; then
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
+$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
+   { (exit 1); exit 1; }; }
+            else
+               { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+            fi
+         else
+            if test ! -d "$MOZILLABUILD/moztools" \
+               -o ! -d "$MOZILLABUILD/msys" ; then
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
+$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
+   { (exit 1); exit 1; }; }
+            else
+               { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+            fi
+         fi
+      fi
+   fi
+else
+   ENABLE_NSS_MODULE="NO"
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
 if test "$BUILD_MOZAB" = "TRUE"; then
   if test "$_os" = "WINNT"; then
     if test "$WITH_MINGWIN" != "yes"; then
 
 
 
+
+
 { $as_echo "$as_me:$LINENO: checking which sane header to use" >&5
 $as_echo_n "checking which sane header to use... " >&6; }
 if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \