mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 13:51:41 +00:00
Massive reorganization of configure options into logical groups.
The following options were renamed: --with-jpeg --with-system-jpeg --with-zlib --with-system-zlib --with-png --with-system-png --with-mng --with-system-mng --enable-toolkit --enable-default-toolkit --with-gtk --enable-toolkit-gtk --with-xlib --enable-toolkit-xlib --with-qt --enable-toolkit-qt --enable-gle --enable-gle-support --with-extensions --enable-extensions --enable-modules --enable-standalone-modules --enable-lea --enable-xpcom-lea --enable-ultrasparc --enable-js-ultrasparc --enable-strip-libs --enable-strip --with-debug-modules --enable-debug-modules --with-dbgrinfo-modules --enable-debugger-info-modules --with-profile-modules --enable-profile-modules --enable-eazel-profiler --enable-eazel-profiler-support --enable-homedir --with-user-appdir --enable-static-components --enable-meta-component-modules The following options were removed: --enable-monolithic-toolkit --disable-jar-packaging zip is now required to build since NSS unconditionally requires it. Bug #61907
This commit is contained in:
parent
e54e1386c3
commit
0386eaf366
@ -28,17 +28,11 @@ BUILD_MODULES = @BUILD_MODULES@
|
||||
|
||||
DIST = $(DEPTH)/dist
|
||||
|
||||
MOZ_DISABLE_JAR_PACKAGING = @MOZ_DISABLE_JAR_PACKAGING@
|
||||
MOZ_CHROME_FILE_FORMAT = @MOZ_CHROME_FILE_FORMAT@
|
||||
|
||||
MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@
|
||||
MOZ_GFX_TOOLKIT = $(MOZ_WIDGET_TOOLKIT)
|
||||
|
||||
MOZ_MONOLITHIC_TOOLKIT = @MOZ_MONOLITHIC_TOOLKIT@
|
||||
|
||||
### XXX ### BROKEN MOZ_XLIBRGB_LDFLAGS = @MOZ_XLIBRGB_LDFLAGS@
|
||||
### XXX ### BROKEN MOZ_USING_XLIBRGB = @MOZ_USING_XLIBRGB@
|
||||
|
||||
MOZ_JS_LIBS = @MOZ_JS_LIBS@
|
||||
|
||||
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/libunicharutil_s.$(LIB_SUFFIX)
|
||||
@ -64,12 +58,10 @@ MOZ_XPCTOOLS = @MOZ_XPCTOOLS@
|
||||
ENABLE_EAZEL_PROFILER=@ENABLE_EAZEL_PROFILER@
|
||||
EAZEL_PROFILER_CFLAGS=@EAZEL_PROFILER_CFLAGS@
|
||||
EAZEL_PROFILER_LIBS=@EAZEL_PROFILER_LIBS@
|
||||
DETECT_WEBSHELL_LEAKS = @DETECT_WEBSHELL_LEAKS@
|
||||
GC_LEAK_DETECTOR = @GC_LEAK_DETECTOR@
|
||||
NS_TRACE_MALLOC = @NS_TRACE_MALLOC@
|
||||
USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@
|
||||
MOZ_MAIL_NEWS = @MOZ_MAIL_NEWS@
|
||||
MOZ_BRPROF = @MOZ_BRPROF@
|
||||
BUILD_SHARED_LIBS = @BUILD_SHARED_LIBS@
|
||||
BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@
|
||||
MOZ_STATIC_COMPONENTS = @MOZ_STATIC_COMPONENTS@
|
||||
@ -92,6 +84,8 @@ XPCOM_LIBS=@XPCOM_LIBS@
|
||||
MOZ_REORDER=@MOZ_REORDER@
|
||||
MOZ_TIMELINE=@MOZ_TIMELINE@
|
||||
|
||||
ENABLE_STRIP = @ENABLE_STRIP@
|
||||
|
||||
ClientWallet=1
|
||||
CookieManagement=1
|
||||
SingleSignon=1
|
||||
@ -190,6 +184,7 @@ HOST_LIBIDL_LIBS = @HOST_LIBIDL_LIBS@
|
||||
|
||||
TARGET_NSPR_MDCPUCFG = @TARGET_NSPR_MDCPUCFG@
|
||||
TARGET_CPU = @TARGET_CPU@
|
||||
TARGET_VENDOR = @TARGET_VENDOR@
|
||||
TARGET_OS = @TARGET_OS@
|
||||
TARGET_MD_ARCH = @TARGET_MD_ARCH@
|
||||
|
||||
|
@ -662,11 +662,13 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
else
|
||||
ifeq ($(CPP_PROG_LINK),1)
|
||||
$(CCC) -o $@ $(CXXFLAGS) $(WRAP_MALLOC_CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
else # ! CPP_PROG_LINK
|
||||
$(CC) -o $@ $(CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS)
|
||||
endif # CPP_PROG_LINK
|
||||
endif # OS2
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
endif
|
||||
ifeq ($(OS_ARCH),BeOS)
|
||||
ifdef BEOS_PROGRAM_RESOURCE
|
||||
xres -o $@ $(BEOS_PROGRAM_RESOURCE)
|
||||
@ -698,14 +700,15 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
else
|
||||
$(CCC) $(WRAP_MALLOC_CFLAGS) $(CXXFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
|
||||
endif
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
else
|
||||
ifeq ($(MOZ_OS2_TOOLS),VACPP)
|
||||
$(LD) /Out:$@ $< $(LDFLAGS) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
|
||||
else
|
||||
$(CC) $(WRAP_MALLOC_CFLAGS) $(CFLAGS) -o $@ $< $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(WRAP_MALLOC_LIB) $(PROFILER_LIBS)
|
||||
endif
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
endif
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
$(HOST_SIMPLE_PROGRAMS): host_%$(BIN_SUFFIX): %.ho $(HOST_EXTRA_DEPS) Makefile Makefile.in
|
||||
@ -833,7 +836,9 @@ else
|
||||
endif
|
||||
endif # OS2
|
||||
chmod +x $@
|
||||
$(MOZ_POST_DSO_LIB_COMMAND) $@
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
ifeq ($(OS_ARCH),OS2)
|
||||
$(DLL): $(OBJS) $(EXTRA_LIBS)
|
||||
|
3293
configure.in
3293
configure.in
File diff suppressed because it is too large
Load Diff
@ -184,16 +184,21 @@ unix/xlib/libviewer_xlib_s.a:
|
||||
|
||||
$(PROGRAM)_gtk: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/gtk/libviewer_gtk_s.a
|
||||
$(CCC) $(CXXFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(GTK_LIBS) $(OS_LIBS) $(PROFILER_LIBS)
|
||||
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
$(PROGRAM)_qt: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/qt/libviewer_qt_s.a
|
||||
$(CCC) $(CXXFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(QT_LIBS) $(OS_LIBS) $(PROFILER_LIBS)
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
$(PROGRAM)_xlib: $(PROGOBJS) $(EXTRA_DEPS) Makefile Makefile.in unix/xlib/libviewer_xlib_s.a
|
||||
$(CCC) $(CXXFLAGS) -o $@ $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(XLIB_LIBS) $(OS_LIBS) $(PROFILER_LIBS)
|
||||
$(MOZ_POST_PROGRAM_COMMAND) $@
|
||||
ifdef ENABLE_STRIP
|
||||
$(STRIP) $@
|
||||
endif
|
||||
|
||||
ifdef MOZ_ENABLE_GTK
|
||||
install:: $(PROGRAM)_gtk
|
||||
|
Loading…
Reference in New Issue
Block a user