Replaced NO_SHARED_LIB & NO_STATIC_LIB with BUILD_SHARED_LIBS, BUILD_STATIC_LIBS, FORCE_STATIC_LIB & FORCE_SHARED_LIB. Added FORCE_USE_PIC.

Changes allow us to have a finer control over which parts of the tree are built with PIC. Part of the static build branch landing. Bug #46775 r=mcafee a=leaf
2025-01-19 01:10:22 +00:00 · 2001-06-18 22:10:38 +00:00 · 2001-06-18 22:10:38 +00:00 · bf5fb48486
commit bf5fb48486
parent bd98991c58
153 changed files with 331 additions and 381 deletions
--- a/accessible/src/Makefile.in
+++ b/accessible/src/Makefile.in
@ -46,8 +46,7 @@ CPPSRCS   = \
    $(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@ -70,10 +70,8 @@ USE_ELF_DYNSTR_GC = @USE_ELF_DYNSTR_GC@
 MOZ_MAIL_NEWS	= @MOZ_MAIL_NEWS@
 MOZ_BRPROF	= @MOZ_BRPROF@
 NO_UNIX_ASYNC_DNS = @NO_UNIX_ASYNC_DNS@
-NO_SHARED_LIB	= @NO_SHARED_LIB@
-NO_NETSCAPE_SHARED = @NO_SHARED_LIB@
-NO_STATIC_LIB	= @NO_STATIC_LIB@
-NO_NETSCAPE_STATIC = @NO_STATIC_LIB@
+BUILD_SHARED_LIBS = @BUILD_SHARED_LIBS@
+BUILD_STATIC_LIBS = @BUILD_STATIC_LIBS@
 MOZ_STATIC_COMPONENTS = @MOZ_STATIC_COMPONENTS@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
@ -248,7 +246,6 @@ NSPR_LIBS	= @NSPR_LIBS@
 # to normal behavior. Makefile's that create shared libraries out of
 # archives use these flags to force in all of the .o files in the
 # archives into the shared library.
-ifndef NO_SHARED_LIB
 WRAP_MALLOC_LIB         = @WRAP_MALLOC_LIB@
 WRAP_MALLOC_CFLAGS      = @WRAP_MALLOC_CFLAGS@
 DSO_CFLAGS              = @DSO_CFLAGS@
@ -259,7 +256,6 @@ MKSHLIB_FORCE_ALL       = @MKSHLIB_FORCE_ALL@
 MKSHLIB_UNFORCE_ALL     = @MKSHLIB_UNFORCE_ALL@
 DSO_LDOPTS              = @DSO_LDOPTS@
 DLL_SUFFIX              = @DLL_SUFFIX@
-endif

 NO_LD_ARCHIVE_FLAGS     = @NO_LD_ARCHIVE_FLAGS@

--- a/config/config.mk
+++ b/config/config.mk
@ -238,14 +238,30 @@ endif
 OS_CFLAGS += $(DEBUG_FLAGS)
 OS_CXXFLAGS += $(DEBUG_FLAGS)

+# Build using PIC by default
+# Do not use PIC if not building a shared lib (see exceptions below)
+#
+ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB)$(FORCE_USE_PIC))
+_ENABLE_PIC=1
+endif
+
 ifneq (,$(IS_COMPONENT))
 ifneq (, $(findstring $(LIBRARY_NAME), $(MOZ_STATIC_COMPONENTS)))
 DEFINES	+= -DNSGetModule=$(LIBRARY_NAME)_NSGetModule -DNSGetModule_components=$(LIBRARY_NAME)_NSGM_comps -DNSGetModule_components_count=$(LIBRARY_NAME)_NSGM_comp_count
-NO_STATIC_LIB=
-NO_SHARED_LIB=1
+FORCE_STATIC_LIB=1
 endif
 endif

+#
+# Disable PIC if necessary
+#
+
+ifndef _ENABLE_PIC
+DSO_CFLAGS=
+DSO_PIC_CFLAGS=
+MKSHLIB=
+endif
+
 #
 # Personal makefile customizations go in these optional make include files.
 #
@ -400,6 +416,11 @@ MOZ_COMPONENT_XPCOM_LIBS += -lboehm
 XPCOM_LIBS += -lboehm
 endif

+ifdef MOZ_DEMANGLE_SYMBOLS
+MOZ_COMPONENT_XPCOM_LIBS += -liberty
+XPCOM_LIBS += -liberty
+endif
+
 ifeq (xpconnect, $(findstring xpconnect, $(BUILD_MODULES)))
 DEFINES +=  -DXPCONNECT_STANDALONE
 endif
--- a/config/rules.mk
+++ b/config/rules.mk
@ -101,8 +101,11 @@ endif
 #
 # Library rules
 #
-# If NO_STATIC_LIB is set, the static library will not be built.
-# If NO_SHARED_LIB is set, the shared library will not be built.
+# 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.
 #

 ifeq ($(OS_ARCH),OS2)
@ -138,7 +141,7 @@ endif
 endif

 ifdef LIBRARY
-ifndef NO_SHARED_LIB
+ifneq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB))
 ifdef MKSHLIB

 ifeq ($(OS_ARCH),OS2)
@ -164,15 +167,21 @@ IMPORT_LIBRARY		:=

 endif # OS2
 endif # MKSHLIB
-endif # !NO_SHARED_LIB
+endif # BUILD_SHARED_LIBS || FORCE_SHARED_LIB
 endif # LIBRARY

