Bug 575509 Port |
Bug 516758 - Remove more options from configure| to comm-central. r=Callek
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -213,21 +213,16 @@ MOZ_STARTUP_NOTIFICATION_LIBS = @MOZ_STA
MOZ_ENABLE_GNOMEVFS = @MOZ_ENABLE_GNOMEVFS@
MOZ_ENABLE_GCONF = @MOZ_ENABLE_GCONF@
MOZ_GCONF_CFLAGS = @MOZ_GCONF_CFLAGS@
MOZ_GCONF_LIBS = @MOZ_GCONF_LIBS@
MOZ_ENABLE_GNOME_COMPONENT = @MOZ_ENABLE_GNOME_COMPONENT@
-MOZ_INSURE = @MOZ_INSURE@
-MOZ_INSURIFYING = @MOZ_INSURIFYING@
-MOZ_INSURE_DIRS = @MOZ_INSURE_DIRS@
-MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@
-
MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@
MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@
BUILD_CTYPES = @BUILD_CTYPES@
COMPILE_ENVIRONMENT = @COMPILE_ENVIRONMENT@
CROSS_COMPILE = @CROSS_COMPILE@
--- a/config/config.mk
+++ b/config/config.mk
@@ -51,21 +51,16 @@ EXIT_ON_ERROR = set -e; # Shell loops co
ifndef topsrcdir
topsrcdir = $(DEPTH)
endif
ifndef INCLUDED_AUTOCONF_MK
include $(DEPTH)/config/autoconf.mk
endif
-ifndef INCLUDED_INSURE_MK
-ifdef MOZ_INSURIFYING
-include $(MOZILLA_SRCDIR)/config/insure.mk
-endif
-endif
COMMA = ,
# Sanity check some variables
CHECK_VARS := \
XPI_NAME \
LIBRARY_NAME \
MODULE \
--- a/configure.in
+++ b/configure.in
@@ -1472,20 +1472,17 @@ if test "$GNU_CC"; then
;;
esac
fi
dnl Turn pedantic on but disable the warnings for long long
_PEDANTIC=1
if test -z "$INTEL_CC"; then
- _IGNORE_LONG_LONG_WARNINGS=1
_WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} -W"
- else
- _IGNORE_LONG_LONG_WARNINGS=
fi
_DEFINES_CFLAGS='-include $(DEPTH)/comm-config.h -DMOZILLA_CLIENT'
_USE_CPP_INCLUDE_FLAG=1
elif test "$SOLARIS_SUNPRO_CC"; then
DSO_CFLAGS=''
if test "$CPU_ARCH" = "sparc"; then
@@ -1862,17 +1859,16 @@ case "$target" in
_MOZ_USE_RTTI=1
USE_DEPENDENT_LIBS=
MOZ_USER_DIR="Mozilla"
;;
*-bsdi*)
dnl -pedantic doesn't play well with BSDI's _very_ modified gcc (shlicc2)
_PEDANTIC=
- _IGNORE_LONG_LONG_WARNINGS=
case $OS_RELEASE in
4.*|5.*)
STRIP="$STRIP -d"
;;
*)
DSO_CFLAGS=''
DSO_LDOPTS='-r'
_WARNINGS_CFLAGS="-Wall"
@@ -5612,26 +5608,23 @@ then
SQLITE_CFLAGS=
SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,mozsqlite3,$(DIST)/lib)'
else
PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
fi
AC_SUBST(MOZ_NATIVE_SQLITE)
+dnl ========================================================
dnl = Enable help viewer (off by default)
dnl ========================================================
-MOZ_ARG_ENABLE_BOOL(help-viewer,
-[ --enable-help-viewer Enable help viewer],
- MOZ_HELP_VIEWER=1,
- MOZ_HELP_VIEWER= )
if test -n "$MOZ_HELP_VIEWER"; then
+ dnl Do this if defined in confvars.sh
AC_DEFINE(MOZ_HELP_VIEWER)
fi
-AC_SUBST(MOZ_HELP_VIEWER)
dnl ========================================================
dnl = Enable safe browsing (anti-phishing)
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(safe-browsing,
[ --enable-safe-browsing Enable safe browsing (anti-phishing) implementation],
MOZ_SAFE_BROWSING=1,
MOZ_SAFE_BROWSING= )
@@ -6219,37 +6212,16 @@ if test -n "$ENABLE_EAZEL_PROFILER"; the
EAZEL_PROFILER_LIBS="-lprofiler -lpthread"
fi
MOZ_ARG_ENABLE_STRING(profile-modules,
[ --enable-profile-modules
Enable/disable profiling for specific modules],
[ MOZ_PROFILE_MODULES=`echo $enableval| sed 's/,/ /g'` ] )
-MOZ_ARG_ENABLE_BOOL(insure,
-[ --enable-insure Enable insure++ instrumentation (linux only)],
- _ENABLE_INSURE=1,
- _ENABLE_INSURE= )
-if test -n "$_ENABLE_INSURE"; then
- MOZ_INSURE="insure"
- MOZ_INSURIFYING=1
- MOZ_INSURE_DIRS="."
- MOZ_INSURE_EXCLUDE_DIRS="config"
-fi
-
-MOZ_ARG_WITH_STRING(insure-dirs,
-[ --with-insure-dirs=DIRS
- Dirs to instrument with insure ],
- MOZ_INSURE_DIRS=$withval )
-
-MOZ_ARG_WITH_STRING(insure-exclude-dirs,
-[ --with-insure-exclude-dirs=DIRS
- Dirs to not instrument with insure ],
- MOZ_INSURE_EXCLUDE_DIRS="config $withval" )
-
dnl ========================================================
dnl = Support for Quantify (Windows)
dnl ========================================================
MOZ_ARG_ENABLE_BOOL(quantify,
[ --enable-quantify Enable Quantify support (Windows only) ],
MOZ_QUANTIFY=1,
MOZ_QUANTIFY= )
@@ -6401,38 +6373,16 @@ if test -n "$GNU_CC" && test -n "$GNU_CX
fi
rm -f dummy-hello.c dummy-hello.s dummy-hello.S dummy-hello a.out
AC_MSG_RESULT([$_res])
else
AC_MSG_RESULT([no])
fi
dnl ========================================================
-dnl Pass -Wno-long-long to the compiler
-dnl ========================================================
-MOZ_ARG_DISABLE_BOOL(long-long-warning,
-[ --disable-long-long-warning
- Do not warn about use of non-ANSI long long type (if supported)],
- _IGNORE_LONG_LONG_WARNINGS=1,
- _IGNORE_LONG_LONG_WARNINGS=)
-
-if test -n "$_IGNORE_LONG_LONG_WARNINGS"; then
- _SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long"
- AC_MSG_CHECKING([whether compiler supports -Wno-long-long])
- AC_TRY_COMPILE([], [return(0);],
- [ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long"
- result="yes" ],
- result="no")
- AC_MSG_RESULT([$result])
- CFLAGS="$_SAVE_CFLAGS"
-fi
-
-dnl ========================================================
dnl Profile guided optimization
dnl ========================================================
dnl Test for profiling options
dnl Under gcc 3.3, use -fprofile-arcs/-fbranch-probabilities
dnl Under gcc 3.4+, use -fprofile-generate/-fprofile-use
dnl Provide a switch to disable PGO even when called via profiledbuild.
MOZ_ARG_DISABLE_BOOL(profile-guided-optimization,
@@ -6498,28 +6448,28 @@ AC_LANG_CPLUSPLUS
dnl ========================================================
dnl Test for -pedantic bustage
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(pedantic,
[ --disable-pedantic Issue all warnings demanded by strict ANSI C ],
_PEDANTIC= )
if test "$_PEDANTIC"; then
_SAVE_CXXFLAGS=$CXXFLAGS
- CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
+ CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic ${_COMPILER_PREFIX}-Wno-long-long"
AC_MSG_CHECKING([whether C++ compiler has -pedantic long long bug])
AC_TRY_COMPILE([$configure_static_assert_macros],
[CONFIGURE_STATIC_ASSERT(sizeof(long long) == 8)],
result="no", result="yes" )
AC_MSG_RESULT([$result])
CXXFLAGS="$_SAVE_CXXFLAGS"
case "$result" in
no)
- _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-pedantic"
- _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic"
+ _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-pedantic ${_COMPILER_PREFIX}-Wno-long-long"
+ _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic ${_COMPILER_PREFIX}-Wno-long-long"
;;
yes)
AC_MSG_ERROR([Your compiler appears to have a known bug where long long is miscompiled when using -pedantic. Reconfigure using --disable-pedantic. ])
;;
esac
fi
dnl ========================================================
@@ -6985,30 +6935,27 @@ AC_SUBST(ENABLE_EAZEL_PROFILER)
AC_SUBST(EAZEL_PROFILER_CFLAGS)
AC_SUBST(EAZEL_PROFILER_LIBS)
AC_SUBST(GC_LEAK_DETECTOR)
AC_SUBST(MOZ_LOG_REFCNT)
AC_SUBST(MOZ_JPROF)
AC_SUBST(MOZ_SHARK)
AC_SUBST(MOZ_JSLOADER)
AC_SUBST(MOZ_USE_NATIVE_UCONV)
-AC_SUBST(MOZ_INSURE)
-AC_SUBST(MOZ_INSURE_DIRS)
-AC_SUBST(MOZ_INSURE_EXCLUDE_DIRS)
AC_SUBST(MOZ_QUANTIFY)
-AC_SUBST(MOZ_INSURIFYING)
AC_SUBST(MOZ_LDAP_XPCOM)
AC_SUBST(MOZ_LDAP_XPCOM_EXPERIMENTAL)
AC_SUBST(LDAP_CFLAGS)
AC_SUBST(LDAP_LIBS)
AC_SUBST(LIBICONV)
AC_SUBST(MOZ_PLACES_BOOKMARKS)
AC_SUBST(MOZ_STORAGE)
AC_SUBST(MOZ_FEEDS)
AC_SUBST(NS_PRINTING)
+AC_SUBST(MOZ_HELP_VIEWER)
AC_SUBST(MOZ_PROFILELOCKING)
AC_SUBST(XPCOM_USE_LEA)
AC_SUBST(BUILD_STATIC_LIBS)
AC_SUBST(MOZ_ENABLE_LIBXUL)
AC_SUBST(ENABLE_TESTS)
AC_SUBST(IBMBIDI)