forked from mirrors/gecko-dev
bug 516758 - Remove more options from configure r=ted
This commit is contained in:
Mitchell Field
parent
5f2efb357b
commit
1a41dcccd8
9 changed files with 2 additions and 212 deletions
|
|
@ -42,7 +42,6 @@ MOZ_PHOENIX=1
|
|||
|
||||
MOZ_ENABLE_LIBXUL=1
|
||||
MOZ_STATIC_BUILD_UNSUPPORTED=1
|
||||
MOZ_PLACES=1
|
||||
# always enabled for form history
|
||||
MOZ_MORKREADER=1
|
||||
MOZ_SAFE_BROWSING=1
|
||||
|
|
|
|||
|
|
@ -262,11 +262,6 @@ MOZ_ENABLE_GIO = @MOZ_ENABLE_GIO@
|
|||
MOZ_GIO_CFLAGS = @MOZ_GIO_CFLAGS@
|
||||
MOZ_GIO_LIBS = @MOZ_GIO_LIBS@
|
||||
|
||||
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@
|
||||
|
||||
|
|
|
|||
|
|
@ -56,11 +56,6 @@ endif
|
|||
ifndef INCLUDED_AUTOCONF_MK
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
endif
|
||||
ifndef INCLUDED_INSURE_MK
|
||||
ifdef MOZ_INSURIFYING
|
||||
include $(topsrcdir)/config/insure.mk
|
||||
endif
|
||||
endif
|
||||
|
||||
COMMA = ,
|
||||
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
INCLUDED_INSURE_MK = 1
|
||||
|
||||
INSURE_MATCH_SCRIPT=$(topsrcdir)/build/autoconf/match-dir.sh
|
||||
|
||||
INSURE_EXCLUDE=$(shell $(INSURE_MATCH_SCRIPT) $(MOZ_INSURE_EXCLUDE_DIRS))
|
||||
|
||||
INSURE_INCLUDE=$(shell $(INSURE_MATCH_SCRIPT) $(MOZ_INSURE_DIRS))
|
||||
|
||||
ifeq ($(INSURE_EXCLUDE),0)
|
||||
|
||||
ifeq ($(INSURE_INCLUDE),1)
|
||||
CC := $(MOZ_INSURE)
|
||||
CXX := $(MOZ_INSURE)
|
||||
endif # INSURE_INCLUDE == 1
|
||||
|
||||
endif # INSURE_EXCLUDE == 0
|
||||
62
configure.in
62
configure.in
|
|
@ -4727,7 +4727,7 @@ MOZ_WAVE=1
|
|||
MOZ_MEDIA=
|
||||
MOZ_PANGO=1
|
||||
MOZ_PERMISSIONS=1
|
||||
MOZ_PLACES=
|
||||
MOZ_PLACES=1
|
||||
MOZ_PLAINTEXT_EDITOR_ONLY=
|
||||
MOZ_PLUGINS=1
|
||||
MOZ_PREF_EXTENSIONS=1
|
||||
|
|
@ -6306,25 +6306,6 @@ dnl =
|
|||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Individual module options)
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable places (new history/bookmarks)
|
||||
dnl ========================================================
|
||||
MOZ_ARG_ENABLE_BOOL(places,
|
||||
[ --enable-places Enable 'places' bookmark/history implementation],
|
||||
MOZ_PLACES=1,
|
||||
MOZ_PLACES= )
|
||||
if test -n "$MOZ_PLACES"; then
|
||||
AC_DEFINE(MOZ_PLACES)
|
||||
if test -z "$MOZ_MAIL_NEWS"; then
|
||||
MOZ_MORK=
|
||||
fi
|
||||
MOZ_MORKREADER=1
|
||||
else
|
||||
if test "$MOZ_BUILD_APP" = "browser"; then
|
||||
AC_MSG_ERROR([Cannot build Firefox with --disable-places.])
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Disable feed handling components
|
||||
dnl ========================================================
|
||||
|
|
@ -6463,21 +6444,6 @@ 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
|
||||
AC_DEFINE(MOZ_HELP_VIEWER)
|
||||
fi
|
||||
AC_SUBST(MOZ_HELP_VIEWER)
|
||||
if test "$MOZ_BUILD_APP" = "browser" -a -n "$MOZ_HELP_VIEWER"; then
|
||||
AC_MSG_ERROR([Cannot build Firefox with --enable-help-viewer.])
|
||||
fi
|
||||
|
||||
dnl ========================================================
|
||||
dnl = Enable safe browsing (anti-phishing)
|
||||
dnl ========================================================
|
||||
|
|
@ -7162,27 +7128,6 @@ if test -n "$_ENABLE_CODESIGHS"; then
|
|||
fi
|
||||
fi
|
||||
|
||||
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 ========================================================
|
||||
|
|
@ -8243,11 +8188,7 @@ AC_SUBST(MOZ_VTUNE)
|
|||
AC_SUBST(MOZ_XPCTOOLS)
|
||||
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(LIBICONV)
|
||||
AC_SUBST(MOZ_PLACES)
|
||||
AC_SUBST(MOZ_PLACES_BOOKMARKS)
|
||||
|
|
@ -8256,6 +8197,7 @@ AC_SUBST(MOZ_TOOLKIT_SEARCH)
|
|||
AC_SUBST(MOZ_FEEDS)
|
||||
AC_SUBST(NS_PRINTING)
|
||||
AC_SUBST(MOZ_WEBGL)
|
||||
AC_SUBST(MOZ_HELP_VIEWER)
|
||||
|
||||
AC_SUBST(MOZ_JAVAXPCOM)
|
||||
AC_SUBST(JAVA_INCLUDE_PATH)
|
||||
|
|
|
|||
|
|
@ -126,11 +126,6 @@ MOZ_POST_PROGRAM_COMMAND = @MOZ_POST_PROGRAM_COMMAND@
|
|||
|
||||
MOZ_BUILD_ROOT = @MOZ_BUILD_ROOT@
|
||||
|
||||
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@
|
||||
|
||||
CROSS_COMPILE = @CROSS_COMPILE@
|
||||
|
|
|
|||
|
|
@ -56,11 +56,6 @@ endif
|
|||
ifndef INCLUDED_AUTOCONF_MK
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
endif
|
||||
ifndef INCLUDED_INSURE_MK
|
||||
ifdef MOZ_INSURIFYING
|
||||
include $(topsrcdir)/config/insure.mk
|
||||
endif
|
||||
endif
|
||||
|
||||
COMMA = ,
|
||||
|
||||
|
|
|
|||
|
|
@ -1,53 +0,0 @@
|
|||
#
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is mozilla.org code.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either of the GNU General Public License Version 2 or later (the "GPL"),
|
||||
# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
INCLUDED_INSURE_MK = 1
|
||||
|
||||
INSURE_MATCH_SCRIPT=$(topsrcdir)/build/autoconf/match-dir.sh
|
||||
|
||||
INSURE_EXCLUDE=$(shell $(INSURE_MATCH_SCRIPT) $(MOZ_INSURE_EXCLUDE_DIRS))
|
||||
|
||||
INSURE_INCLUDE=$(shell $(INSURE_MATCH_SCRIPT) $(MOZ_INSURE_DIRS))
|
||||
|
||||
ifeq ($(INSURE_EXCLUDE),0)
|
||||
|
||||
ifeq ($(INSURE_INCLUDE),1)
|
||||
CC := $(MOZ_INSURE)
|
||||
CXX := $(MOZ_INSURE)
|
||||
endif # INSURE_INCLUDE == 1
|
||||
|
||||
endif # INSURE_EXCLUDE == 0
|
||||
|
|
@ -4356,27 +4356,6 @@ if test -n "$MOZ_TIMELINE"; then
|
|||
AC_DEFINE(MOZ_TIMELINE)
|
||||
fi
|
||||
|
||||
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 ========================================================
|
||||
|
|
@ -4886,11 +4865,7 @@ AC_SUBST(MOZ_CALLGRIND)
|
|||
AC_SUBST(MOZ_VTUNE)
|
||||
AC_SUBST(MOZ_XPCTOOLS)
|
||||
AC_SUBST(MOZ_JSLOADER)
|
||||
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(LIBICONV)
|
||||
|
||||
AC_SUBST(BUILD_STATIC_LIBS)
|
||||
|
|
|
|||
Loading…
Reference in a new issue