-ifdef NO_STATIC_LIB
-LIBRARY			= $(NULL)
+ifeq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB))
+LIBRARY			:= $(NULL)
 endif

-ifdef NO_SHARED_LIB
-DLL_SUFFIX		= .$(LIB_SUFFIX)
+ifeq (,$(BUILD_SHARED_LIBS)$(FORCE_SHARED_LIB))
+SHARED_LIBRARY		:= $(NULL)
+endif
+
+ifdef FORCE_STATIC_LIB
+ifndef FORCE_SHARED_LIB
+SHARED_LIBRARY		:= $(NULL)
+endif
 endif

 ifndef TARGETS
@ -521,7 +530,7 @@ export::
 ifdef LIBRARY_NAME
 ifdef EXPORT_LIBRARY
 ifdef IS_COMPONENT
-ifndef NO_STATIC_LIB
+ifdef BUILD_STATIC_LIBS
 	@$(PERL) $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) $(LIBRARY_NAME)
 endif
 else
@ -532,7 +541,7 @@ endif # LIBRARY_NAME

 ##############################################
 install:: $(SUBMAKEFILES) $(MAKE_DIRS) $(HOST_LIBRARY) $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(HOST_PROGRAM) $(PROGRAM) $(HOST_SIMPLE_PROGRAMS) $(SIMPLE_PROGRAMS) $(MAPS)
-ifndef NO_STATIC_LIB
+ifneq (,$(BUILD_STATIC_LIBS)$(FORCE_STATIC_LIB))
 ifdef LIBRARY
 ifeq ($(OS_ARCH),OS2)
 	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
@ -544,7 +553,7 @@ else
 endif
 endif # OS2
 endif # LIBRARY
-endif # ! NO_STATIC_LIB
+endif # BUILD_STATIC_LIBS || FORCE_STATIC_LIB
 ifdef MAPS
 	$(INSTALL) $(IFLAGS1) $(MAPS) $(DIST)/bin
 endif
--- a/120
+++ b/120
@ -161,8 +161,6 @@ ac_help="$ac_help
 ac_help="$ac_help
  --enable-long-long-warning
                          Pass -Wno-long-long to the compiler"
-ac_help="$ac_help
-  --disable-shared        Disable building of internal shared libs (BROKEN)"
 ac_help="$ac_help
  --enable-cpp-rtti       Enable C++ RTTI "
 ac_help="$ac_help
@ -236,7 +234,9 @@ ac_help="$ac_help
 ac_help="$ac_help
  --with-os2vacpp         Build for OS/2 with VAC++"
 ac_help="$ac_help
-  --enable-static         Enable building of internal static libs (BROKEN)"
+  --disable-shared        Disable building of internal shared libs"
+ac_help="$ac_help
+  --enable-static         Enable building of internal static libs"
 ac_help="$ac_help
  --enable-static-components
                          Build meta-component from specific components"
@ -11828,19 +11828,6 @@ rm -f conftest*
     CFLAGS="$_SAVE_CFLAGS"
 fi

-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  if test "$enableval" = "no"; then
-    NO_SHARED_LIB=1
-  elif test "$enableval" = "yes"; then
-    :
-  else
-    { echo "configure: error: Option, shared, does not take an argument ($enableval)." 1>&2; exit 1; }
-  fi
-fi
-
-
 # Check whether --enable-cpp-rtti or --disable-cpp-rtti was given.
 if test "${enable_cpp_rtti+set}" = set; then
  enableval="$enable_cpp_rtti"
@ -12065,7 +12052,7 @@ fi


 echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6
-echo "configure:12069: checking webshell leaks option" >&5
+echo "configure:12056: checking webshell leaks option" >&5
 # Check whether --enable-detect-webshell-leaks or --disable-detect-webshell-leaks was given.
 if test "${enable_detect_webshell_leaks+set}" = set; then
  enableval="$enable_detect_webshell_leaks"
@ -12139,7 +12126,7 @@ if test "${enable_efence+set}" = set; then
  enableval="$enable_efence"
  if test "$enableval" = "yes"; then
    echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6
-echo "configure:12143: checking for malloc in -lefence" >&5
+echo "configure:12130: checking for malloc in -lefence" >&5
 ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -12147,7 +12134,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lefence  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12151 "configure"
+#line 12138 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -12158,7 +12145,7 @@ int main() {
 malloc()
 ; return 0; }
 EOF
