Bug 207521 - deprecate --enable|disable-shared, since --enable-static gives us all the information we need, r=cls

config/autoconf.mk.in

@@ -106,9 +106,7 @@ MOZ_MAIL_NEWS	= @MOZ_MAIL_NEWS@
 MOZ_CALENDAR	= @MOZ_CALENDAR@
 MOZ_PLAINTEXT_EDITOR_ONLY = @MOZ_PLAINTEXT_EDITOR_ONLY@
 MOZ_COMPOSER = @MOZ_COMPOSER@
-BUILD_SHARED_LIBS = @BUILD_SHARED_LIBS@
 BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@
-MOZ_STATIC_COMPONENT_LIBS = @MOZ_STATIC_COMPONENT_LIBS@
 MOZ_ENABLE_LIBXUL = @MOZ_ENABLE_LIBXUL@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@

config/config.mk

@@ -326,30 +326,28 @@ endif
 # profile data that will still be valid when the object files are linked into
 # shared libraries.
 ifdef MOZ_PROFILE_GENERATE
-ifdef BUILD_SHARED_LIBS
-BUILD_SHARED_LIBS=
 BUILD_STATIC_LIBS=1
-MOZ_STATIC_COMPONENT_LIBS=1
 STATIC_BUILD_PIC=1
 endif
-endif
 
 #
 # Build using PIC by default
 # Do not use PIC if not building a shared lib (see exceptions below)
 #
-#ifeq (,$(PROGRAM)$(SIMPLE_PROGRAMS)$(HOST_PROGRAM)$(HOST_SIMPLE_PROGRAMS))
-ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)$(FORCE_USE_PIC))
+
+ifndef BUILD_STATIC_LIBS
+_ENABLE_PIC=1
+endif
+ifneq (,$(FORCE_SHARED_LIB)$(FORCE_USE_PIC))
 _ENABLE_PIC=1
 endif
-#endif
 
 # If module is going to be merged into the nsStaticModule, 
 # make sure that the entry points are translated and 
 # the module is built static.
 
 ifdef IS_COMPONENT
-ifneq (,$(MOZ_STATIC_COMPONENT_LIBS))
+ifneq (,$(BUILD_STATIC_LIBS))
 ifdef MODULE_NAME
 DEFINES += -DXPCOM_TRANSLATE_NSGM_ENTRY_POINT=1
 FORCE_STATIC_LIB=1
@@ -463,7 +461,7 @@ endif
 # building them into the executable.
 
 ifeq (,$(filter-out WINNT WINCE, $(OS_ARCH)))
-ifdef MOZ_STATIC_COMPONENT_LIBS
+ifdef BUILD_STATIC_LIBS
 DEFINES += \
         -D_IMPL_NS_GFX \
         -D_IMPL_NS_MSG_BASE \

config/rules.mk

@@ -99,11 +99,8 @@ endif
 #
 # Library rules
 #
-# If BUILD_SHARED_LIBS or FORCE_SHARED_LIB is set and 
-#    FORCE_STATIC_LIB is not set, 
-#	the shared library will be built.
-# If BUILD_STATIC_LIBS or FORCE_STATIC_LIB is set, 
-#	the static library will  be built.
+# If BUILD_STATIC_LIBS or FORCE_STATIC_LIB is set, build a static library.
+# Otherwise, build a shared library.
 #
 
 ifndef LIBRARY
@@ -124,7 +121,7 @@ endif
 endif
 
 ifdef LIBRARY
-ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB))
+ifneq (_1,$(FORCE_SHARED_LIB)_$(BUILD_STATIC_LIBS))
 ifdef MKSHLIB
 
 ifdef LIB_IS_C_ONLY
@@ -142,14 +139,14 @@ IMPORT_LIBRARY		:= $(LIB_PREFIX)$(LIBRARY_NAME).$(IMPORT_LIB_SUFFIX)
 endif
 
 endif # MKSHLIB
-endif # BUILD_SHARED_LIBS || FORCE_SHARED_LIB
+endif # FORCE_SHARED_LIB && !BUILD_STATIC_LIBS
 endif # LIBRARY
 
 ifeq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB))
 LIBRARY			:= $(NULL)
 endif
 
-ifeq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB))
+ifeq (_1,$(FORCE_SHARED_LIB)_$(BUILD_STATIC_LIBS))
 SHARED_LIBRARY		:= $(NULL)
 DEF_FILE		:= $(NULL)
 IMPORT_LIBRARY		:= $(NULL)

configure.in

@@ -3955,7 +3955,6 @@ MOZ_ARG_HEADER(Application)
 
 ACCESSIBILITY=1
 BUILD_MODULES=all
-BUILD_SHARED_LIBS=1
 BUILD_STATIC_LIBS=
 ENABLE_TESTS=1
 MOZ_ACTIVEX_SCRIPTING_SUPPORT=
@@ -3992,7 +3991,6 @@ MOZ_PYTHON_VER_DOTTED=
 MOZ_REFLOW_PERF=
 MOZ_REORDER=
 MOZ_SINGLE_PROFILE=
-MOZ_STATIC_COMPONENT_LIBS=
 MOZ_STATIC_MAIL_BUILD=
 MOZ_TIMELINE=
 MOZ_UI_LOCALE=en-US
