[ooo-build-commit] Branch 'ooo/master' - configure
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri Aug 28 17:07:45 PDT 2009
configure | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 76 insertions(+), 2 deletions(-)
New commits:
commit 41695c78119e921c433bdead221b7ea2a4aebebc
Author: Vladimir Glazounov <vg at openoffice.org>
Date: Fri Aug 28 12:05:11 2009 +0000
#i10000# regenerated configure
diff --git a/configure b/configure
index cf1558b..4afd6e3 100755
--- a/configure
+++ b/configure
@@ -791,6 +791,8 @@ MOZ_LIB
MOZ_INC
MOZ_FLAVOUR
SYSTEM_MOZILLA
+MOZILLABUILD
+ENABLE_NSS_MODULE
BUILD_MOZAB
MOZLIBREQ_LIBS
MOZLIBREQ_CFLAGS
@@ -1078,6 +1080,7 @@ enable_layout
enable_build_mozilla
with_mozilla_version
with_mozilla_toolkit
+enable_nss_module
enable_kde
enable_kdeab
enable_kde4
@@ -1169,6 +1172,7 @@ with_nsis_path
with_frame_home
with_psdk_home
with_directx_home
+with_mozilla_build
with_local_solenv
with_local_solver
enable_check_only
@@ -1954,6 +1958,8 @@ Optional Features:
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.
@@ -2294,6 +2300,11 @@ Optional Packages:
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.
@@ -3166,6 +3177,13 @@ if test "${with_mozilla_toolkit+set}" = set; then
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;
@@ -3738,6 +3756,12 @@ if test "${with_directx_home+set}" = set; then
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;
@@ -10863,6 +10887,7 @@ $as_echo "no" >&6; }
+
fi
if test "$_os" = "SunOS"; then
@@ -11368,8 +11393,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
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
@@ -17226,6 +17250,7 @@ if test "$enable_mozilla" = "no"; then
{ $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; }
@@ -17608,6 +17633,8 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
{ $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
@@ -18366,6 +18393,8 @@ elif test "$enable_mozilla" = "no"; 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; }
@@ -18431,6 +18460,49 @@ else
$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
@@ -19124,6 +19196,8 @@ fi
+
+
{ $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" && \
More information about the ooo-build-commit
mailing list