-if { (eval echo configure:12162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -12194,7 +12181,7 @@ fi


 echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6
-echo "configure:12198: checking for cplus_demangle in -liberty" >&5
+echo "configure:12185: checking for cplus_demangle in -liberty" >&5
 ac_lib_var=`echo iberty'_'cplus_demangle | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -12202,7 +12189,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-liberty "-liberty" $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12206 "configure"
+#line 12193 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -12213,7 +12200,7 @@ int main() {
 cplus_demangle()
 ; return 0; }
 EOF
-if { (eval echo configure:12217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -12516,13 +12503,29 @@ fi



-NO_STATIC_LIB=1
+BUILD_SHARED_LIBS=1
+BUILD_STATIC_LIBS=
+MOZ_STATIC_COMPONENT_LIBS=
+
+# Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
+  if test "$enableval" = "no"; then
+    BUILD_SHARED_LIBS=
+  elif test "$enableval" = "yes"; then
+    :
+  else
+    { echo "configure: error: Option, shared, does not take an argument ($enableval)." 1>&2; exit 1; }
+  fi
+fi
+

 # Check whether --enable-static or --disable-static was given.
 if test "${enable_static+set}" = set; then
  enableval="$enable_static"
  if test "$enableval" = "yes"; then
-    NO_STATIC_LIB=
+    BUILD_STATIC_LIBS=1
+    MOZ_STATIC_COMPONENT_LIBS=1
  elif test "$enableval" = "no"; then
    :
  else
@ -12531,6 +12534,11 @@ if test "${enable_static+set}" = set; then
 fi


+if (test -z "$BUILD_SHARED_LIBS" && test -z "$BUILD_STATIC_LIBS") ||
+    (test -n "$BUILD_SHARED_LIBS" && test -n "$BUILD_STATIC_LIBS") ; then
+    { echo "configure: error: Only one of --enable-shared or --enable-static must be specified." 1>&2; exit 1; }
+fi
+

 # Check whether --enable-static-components or --disable-static-components was given.
 if test "${enable_static_components+set}" = set; then
@ -12542,7 +12550,7 @@ fi

 case "$target" in
    *-*-aix*)
-	if test "${NO_STATIC_LIB}" = "1" -o -z "${NO_SHARED_LIB}"; then
+	if test -z "${BUILD_STATIC_LIBS}" -o -n "${BUILD_SHARED_LIBS}"; then
 	    if test -f /usr/lpp/xlC/bin/makeC++SharedLib_r; then
 		AIX_SHLIB_BIN='/usr/lpp/xlC/bin/makeC++SharedLib_r'
 	    elif test -f /usr/ibmcxx/bin/makeC++SharedLib_r; then
@ -12551,7 +12559,7 @@ case "$target" in
 	    # Extract the first word of "makeC++SharedLib_r", so it can be a program name with args.
 set dummy makeC++SharedLib_r; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12555: checking for $ac_word" >&5
+echo "configure:12563: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AIX_SHLIB_BIN'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
 else
@ -12589,8 +12597,8 @@ fi
 		echo "*** Unable to locate makeC++SharedLib_r, needed for creation of shared"
 		echo "*** libraries on AIX.  You will only be able to build static libraries."
 		echo
-		NO_STATIC_LIB=''
-		NO_SHARED_LIB=1
+		BUILD_STATIC_LIBS=1
+		BUILD_SHARED_LIBS=
 	    fi
 	fi
 	
@ -12697,7 +12705,7 @@ if test "$JPEG_DIR" = no; then
    SYSTEM_JPEG=
 else
    echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6
-echo "configure:12701: checking for jpeg_destroy_compress in -ljpeg" >&5
+echo "configure:12709: checking for jpeg_destroy_compress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -12705,7 +12713,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-ljpeg $JPEG_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12709 "configure"
+#line 12717 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -12716,7 +12724,7 @@ int main() {
 jpeg_destroy_compress()
 ; return 0; }
 EOF
-if { (eval echo configure:12720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -12745,7 +12753,7 @@ if test "$SYSTEM_JPEG" = 1; then
  SYSTEM_JPEG= 
 else
  cat > conftest.$ac_ext <<EOF
-#line 12749 "configure"
+#line 12757 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	#include <sys/types.h>
@ -12759,7 +12767,7 @@ else
 	}
 	
 EOF
-if { (eval echo configure:12763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  SYSTEM_JPEG=1
 else
@ -12797,16 +12805,16 @@ if test "$ZLIB_DIR" = no; then
    SYSTEM_ZLIB=
 else
    echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6
-echo "configure:12801: checking "for zlib.h"" >&5
+echo "configure:12809: checking "for zlib.h"" >&5
    cat > conftest.$ac_ext <<EOF
-#line 12803 "configure"
+#line 12811 "configure"
 #include "confdefs.h"
 #include "zlib.h"
 int main() {

 ; return 0; }
 EOF
-if { (eval echo configure:12810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12818: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
  rm -rf conftest*
  result="yes" SYSTEM_ZLIB=1
 else
@ -12820,7 +12828,7 @@ rm -f conftest*
 fi
 if test "$SYSTEM_ZLIB" = 1; then
    echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6
-echo "configure:12824: checking for gzread in -lz" >&5
+echo "configure:12832: checking for gzread in -lz" >&5
 ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -12828,7 +12836,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lz $ZLIB_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12832 "configure"
+#line 12840 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -12839,7 +12847,7 @@ int main() {
 gzread()
 ; return 0; }
 EOF
-if { (eval echo configure:12843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -12885,7 +12893,7 @@ if test "$PNG_DIR" = no; then
    SYSTEM_PNG=
 else
    echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6
-echo "configure:12889: checking for png_get_valid in -lpng" >&5
+echo "configure:12897: checking for png_get_valid in -lpng" >&5
 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -12893,7 +12901,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lpng $PNG_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12897 "configure"
+#line 12905 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -12904,7 +12912,7 @@ int main() {
 png_get_valid()
 ; return 0; }
 EOF
-if { (eval echo configure:12908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -12932,7 +12940,7 @@ if test "$SYSTEM_PNG" = 1; then
  SYSTEM_PNG= 
 else
  cat > conftest.$ac_ext <<EOF
-#line 12936 "configure"
+#line 12944 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	#include <sys/types.h>
@ -12946,7 +12954,7 @@ else
 	}
 	
 EOF
-if { (eval echo configure:12950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  SYSTEM_PNG=1
 else
@ -12985,7 +12993,7 @@ if test "$MNG_DIR" = no; then
    SYSTEM_MNG=
 else
    echo $ac_n "checking for mng_initialize in -lmng""... $ac_c" 1>&6
-echo "configure:12989: checking for mng_initialize in -lmng" >&5
+echo "configure:12997: checking for mng_initialize in -lmng" >&5
 ac_lib_var=`echo mng'_'mng_initialize | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
  echo $ac_n "(cached) $ac_c" 1>&6
@ -12993,7 +13001,7 @@ else
  ac_save_LIBS="$LIBS"
 LIBS="-lmng $MNG_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12997 "configure"
+#line 13005 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@ -13004,7 +13012,7 @@ int main() {
 mng_initialize()
 ; return 0; }
 EOF
-if { (eval echo configure:13008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  eval "ac_cv_lib_$ac_lib_var=yes"
 else
@ -13032,7 +13040,7 @@ if test "$SYSTEM_MNG" = 1; then
  SYSTEM_MNG= 
 else
  cat > conftest.$ac_ext <<EOF
-#line 13036 "configure"
+#line 13044 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	#include <sys/types.h>
@ -13046,7 +13054,7 @@ else
 	}
 	
 EOF
-if { (eval echo configure:13050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
  SYSTEM_MNG=1
 else
@ -13112,9 +13120,9 @@ CFLAGS="$CFLAGS -I${FULLCIRCLE_DIR}"
 LDFLAGS="$LDFLAGS -L${FULLCIRCLE_DIR}"
 LIBS="-lfullsoft $LIBS"
 echo $ac_n "checking "for FCInitialize in -lfullsoft"""... $ac_c" 1>&6
-echo "configure:13116: checking "for FCInitialize in -lfullsoft"" >&5;
+echo "configure:13124: checking "for FCInitialize in -lfullsoft"" >&5;
 cat > conftest.$ac_ext <<EOF
-#line 13118 "configure"
+#line 13126 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 	      #include "fullsoft.h" 
@ -13122,7 +13130,7 @@ int main() {
 FCInitialize(); exit(0); 
 ; return 0; }
 EOF
-if { (eval echo configure:13126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
  rm -rf conftest*
  FULLCIRCLE_LIBS="-I${FULLCIRCLE_DIR} -L${FULLCIRCLE_DIR} -lfullsoft" result="yes"
 else
@ -13738,13 +13746,13 @@ s%@MOZ_LDAP_XPCOM_EXPERIMENTAL@%$MOZ_LDAP_XPCOM_EXPERIMENTAL%g
 s%@XPCOM_USE_LEA@%$XPCOM_USE_LEA%g
 s%@UNIX_CRASH_ON_ASSERT@%$UNIX_CRASH_ON_ASSERT%g
 s%@NO_UNIX_ASYNC_DNS@%$NO_UNIX_ASYNC_DNS%g
-s%@NO_SHARED_LIB@%$NO_SHARED_LIB%g
-s%@NO_STATIC_LIB@%$NO_STATIC_LIB%g
+s%@BUILD_SHARED_LIBS@%$BUILD_SHARED_LIBS%g
+s%@BUILD_STATIC_LIBS@%$BUILD_STATIC_LIBS%g
+s%@MOZ_STATIC_COMPONENT_LIBS@%$MOZ_STATIC_COMPONENT_LIBS%g
 s%@MOZ_STATIC_COMPONENTS@%$MOZ_STATIC_COMPONENTS%g
 s%@ENABLE_TESTS@%$ENABLE_TESTS%g
 s%@IBMBIDI@%$IBMBIDI%g
 s%@MOZ_USER_DIR@%$MOZ_USER_DIR%g
-s%@FULL_STATIC_BUILD@%$FULL_STATIC_BUILD%g
 s%@BUILD_IDLC@%$BUILD_IDLC%g
 s%@MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@%$MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS%g
 s%@MOZ_COMPONENT_NSPR_LIBS@%$MOZ_COMPONENT_NSPR_LIBS%g
--- a/configure.in
+++ b/configure.in
@ -3654,10 +3654,6 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then
     CFLAGS="$_SAVE_CFLAGS"
 fi

-MOZ_ARG_DISABLE_BOOL(shared,
-[  --disable-shared        Disable building of internal shared libs (BROKEN)],
-  NO_SHARED_LIB=1)
-
 dnl C++ rtti (g++/egcs only - for now)
 dnl Should be smarter and check that the compiler does indeed have rtti
 MOZ_ARG_ENABLE_BOOL(cpp-rtti,
@ -4013,11 +4009,23 @@ dnl = End OS/2 Build Options
 dnl =
 dnl ========================================================

-NO_STATIC_LIB=1
+BUILD_SHARED_LIBS=1
+BUILD_STATIC_LIBS=
+MOZ_STATIC_COMPONENT_LIBS=
+
+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 (BROKEN)],
-  NO_STATIC_LIB=)
+[  --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

 dnl ========================================================

@ -4030,7 +4038,7 @@ dnl ========================================================

 case "$target" in
    *-*-aix*)
-	if test "${NO_STATIC_LIB}" = "1" -o -z "${NO_SHARED_LIB}"; then
+	if test -z "${BUILD_STATIC_LIBS}" -o -n "${BUILD_SHARED_LIBS}"; then
 	    if test -f /usr/lpp/xlC/bin/makeC++SharedLib_r; then
 		AIX_SHLIB_BIN='/usr/lpp/xlC/bin/makeC++SharedLib_r'
 	    elif test -f /usr/ibmcxx/bin/makeC++SharedLib_r; then
@ -4042,8 +4050,8 @@ case "$target" in
 		echo "*** Unable to locate makeC++SharedLib_r, needed for creation of shared"
 		echo "*** libraries on AIX.  You will only be able to build static libraries."
 		echo
-		NO_STATIC_LIB=''
-		NO_SHARED_LIB=1
+		BUILD_STATIC_LIBS=1
+		BUILD_SHARED_LIBS=
 	    fi
 	fi
 	AC_SUBST(AIX_SHLIB_BIN)
@ -4116,13 +4124,13 @@ AC_SUBST(MOZ_LDAP_XPCOM_EXPERIMENTAL)
 AC_SUBST(XPCOM_USE_LEA)
 AC_SUBST(UNIX_CRASH_ON_ASSERT)
 AC_SUBST(NO_UNIX_ASYNC_DNS)
-AC_SUBST(NO_SHARED_LIB)
-AC_SUBST(NO_STATIC_LIB)
+AC_SUBST(BUILD_SHARED_LIBS)
+AC_SUBST(BUILD_STATIC_LIBS)
+AC_SUBST(MOZ_STATIC_COMPONENT_LIBS)
 AC_SUBST(MOZ_STATIC_COMPONENTS)
 AC_SUBST(ENABLE_TESTS)
 AC_SUBST(IBMBIDI)
 AC_SUBST(MOZ_USER_DIR)
-AC_SUBST(FULL_STATIC_BUILD)
 AC_SUBST(BUILD_IDLC)

 AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS)
--- a/content/base/src/Makefile.in
+++ b/content/base/src/Makefile.in
@ -65,8 +65,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/events/src/Makefile.in
+++ b/content/events/src/Makefile.in
@ -46,8 +46,7 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/html/content/src/Makefile.in
+++ b/content/html/content/src/Makefile.in
@ -105,8 +105,7 @@ nsIHTMLTableColElement.h \
 $(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/html/document/src/Makefile.in
+++ b/content/html/document/src/Makefile.in
@ -46,8 +46,7 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/html/style/src/Makefile.in
+++ b/content/html/style/src/Makefile.in
@ -69,8 +69,7 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/shared/src/Makefile.in
+++ b/content/shared/src/Makefile.in
@ -46,8 +46,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/xbl/src/Makefile.in
+++ b/content/xbl/src/Makefile.in
@ -57,8 +57,7 @@ CPPSRCS		= \
 include $(topsrcdir)/config/config.mk

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/xml/content/src/Makefile.in
+++ b/content/xml/content/src/Makefile.in
@ -40,8 +40,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/xml/document/src/Makefile.in
+++ b/content/xml/document/src/Makefile.in
@ -36,8 +36,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/xsl/document/src/Makefile.in
+++ b/content/xsl/document/src/Makefile.in
@ -52,7 +52,6 @@ LOCAL_INCLUDES = 				\
 MKSHLIB :=

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/content/xul/content/src/Makefile.in
+++ b/content/xul/content/src/Makefile.in
@ -40,8 +40,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/xul/document/src/Makefile.in
+++ b/content/xul/document/src/Makefile.in
@ -42,8 +42,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/content/xul/templates/src/Makefile.in
+++ b/content/xul/templates/src/Makefile.in
@ -56,8 +56,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/db/mork/src/Makefile.in
+++ b/db/mork/src/Makefile.in
@ -97,8 +97,5 @@ EXTRA_DSO_LDOPTS = \
 		$(NSPR_LIBS) \
 		$(NULL)

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
-
 include $(topsrcdir)/config/rules.mk

--- a/dbm/src/Makefile.in
+++ b/dbm/src/Makefile.in
@ -54,8 +54,7 @@ endif

 LOCAL_INCLUDES	= -I$(srcdir)/../include

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/docshell/base/Makefile.in
+++ b/docshell/base/Makefile.in
@ -59,7 +59,6 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/dom/src/base/Makefile.in
+++ b/dom/src/base/Makefile.in
@ -48,8 +48,7 @@ CPPSRCS =			\
 	$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/dom/src/events/Makefile.in
+++ b/dom/src/events/Makefile.in
@ -35,8 +35,7 @@ CPPSRCS =				\
 	$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/editor/libeditor/base/src/Makefile.in
+++ b/editor/libeditor/base/src/Makefile.in
@ -64,8 +64,7 @@ CPPSRCS		+=                          \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/editor/libeditor/html/src/Makefile.in
+++ b/editor/libeditor/html/src/Makefile.in
@ -45,8 +45,7 @@ CPPSRCS  = \
           $(NULL)

 # don't want the shared lib; force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 ifdef ENABLE_EDITOR_API_LOG
 CPPSRCS += nsHTMLEditorLog.cpp             \
--- a/editor/libeditor/text/src/Makefile.in
+++ b/editor/libeditor/text/src/Makefile.in
@ -43,8 +43,7 @@ CPPSRCS		=                           \
 		$(NULL)

 # don't want the shared lib; force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@ -45,8 +45,7 @@ CPPSRCS         = \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/embedding/browser/webBrowser/Makefile.in
+++ b/embedding/browser/webBrowser/Makefile.in
@ -57,7 +57,6 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/embedding/components/appstartup/src/Makefile.in
+++ b/embedding/components/appstartup/src/Makefile.in
@ -37,8 +37,7 @@ EXPORTS =	\

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/embedding/components/find/src/Makefile.in
+++ b/embedding/components/find/src/Makefile.in
@ -33,8 +33,7 @@ CPPSRCS		= nsWebBrowserFind.cpp \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/embedding/components/jsconsole/src/Makefile.in
+++ b/embedding/components/jsconsole/src/Makefile.in
@ -33,8 +33,7 @@ CPPSRCS		= nsJSConsoleService.cpp \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/embedding/components/windowwatcher/src/Makefile.in
+++ b/embedding/components/windowwatcher/src/Makefile.in
@ -37,8 +37,7 @@ CPPSRCS		= nsDialogParamBlock.cpp \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/expat/xmlparse/Makefile.in
+++ b/expat/xmlparse/Makefile.in
@ -41,7 +41,6 @@ EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
 LOCAL_INCLUDES	= -I$(srcdir)/../xmltok

 # We want only the static lib, not the shared lib
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/expat/xmltok/Makefile.in
+++ b/expat/xmltok/Makefile.in
@ -35,7 +35,6 @@ CSRCS		= \
 		$(NULL)

 # We want only the static lib, not the shared lib
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/datetime/Makefile.in
+++ b/extensions/datetime/Makefile.in
@ -37,7 +37,6 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/finger/Makefile.in
+++ b/extensions/finger/Makefile.in
@ -36,7 +36,6 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/inspector/base/src/Makefile.in
+++ b/extensions/inspector/base/src/Makefile.in
@ -42,7 +42,6 @@ CPPSRCS=                               \
 	inFileSearch.cpp               \
 	$(NULL)

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/pics/src/Makefile.in
+++ b/extensions/pics/src/Makefile.in
@ -41,8 +41,7 @@ CSRCS		= \
 CPPSRCS		= nsPICS.cpp

 # we don't want the shared lib
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/extensions/vixen/base/src/Makefile.in
+++ b/extensions/vixen/base/src/Makefile.in
@ -33,8 +33,7 @@ CPPSRCS = \
 	nsVixenShell.cpp \
 	$(NULL)

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/extensions/wallet/cookieviewer/Makefile.in
+++ b/extensions/wallet/cookieviewer/Makefile.in
@ -36,7 +36,6 @@ CPPSRCS		= nsCookieViewer.cpp
 XPIDLSRCS	= nsICookieViewer.idl

 # we don't want the shared lib, but we want to force the creation of a static lib
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/wallet/editor/Makefile.in
+++ b/extensions/wallet/editor/Makefile.in
@ -36,7 +36,6 @@ CPPSRCS		= nsWalletEditor.cpp
 XPIDLSRCS	= nsIWalletEditor.idl

 # we don't want the shared lib, but we want to force the creation of a static lib
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/wallet/signonviewer/Makefile.in
+++ b/extensions/wallet/signonviewer/Makefile.in
@ -36,8 +36,7 @@ CPPSRCS		= nsSignonViewer.cpp
 XPIDLSRCS	= nsISignonViewer.idl

 # we don't want the shared lib, but we want to force the creation of a static lib
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/extensions/wallet/walletpreview/Makefile.in
+++ b/extensions/wallet/walletpreview/Makefile.in
@ -36,8 +36,7 @@ CPPSRCS		= nsWalletPreview.cpp
 XPIDLSRCS	= nsIWalletPreview.idl

 # we don't want the shared lib, but we want to force the creation of a static lib
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/extensions/webservices/soap/src/Makefile.in
+++ b/extensions/webservices/soap/src/Makefile.in
@ -42,7 +42,6 @@ CPPSRCS	= 				\

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/xmlextras/base/src/Makefile.in
+++ b/extensions/xmlextras/base/src/Makefile.in
@ -38,7 +38,6 @@ CPPSRCS	= 				\

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/xmlextras/soap/src/Makefile.in
+++ b/extensions/xmlextras/soap/src/Makefile.in
@ -42,7 +42,6 @@ CPPSRCS	= 				\

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/extensions/xmlterm/base/Makefile.in
+++ b/extensions/xmlterm/base/Makefile.in
@ -111,7 +111,7 @@ XPIDLSRCS = \
 endif

 # Also create static library libxmlterm.a
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1


 include $(topsrcdir)/config/config.mk
--- a/gfx2/src/Makefile.in
+++ b/gfx2/src/Makefile.in
@ -41,8 +41,7 @@ CPPSRCS		= \

 #DIRS		= gtk
 # we don't want the shared lib, but we want to force the creation of a static lib.
-#override NO_SHARED_LIB=1
-#override NO_STATIC_LIB=
+#FORCE_STATIC_LIB = 1

 EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
--- a/intl/locale/src/Makefile.in
+++ b/intl/locale/src/Makefile.in
@ -59,8 +59,7 @@ EXPORT_RESOURCE = \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/jpeg/Makefile.in
+++ b/jpeg/Makefile.in
@ -98,7 +98,7 @@ endif

 # need static lib for some of the libimg componentry to link properly
 ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1
 endif

 include $(topsrcdir)/config/rules.mk
--- a/js/src/fdlibm/Makefile.in
+++ b/js/src/fdlibm/Makefile.in
@ -81,8 +81,7 @@ EXPORTS		= fdlibm.h

 # we need to force a static lib for the linking that js/src/Makefile.in wants
 # to do, and we don't really need a shared library ever, so:
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/base/src/Makefile.in
+++ b/layout/base/src/Makefile.in
@ -56,8 +56,7 @@ CPPSRCS		+= \
 endif                

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/html/base/src/Makefile.in
+++ b/layout/html/base/src/Makefile.in
@ -107,8 +107,7 @@ RESOURCES =					\
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/html/document/src/Makefile.in
+++ b/layout/html/document/src/Makefile.in
@ -36,8 +36,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/html/forms/src/Makefile.in
+++ b/layout/html/forms/src/Makefile.in
@ -57,8 +57,7 @@ CPPSRCS	+= nsGfxTextControlFrame.cpp
 endif

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 CHROME_DIR	= locales/en-US
 CHROME_L10N_DIR	= communicator/locale/layout
--- a/layout/html/style/src/Makefile.in
+++ b/layout/html/style/src/Makefile.in
@ -43,8 +43,7 @@ EXPORTS		= \
 EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/html/table/src/Makefile.in
+++ b/layout/html/table/src/Makefile.in
@ -45,8 +45,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/mathml/base/src/Makefile.in
+++ b/layout/mathml/base/src/Makefile.in
@ -71,8 +71,7 @@ MKSHLIB :=

 # we don't want the shared lib, but we want to force the creation of a static lib.
 # do we still want this? - DJF
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/mathml/content/src/Makefile.in
+++ b/layout/mathml/content/src/Makefile.in
@ -45,8 +45,7 @@ CPPSRCS =				\
 MKSHLIB :=

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/svg/base/src/Makefile.in
+++ b/layout/svg/base/src/Makefile.in
@ -40,8 +40,7 @@ CPPSRCS		= \
 include $(topsrcdir)/config/config.mk

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/svg/content/src/Makefile.in
+++ b/layout/svg/content/src/Makefile.in
@ -33,8 +33,7 @@ REQUIRES	= xpcom string
 CPPSRCS		= nsSVGAtoms.cpp

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/xul/base/src/Makefile.in
+++ b/layout/xul/base/src/Makefile.in
@ -94,8 +94,7 @@ CPPSRCS		= \
 include $(topsrcdir)/config/config.mk

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/layout/xul/base/src/outliner/src/Makefile.in
+++ b/layout/xul/base/src/outliner/src/Makefile.in
@ -58,7 +58,6 @@ LOCAL_INCLUDES	= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/mailnews/absync/src/Makefile.in
+++ b/mailnews/absync/src/Makefile.in
@ -48,8 +48,7 @@ EXPORTS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/addrbook/src/Makefile.in
+++ b/mailnews/addrbook/src/Makefile.in
@ -75,8 +75,7 @@ EXPORTS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/base/search/src/Makefile.in
+++ b/mailnews/base/search/src/Makefile.in
@ -55,8 +55,7 @@ EXPORTS		= nsMsgFilterService.h \


 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/base/src/Makefile.in
+++ b/mailnews/base/src/Makefile.in
@ -92,8 +92,7 @@ EXPORTS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/compose/src/Makefile.in
+++ b/mailnews/compose/src/Makefile.in
@ -88,8 +88,7 @@ EXPORTS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/db/msgdb/src/Makefile.in
+++ b/mailnews/db/msgdb/src/Makefile.in
@ -42,8 +42,7 @@ CPPSRCS		= \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/imap/src/Makefile.in
+++ b/mailnews/imap/src/Makefile.in
@ -72,8 +72,7 @@ CPPSRCS		= \
 include $(topsrcdir)/config/config.mk

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/local/src/Makefile.in
+++ b/mailnews/local/src/Makefile.in
@ -77,8 +77,7 @@ EXPORTS		+= \
 endif

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/mime/emitters/src/Makefile.in
+++ b/mailnews/mime/emitters/src/Makefile.in
@ -57,8 +57,7 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/mime/src/Makefile.in
+++ b/mailnews/mime/src/Makefile.in
@ -94,8 +94,7 @@ EXPORTS		= \
 		comi18n.h \
 		$(NULL)

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/mailnews/news/src/Makefile.in
+++ b/mailnews/news/src/Makefile.in
@ -66,8 +66,7 @@ EXTRA_DSO_LDOPTS = \
 		$(NULL)

 # we don't want the shared lib, but we want to force the creation of a static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/modules/libimg/mng/Makefile.in
+++ b/modules/libimg/mng/Makefile.in
@ -62,8 +62,7 @@ LOCAL_INCLUDES	= -I$(srcdir)
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 EXTRA_DSO_LDOPTS = $(JPEG_LIBS) $(ZLIB_LIBS)
 else
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1
 endif

 include $(topsrcdir)/config/rules.mk
--- a/modules/libimg/png/Makefile.in
+++ b/modules/libimg/png/Makefile.in
@ -62,8 +62,7 @@ endif
 ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
 EXTRA_DSO_LDOPTS = $(ZLIB_LIBS)
 else
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1
 endif

 include $(topsrcdir)/config/rules.mk
--- a/modules/libimg/src/Makefile.in
+++ b/modules/libimg/src/Makefile.in
@ -48,8 +48,7 @@ ifndef MOZ_JAVA
 LOCAL_JMC_SUBDIR = .
 endif

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/modules/libjar/standalone/Makefile.in
+++ b/modules/libjar/standalone/Makefile.in
@ -39,8 +39,7 @@ CPPSRCS		= $(MODULES_LIBJAR_LCPPSRCS)

 OBJS		= $(addprefix S_,$(CPPSRCS:.cpp=.$(OBJ_SUFFIX)))

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 #ifndef MOZ_NATIVE_ZLIB
 SHARED_LIBRARY_LIBS = $(DIST)/lib/libmozz_s.$(LIB_SUFFIX)
--- a/modules/libreg/src/Makefile.in
+++ b/modules/libreg/src/Makefile.in
@ -37,8 +37,10 @@ BIN_SRCS	= VerReg.c reg.c vr_stubs.c
 PROGOBJS        = $(addprefix R_,$(BIN_SRCS:.c=.o))

 # We don't want a shared lib.  Static lib only.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1
+
+# Force use of PIC
+FORCE_USE_PIC	= 1

 include $(topsrcdir)/config/config.mk

--- a/modules/libreg/standalone/Makefile.in
+++ b/modules/libreg/standalone/Makefile.in
@ -35,8 +35,7 @@ CSRCS		= $(MODULES_LIBREG_SRC_LCSRCS)

 OBJS		= $(addprefix S_,$(CSRCS:.c=.$(OBJ_SUFFIX)))

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 MDDEPDIR := $(MDDEPDIR)_S

--- a/modules/libutil/src/Makefile.in
+++ b/modules/libutil/src/Makefile.in
@ -33,8 +33,7 @@ REQUIRES	= xpcom
 CSRCS		= obs.c
 CPPSRCS		= stopwatch.cpp

-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/modules/mpfilelocprovider/src/Makefile.in
+++ b/modules/mpfilelocprovider/src/Makefile.in
@ -33,8 +33,7 @@ REQUIRES	= xpcom string
 CPPSRCS		= nsMPFileLocProvider.cpp

 # we don't want the shared lib
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/modules/zlib/src/Makefile.in
+++ b/modules/zlib/src/Makefile.in
@ -37,7 +37,7 @@ EXPORTS		= $(MODULES_ZLIB_SRC_LEXPORTS)

 # need a static lib for some components (pngcom, say)
 ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1
 endif

 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
--- a/modules/zlib/standalone/Makefile.in
+++ b/modules/zlib/standalone/Makefile.in
@ -37,8 +37,7 @@ EXPORTS		= $(MODULES_ZLIB_SRC_LEXPORTS)
 OBJS		= $(addprefix S_,$(CSRCS:.c=.$(OBJ_SUFFIX)))

 ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1
 endif

 EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
--- a/netwerk/base/src/Makefile.in
+++ b/netwerk/base/src/Makefile.in
@ -69,8 +69,7 @@ JSFILES		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/cache/filecache/Makefile.in
+++ b/netwerk/cache/filecache/Makefile.in
@ -51,8 +51,7 @@ EXTRA_LIBS	= $(NSPR_LIBS)

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/cache/memcache/Makefile.in
+++ b/netwerk/cache/memcache/Makefile.in
@ -39,8 +39,7 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/cache/mgr/Makefile.in
+++ b/netwerk/cache/mgr/Makefile.in
@ -47,8 +47,7 @@ EXTRA_LIBS	= $(NSPR_LIBS)

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/cache/src/Makefile.in
+++ b/netwerk/cache/src/Makefile.in
@ -61,8 +61,7 @@ EXTRA_DSO_LDOPTS = $(MOZ_COMPONENT_LIBS)

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-#override NO_SHARED_LIB=1
-#override NO_STATIC_LIB=
+#FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/dns/src/Makefile.in
+++ b/netwerk/dns/src/Makefile.in
@ -33,8 +33,7 @@ CPPSRCS		= nsDnsService.cpp

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/mime/src/Makefile.in
+++ b/netwerk/mime/src/Makefile.in
@ -38,8 +38,7 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/about/src/Makefile.in
+++ b/netwerk/protocol/about/src/Makefile.in
@ -44,7 +44,6 @@ endif

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/data/src/Makefile.in
+++ b/netwerk/protocol/data/src/Makefile.in
@ -37,8 +37,7 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/datetime/src/Makefile.in
+++ b/netwerk/protocol/datetime/src/Makefile.in
@ -37,7 +37,6 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/file/src/Makefile.in
+++ b/netwerk/protocol/file/src/Makefile.in
@ -37,8 +37,7 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/finger/src/Makefile.in
+++ b/netwerk/protocol/finger/src/Makefile.in
@ -36,7 +36,6 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/ftp/src/Makefile.in
+++ b/netwerk/protocol/ftp/src/Makefile.in
@ -39,8 +39,7 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk

--- a/netwerk/protocol/gopher/src/Makefile.in
+++ b/netwerk/protocol/gopher/src/Makefile.in
@ -36,7 +36,6 @@ CPPSRCS		= \

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/netwerk/protocol/http/src/Makefile.in
+++ b/netwerk/protocol/http/src/Makefile.in
@ -48,7 +48,6 @@ LOCAL_INCLUDES=-I$(srcdir)/../../../streamconv/converters

 # we don't want the shared lib, but we want to force the creation of a
 # static lib.
-override NO_SHARED_LIB=1
-override NO_STATIC_LIB=
+FORCE_STATIC_LIB = 1

 include $(topsrcdir)/config/rules.mk
--- a/Show More
+++ b/Show More