@@ -6063,19 +6061,11 @@ dnl = Static Build Options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Static build options)
-MOZ_ARG_DISABLE_BOOL(shared,
-[  --disable-shared        Disable building of internal shared libs],
-    BUILD_SHARED_LIBS=)
 
 MOZ_ARG_ENABLE_BOOL(static,
 [  --enable-static         Enable building of internal static libs],
-    BUILD_STATIC_LIBS=1
-    MOZ_STATIC_COMPONENT_LIBS=1)
-
-if (test -z "$BUILD_SHARED_LIBS" && test -z "$BUILD_STATIC_LIBS") ||
-    (test -n "$BUILD_SHARED_LIBS" && test -n "$BUILD_STATIC_LIBS") ; then
-    AC_MSG_ERROR([Only one of --enable-shared or --enable-static must be specified.])
-fi
+    BUILD_STATIC_LIBS=1,
+    BUILD_STATIC_LIBS=)
 
 MOZ_ARG_ENABLE_BOOL(libxul,
 [  --enable-libxul         Enable building of libxul],
@@ -6713,9 +6703,7 @@ AC_SUBST(MOZ_XINERAMA_LIBS)
 AC_SUBST(MOZ_ENABLE_XINERAMA)
 
 AC_SUBST(XPCOM_USE_LEA)
-AC_SUBST(BUILD_SHARED_LIBS)
 AC_SUBST(BUILD_STATIC_LIBS)
-AC_SUBST(MOZ_STATIC_COMPONENT_LIBS)
 AC_SUBST(MOZ_ENABLE_LIBXUL)
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(IBMBIDI)

embedding/browser/gtk/tests/Makefile.in

@@ -96,7 +96,6 @@ include $(topsrcdir)/config/config.mk
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 
 ifdef BUILD_STATIC_LIBS

embedding/browser/photon/src/Makefile.in

@@ -89,7 +89,6 @@ DEFINES += -DMOZILLA_INTERNAL_API=1
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 
 ifdef BUILD_STATIC_LIBS

embedding/browser/qt/src/Makefile.in

@@ -62,7 +62,6 @@ include $(srcdir)/config/qtconfig.mk
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 
 SHARED_LIBRARY_LIBS= \

embedding/browser/qt/tests/Makefile.in

@@ -48,7 +48,6 @@ include $(srcdir)/../src/config/qtconfig.mk
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 
 ifdef NS_TRACE_MALLOC

embedding/tests/mfcembed/Makefile.in

@@ -161,7 +161,6 @@ include $(topsrcdir)/config/config.mk
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 
 ifdef BUILD_STATIC_LIBS

embedding/tests/os2Embed/Makefile.in

@@ -92,7 +92,6 @@ include $(topsrcdir)/config/config.mk
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 
 ifdef BUILD_STATIC_LIBS

modules/libjar/Makefile.in

@@ -53,9 +53,7 @@ DIRS		= standalone
 ifndef MINIMO
 # we don't care about the installer for MINIMO
 ifndef MOZ_ENABLE_LIBXUL
-MOZ_STATIC_COMPONENT_LIBS=
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 endif
 endif

modules/staticmod/Makefile.in

@@ -103,7 +103,7 @@ ifndef NO_RECURSE
 libs clean distclean clobber realclean clobber_all::
 	set -e; \
 	for f in $(MOZ_META_COMPONENTS); do \
-		$(MAKE) NO_RECURSE=1 BUILD_SHARED_LIBS=1 BUILD_STATIC_LIBS= LIBRARY_NAME=meta_$$f CPPSRCS=nsMetaModule_$$f.cpp _COMPONENT_BASE=$$f $@ ; \
+		$(MAKE) NO_RECURSE=1 BUILD_STATIC_LIBS= LIBRARY_NAME=meta_$$f CPPSRCS=nsMetaModule_$$f.cpp _COMPONENT_BASE=$$f $@ ; \
 	done
 endif
 

webshell/tests/viewer/Makefile.in

@@ -195,7 +195,6 @@ include $(topsrcdir)/config/config.mk
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 
 # Force a build thru DIRS so that dependencies are updated properly
@@ -206,7 +205,6 @@ libs::
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 endif
 
 ifdef BUILD_STATIC_LIBS

xpfe/bootstrap/Makefile.in

@@ -124,7 +124,6 @@ endif
 # when building the mozcomps meta component
 ifneq (,$(filter mozcomps,$(MOZ_META_COMPONENTS)))
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 ifdef MOZ_COMPONENTLIB
 DEFINES += -D_MOZCOMPS_SHARED_LIBRARY -D_BUILD_STATIC_BIN
 endif

xpinstall/src/Makefile.in

@@ -52,7 +52,7 @@ ifndef MOZ_ENABLE_LIBXUL
 # Make this a true dynamic component even in static builds because
 # this component is shared by installer
 FORCE_SHARED_LIB	= 1
-MOZ_STATIC_COMPONENT_LIBS=
+BUILD_STATIC_LIBS=
 SHORT_LIBNAME	= xpinstal
 endif
 IS_COMPONENT	= 1

xpinstall/stub/Makefile.in

@@ -46,9 +46,7 @@ include $(DEPTH)/config/autoconf.mk
 
 # Make this a true dynamic component even in static builds because
 # this component is shared by installer
-MOZ_STATIC_COMPONENT_LIBS=
 BUILD_STATIC_LIBS=
-BUILD_SHARED_LIBS=1
 MOZILLA_INTERNAL_API = 1
 
 MODULE		= xpistub