From a26020ddae8b808b92c958109f8e3b3277bf7c85 Mon Sep 17 00:00:00 2001 From: "cls%seawood.org" Date: Tue, 4 Apr 2000 04:46:38 +0000 Subject: [PATCH] Moved static MOZ_COMPONENT_NSPR_LIBS, MOZ_COMPONENT_XPCOM_LIBS, MOZ_COMPONENT_LIBS definitions from configure.in to config.mk. Replaced -lxpcom in Makefiles to $(XPCOM_LIBS) so that we can optionally link against -lboehm when needed. Bug #31287 git-svn-id: svn://10.0.0.236/trunk@65143 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/caps/src/Makefile.in | 2 +- mozilla/config/autoconf.mk.in | 9 - mozilla/config/config.mk | 23 + mozilla/configure | 586 +++++++++--------- mozilla/configure.in | 19 +- mozilla/db/mork/build/Makefile.in | 2 +- mozilla/editor/txmgr/src/Makefile.in | 4 +- mozilla/editor/txmgr/tests/Makefile.in | 2 +- mozilla/editor/txtsvc/src/Makefile.in | 2 +- mozilla/extensions/cookie/Makefile.in | 2 +- mozilla/extensions/cookie/tests/Makefile.in | 2 +- mozilla/extensions/pics/tests/Makefile.in | 2 +- mozilla/extensions/wallet/src/Makefile.in | 2 +- .../extensions/xmlterm/geckoterm/Makefile.in | 2 +- mozilla/gfx/tests/Makefile.in | 2 +- mozilla/gfx/tests/coverage/Makefile.in | 2 +- mozilla/htmlparser/robot/test/Makefile.in | 2 +- mozilla/htmlparser/tests/logparse/Makefile.in | 2 +- mozilla/htmlparser/tests/outsinks/Makefile.in | 2 +- mozilla/intl/chardet/tests/Makefile.in | 2 +- mozilla/intl/locale/tests/Makefile.in | 2 +- mozilla/intl/lwbrk/tests/Makefile.in | 2 +- mozilla/intl/strres/tests/Makefile.in | 2 +- mozilla/intl/unicharutil/tests/Makefile.in | 2 +- mozilla/js/src/xpconnect/loader/Makefile.in | 2 +- mozilla/js/src/xpconnect/shell/Makefile.in | 2 +- mozilla/js/src/xpconnect/src/Makefile.in | 2 +- mozilla/js/src/xpconnect/tests/Makefile.in | 2 +- mozilla/layout/base/tests/Makefile.in | 2 +- mozilla/layout/build/Makefile.in | 2 +- mozilla/layout/html/tests/Makefile.in | 2 +- mozilla/mailnews/addrbook/build/Makefile.in | 2 +- mozilla/mailnews/base/build/Makefile.in | 2 +- mozilla/mailnews/base/tests/Makefile.in | 2 +- .../mailnews/base/tests/identity/Makefile.in | 2 +- mozilla/mailnews/base/util/Makefile.in | 2 +- mozilla/mailnews/compose/build/Makefile.in | 2 +- .../compose/tests/compose/Makefile.in | 2 +- .../compose/tests/compose2/Makefile.in | 2 +- .../mailnews/compose/tests/geturl/Makefile.in | 2 +- .../compose/tests/sendlater/Makefile.in | 2 +- .../compose/tests/sendpage/Makefile.in | 2 +- .../mailnews/compose/tests/smtp/Makefile.in | 2 +- mozilla/mailnews/db/msgdb/build/Makefile.in | 2 +- mozilla/mailnews/imap/build/Makefile.in | 2 +- .../mailnews/imap/tests/harness/Makefile.in | 2 +- mozilla/mailnews/import/src/Makefile.in | 2 +- mozilla/mailnews/import/text/src/Makefile.in | 2 +- mozilla/mailnews/local/build/Makefile.in | 2 +- .../mailnews/local/tests/mailbox/Makefile.in | 2 +- .../local/tests/mboxParser/Makefile.in | 2 +- mozilla/mailnews/local/tests/pop3/Makefile.in | 2 +- .../mailnews/mime/abstatus/build/Makefile.in | 2 +- .../mailnews/mime/abstatus/src/Makefile.in | 2 +- mozilla/mailnews/mime/build/Makefile.in | 2 +- .../mime/cthandlers/calendar/Makefile.in | 2 +- .../mime/cthandlers/signstub/Makefile.in | 2 +- .../mime/cthandlers/smimestub/Makefile.in | 2 +- .../mime/cthandlers/vcard/Makefile.in | 2 +- .../mailnews/mime/emitters/build/Makefile.in | 2 +- .../mailnews/mime/emitters/src/Makefile.in | 2 +- .../mailnews/mime/tests/mimetest/Makefile.in | 2 +- mozilla/mailnews/news/build/Makefile.in | 2 +- mozilla/mailnews/news/src/Makefile.in | 2 +- .../news/tests/newsParser/Makefile.in | 2 +- mozilla/modules/libjar/Makefile.in | 2 +- mozilla/modules/libpref/src/Makefile.in | 2 +- .../netwerk/cache/filecache/test/Makefile.in | 2 +- mozilla/netwerk/streamconv/test/Makefile.in | 2 +- mozilla/netwerk/test/Makefile.in | 2 +- .../parser/htmlparser/robot/test/Makefile.in | 2 +- .../htmlparser/tests/logparse/Makefile.in | 2 +- .../htmlparser/tests/outsinks/Makefile.in | 2 +- mozilla/profile/pref-migrator/src/Makefile.in | 2 +- mozilla/profile/src/Makefile.in | 2 +- mozilla/rdf/tests/domds/Makefile.in | 2 +- mozilla/rdf/tests/dsds/Makefile.in | 2 +- mozilla/rdf/tests/localfile/Makefile.in | 2 +- mozilla/rdf/tests/rdfcat/Makefile.in | 2 +- mozilla/rdf/tests/rdfpoll/Makefile.in | 2 +- mozilla/rdf/tests/rdfsink/Makefile.in | 2 +- mozilla/uriloader/build/Makefile.in | 2 +- mozilla/webshell/embed/gtk/lib/Makefile.in | 2 +- mozilla/webshell/embed/xlib/gtk/Makefile.in | 2 +- mozilla/webshell/embed/xlib/motif/Makefile.in | 2 +- mozilla/webshell/embed/xlib/qt/Makefile.in | 2 +- mozilla/webshell/embed/xlib/xt/Makefile.in | 2 +- mozilla/webshell/tests/viewer/Makefile.in | 6 +- mozilla/widget/src/rhapsody/Makefile.in | 2 +- mozilla/widget/tests/scribble/Makefile.in | 2 +- mozilla/widget/tests/widget/Makefile.in | 2 +- mozilla/xpcom/base/Makefile.in | 2 +- mozilla/xpcom/proxy/tests/Makefile.in | 2 +- .../xpcom/reflect/xptcall/tests/Makefile.in | 4 +- .../xpcom/reflect/xptinfo/tests/Makefile.in | 4 +- mozilla/xpcom/tests/Makefile.in | 2 +- mozilla/xpcom/tools/registry/Makefile.in | 2 +- mozilla/xpcom/typelib/xpt/tests/Makefile.in | 4 +- mozilla/xpfe/bootstrap/Makefile.in | 6 +- .../xpfe/components/bookmarks/src/Makefile.in | 2 +- mozilla/xpfe/components/directory/Makefile.in | 2 +- mozilla/xpfe/components/find/src/Makefile.in | 2 +- .../xpfe/components/history/src/Makefile.in | 2 +- mozilla/xpfe/components/regviewer/Makefile.in | 2 +- .../xpfe/components/related/src/Makefile.in | 2 +- .../xpfe/components/sample/src/Makefile.in | 2 +- .../xpfe/components/search/src/Makefile.in | 2 +- .../xpfe/components/shistory/src/Makefile.in | 2 +- .../components/timebomb/tools/Makefile.in | 2 +- mozilla/xpfe/components/ucth/src/Makefile.in | 2 +- mozilla/xpfe/components/xfer/src/Makefile.in | 2 +- 111 files changed, 425 insertions(+), 442 deletions(-) diff --git a/mozilla/caps/src/Makefile.in b/mozilla/caps/src/Makefile.in index 6f6ef02c5c6..a0c6b423c53 100644 --- a/mozilla/caps/src/Makefile.in +++ b/mozilla/caps/src/Makefile.in @@ -48,7 +48,7 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ $(ZLIB_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index 888ff948b96..9bb9980764f 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -67,10 +67,6 @@ NEED_BASE_DLL_NAME_ALSO = @NEED_BASE_DLL_NAME_ALSO@ MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS = @MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS@ -MOZ_COMPONENT_NSPR_LIBS = @MOZ_COMPONENT_NSPR_LIBS@ -MOZ_COMPONENT_XPCOM_LIBS = @MOZ_COMPONENT_XPCOM_LIBS@ -MOZ_COMPONENT_LIBS = @MOZ_COMPONENT_LIBS@ - ClientWallet=1 CookieManagement=1 SingleSignon=1 @@ -228,11 +224,6 @@ GTK_CONFIG = @GTK_CONFIG@ TK_CFLAGS = @TK_CFLAGS@ TK_LIBS = @TK_LIBS@ -MOZ_TOOLKIT_REGISTRY_CFLAGS = \ - -DWIDGET_DLL=\"libwidget_$(MOZ_WIDGET_TOOLKIT).$(DLL_SUFFIX)\" \ - -DGFXWIN_DLL=\"libgfx_$(MOZ_GFX_TOOLKIT).$(DLL_SUFFIX)\" \ - $(TK_CFLAGS) - MOZ_ENABLE_GTK = @MOZ_ENABLE_GTK@ MOZ_ENABLE_MOTIF = @MOZ_ENABLE_MOTIF@ MOZ_ENABLE_XLIB = @MOZ_ENABLE_XLIB@ diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index edd2871deba..929fccdf303 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -305,6 +305,29 @@ PUBLIC = $(DIST)/include DEPENDENCIES = .md +# ======================================================== +# MOZ_COMPONENTS_LIBS +# +# 'extra' link flags iff this is a component +# See the IS_COMPONENT rule in rules.mk +# ======================================================== + +MOZ_COMPONENT_NSPR_LIBS =-L$(DIST)/bin $(NSPR_LIBS) +MOZ_COMPONENT_XPCOM_LIBS=-L$(DIST)/bin -lxpcom +MOZ_COMPONENT_LIBS=$(MOZ_COMPONENT_NSPR_LIBS) $(MOZ_COMPONENT_XPCOM_LIBS) +XPCOM_LIBS=-L$(DIST)/bin -lxpcom + +ifdef GC_LEAK_DETECTOR +MOZ_COMPONENT_XPCOM_LIBS += -lboehm +XPCOM_LIBS += -lboehm +endif + +MOZ_TOOLKIT_REGISTRY_CFLAGS = \ + -DWIDGET_DLL=\"libwidget_$(MOZ_WIDGET_TOOLKIT)$(DLL_SUFFIX)\" \ + -DGFXWIN_DLL=\"libgfx_$(MOZ_GFX_TOOLKIT)$(DLL_SUFFIX)\" \ + $(TK_CFLAGS) + + ifneq ($(OS_ARCH),WINNT) ifdef MOZ_NATIVE_MAKEDEPEND diff --git a/mozilla/configure b/mozilla/configure index de4e823748c..74c50d6bd75 100755 --- a/mozilla/configure +++ b/mozilla/configure @@ -3941,12 +3941,6 @@ case "$host" in esac -MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)' -MOZ_COMPONENT_XPCOM_LIBS='-L$(DIST)/bin -lxpcom' -MOZ_COMPONENT_LIBS='$(MOZ_COMPONENT_NSPR_LIBS) $(MOZ_COMPONENT_XPCOM_LIBS)' - - - ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -3959,7 +3953,7 @@ if test "$cross_compiling" = yes; then SUNWSPRO5_VTABLE= else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SUNWSPRO5_VTABLE=1 else @@ -4479,7 +4473,7 @@ then _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:4483: checking for XDrawLines in -lX11" >&5 +echo "configure:4477: checking for XDrawLines in -lX11" >&5 ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4487,7 +4481,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4496: \"$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 @@ -4520,7 +4514,7 @@ MISSING_X="$MISSING_X -lX11" fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:4524: checking for XextAddDisplay in -lXext" >&5 +echo "configure:4518: checking for XextAddDisplay in -lXext" >&5 ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4528,7 +4522,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4537: \"$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 @@ -4561,7 +4555,7 @@ MISSING_X="$MISSING_X -lXext" fi echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:4565: checking for IceFlush in -lICE" >&5 +echo "configure:4559: checking for IceFlush in -lICE" >&5 ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4569,7 +4563,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4578: \"$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 @@ -4601,7 +4595,7 @@ else fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:4605: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:4599: checking for SmcCloseConnection in -lSM" >&5 ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4609,7 +4603,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lSM $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4618: \"$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 @@ -4641,7 +4635,7 @@ else fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:4645: checking for XtFree in -lXt" >&5 +echo "configure:4639: checking for XtFree in -lXt" >&5 ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4649,7 +4643,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4658: \"$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 @@ -4682,7 +4676,7 @@ MISSING_X="$MISSING_X -lXt" fi echo $ac_n "checking for XmuLookupString in -lXmu""... $ac_c" 1>&6 -echo "configure:4686: checking for XmuLookupString in -lXmu" >&5 +echo "configure:4680: checking for XmuLookupString in -lXmu" >&5 ac_lib_var=`echo Xmu'_'XmuLookupString | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4690,7 +4684,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXmu $X_PRE_LIBS $XLIBS $XT_LIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4699: \"$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 @@ -4845,7 +4839,7 @@ fi # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4849: checking for $ac_word" >&5 +echo "configure:4843: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4880,7 +4874,7 @@ fi min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:4884: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:4878: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -4903,7 +4897,7 @@ echo "configure:4884: checking for GTK - version >= $min_gtk_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -4981,7 +4975,7 @@ main () } EOF -if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5016,7 +5010,7 @@ fi CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -5026,7 +5020,7 @@ int main() { return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:5030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -5172,7 +5166,7 @@ fi if test "$MOZ_ENABLE_MOTIF" then echo $ac_n "checking for motif insanity""... $ac_c" 1>&6 -echo "configure:5176: checking for motif insanity" >&5 +echo "configure:5170: checking for motif insanity" >&5 if test "$x_includes" then @@ -5198,7 +5192,7 @@ echo "configure:5176: checking for motif insanity" >&5 if test "$MOTIF_REQUIRES_XPM" = "True" then echo $ac_n "checking for XpmWriteFileFromImage in -lXpm""... $ac_c" 1>&6 -echo "configure:5202: checking for XpmWriteFileFromImage in -lXpm" >&5 +echo "configure:5196: checking for XpmWriteFileFromImage in -lXpm" >&5 ac_lib_var=`echo Xpm'_'XpmWriteFileFromImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5206,7 +5200,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXpm $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5215: \"$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 @@ -5243,7 +5237,7 @@ fi if test "$MOTIF_VERSION" = "2.1" then echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:5247: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:5241: checking for XpGetPrinterList in -lXp" >&5 ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5251,7 +5245,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5260: \"$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 @@ -5330,7 +5324,7 @@ fi _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$MOTIF_DYNAMIC_PATHS $XLDFLAGS $LDFLAGS" echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6 -echo "configure:5334: checking for XmStringCreate in -lXm" >&5 +echo "configure:5328: checking for XmStringCreate in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5338,7 +5332,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXm $MOTIF_DYNAMIC_PATHS $MOZ_MOTIF_LDFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5347: \"$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 @@ -5373,7 +5367,7 @@ fi LDFLAGS="$_SAVE_LDFLAGS" else echo $ac_n "checking for XmStringCreate in -lXm""... $ac_c" 1>&6 -echo "configure:5377: checking for XmStringCreate in -lXm" >&5 +echo "configure:5371: checking for XmStringCreate in -lXm" >&5 ac_lib_var=`echo Xm'_'XmStringCreate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5381,7 +5375,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXm $MOZ_MOTIF_LDFLAGS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5390: \"$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 @@ -5439,7 +5433,7 @@ fi if test "$MOZ_ENABLE_XLIB" then echo $ac_n "checking for xlib insanity""... $ac_c" 1>&6 -echo "configure:5443: checking for xlib insanity" >&5 +echo "configure:5437: checking for xlib insanity" >&5 echo "$ac_t""yes" 1>&6 MOZ_XLIB_CFLAGS="$X_CFLAGS" @@ -5477,7 +5471,7 @@ fi echo $ac_n "checking for Qt insanity""... $ac_c" 1>&6 -echo "configure:5481: checking for Qt insanity" >&5 +echo "configure:5475: checking for Qt insanity" >&5 QT_CFLAGS="-I${QTDIR}/include/qt" QT_LIBS="-L/usr/X11R6/lib -L${QTDIR}/lib -lqt -lXext -lX11" @@ -5679,7 +5673,7 @@ fi # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5683: checking for $ac_word" >&5 +echo "configure:5677: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5714,7 +5708,7 @@ fi min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:5718: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:5712: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -5737,7 +5731,7 @@ echo "configure:5718: checking for GLIB - version >= $min_glib_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -5813,7 +5807,7 @@ main () } EOF -if { (eval echo configure:5817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -5847,7 +5841,7 @@ fi CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -5857,7 +5851,7 @@ int main() { return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:5861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -5901,7 +5895,7 @@ rm -f conftest* # Extract the first word of "libIDL-config", so it can be a program name with args. set dummy libIDL-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5905: checking for $ac_word" >&5 +echo "configure:5899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5936,7 +5930,7 @@ fi min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:5940: checking for libIDL - version >= $min_libIDL_version" >&5 +echo "configure:5934: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes @@ -5963,7 +5957,7 @@ echo "configure:5940: checking for libIDL - version >= $min_libIDL_version" >&5 echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -6049,7 +6043,7 @@ main () } EOF -if { (eval echo configure:6053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6083,7 +6077,7 @@ fi CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < @@ -6094,7 +6088,7 @@ int main() { return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding libIDL or finding the wrong" @@ -6142,12 +6136,12 @@ if test -n "$CROSS_COMPILE"; then fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6146: checking for working const" >&5 +echo "configure:6140: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6217,12 +6211,12 @@ EOF fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:6221: checking for ANSI C header files" >&5 +echo "configure:6215: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6230,7 +6224,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6247,7 +6241,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6265,7 +6259,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6286,7 +6280,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6297,7 +6291,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6321,12 +6315,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6325: checking for mode_t" >&5 +echo "configure:6319: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6354,12 +6348,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6358: checking for off_t" >&5 +echo "configure:6352: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6387,12 +6381,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6391: checking for pid_t" >&5 +echo "configure:6385: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6420,12 +6414,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:6424: checking for size_t" >&5 +echo "configure:6418: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6453,12 +6447,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6457: checking for uid_t in sys/types.h" >&5 +echo "configure:6451: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -6487,12 +6481,12 @@ EOF fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:6491: checking for st_blksize in struct stat" >&5 +echo "configure:6485: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6500,7 +6494,7 @@ int main() { struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:6504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -6522,12 +6516,12 @@ fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:6526: checking for int16_t" >&5 +echo "configure:6520: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6535,7 +6529,7 @@ int main() { int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else @@ -6557,12 +6551,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:6561: checking for int32_t" >&5 +echo "configure:6555: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6570,7 +6564,7 @@ int main() { int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else @@ -6592,12 +6586,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:6596: checking for int64_t" >&5 +echo "configure:6590: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6605,7 +6599,7 @@ int main() { int64_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else @@ -6627,12 +6621,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 -echo "configure:6631: checking for int64" >&5 +echo "configure:6625: checking for int64" >&5 if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6640,7 +6634,7 @@ int main() { int64 foo = 0; ; return 0; } EOF -if { (eval echo configure:6644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else @@ -6662,12 +6656,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:6666: checking for uint" >&5 +echo "configure:6660: checking for uint" >&5 if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6675,7 +6669,7 @@ int main() { uint foo = 0; ; return 0; } EOF -if { (eval echo configure:6679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else @@ -6697,12 +6691,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:6701: checking for uint_t" >&5 +echo "configure:6695: checking for uint_t" >&5 if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6710,7 +6704,7 @@ int main() { uint foo = 0; ; return 0; } EOF -if { (eval echo configure:6714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else @@ -6732,12 +6726,12 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:6736: checking for uint16_t" >&5 +echo "configure:6730: checking for uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6745,7 +6739,7 @@ int main() { uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:6749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint16_t=true else @@ -6768,12 +6762,12 @@ else fi echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 -echo "configure:6772: checking for uname.domainname" >&5 +echo "configure:6766: checking for uname.domainname" >&5 if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -6781,7 +6775,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF -if { (eval echo configure:6785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else @@ -6805,12 +6799,12 @@ else fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 -echo "configure:6809: checking for uname.__domainname" >&5 +echo "configure:6803: checking for uname.__domainname" >&5 if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -6818,7 +6812,7 @@ int main() { (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF -if { (eval echo configure:6822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else @@ -6845,17 +6839,17 @@ for ac_hdr in sys/byteorder.h compat.h getopt.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6849: checking for $ac_hdr" >&5 +echo "configure:6843: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6885,17 +6879,17 @@ for ac_hdr in sys/bittypes.h memory.h unistd.h sys/filio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6889: checking for $ac_hdr" >&5 +echo "configure:6883: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6899: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6925,17 +6919,17 @@ for ac_hdr in sys/ipc.h shm.h sys/shm.h X11/extensions/XShm.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6929: checking for $ac_hdr" >&5 +echo "configure:6923: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6933: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6966,17 +6960,17 @@ for ac_hdr in sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6970: checking for $ac_hdr" >&5 +echo "configure:6964: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6980: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7011,17 +7005,17 @@ case $target in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7015: checking for $ac_hdr" >&5 +echo "configure:7009: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7025: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7055,7 +7049,7 @@ case $target in ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:7059: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:7053: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7063,7 +7057,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7072: \"$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 @@ -7104,7 +7098,7 @@ fi ;; esac echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:7108: checking for atan in -lm" >&5 +echo "configure:7102: checking for atan in -lm" >&5 ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7112,7 +7106,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7121: \"$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 @@ -7151,7 +7145,7 @@ else fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:7155: checking for dlopen in -ldl" >&5 +echo "configure:7149: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7159,7 +7153,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7168: \"$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 @@ -7206,7 +7200,7 @@ if test ! "$GNU_CXX"; then LIBS="-liostream -lCstd -lCrun $LIBS" else echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:7210: checking for demangle in -lC" >&5 +echo "configure:7204: checking for demangle in -lC" >&5 ac_lib_var=`echo C'_'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 @@ -7214,7 +7208,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lC $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7223: \"$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 @@ -7256,7 +7250,7 @@ fi ;; *-aix*) echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 -echo "configure:7260: checking for demangle in -lC_r" >&5 +echo "configure:7254: checking for demangle in -lC_r" >&5 ac_lib_var=`echo C_r'_'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 @@ -7264,7 +7258,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lC_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7273: \"$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 @@ -7305,7 +7299,7 @@ fi ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:7309: checking for demangle in -lC" >&5 +echo "configure:7303: checking for demangle in -lC" >&5 ac_lib_var=`echo C'_'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 @@ -7313,7 +7307,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lC $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7322: \"$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 @@ -7355,7 +7349,7 @@ fi esac fi echo $ac_n "checking for res_gethostbyaddr in -lresolv""... $ac_c" 1>&6 -echo "configure:7359: checking for res_gethostbyaddr in -lresolv" >&5 +echo "configure:7353: checking for res_gethostbyaddr in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_gethostbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7363,7 +7357,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7372: \"$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 @@ -7402,7 +7396,7 @@ else fi echo $ac_n "checking for getnetbyaddr in -lsocket""... $ac_c" 1>&6 -echo "configure:7406: checking for getnetbyaddr in -lsocket" >&5 +echo "configure:7400: checking for getnetbyaddr in -lsocket" >&5 ac_lib_var=`echo socket'_'getnetbyaddr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7410,7 +7404,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7419: \"$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 @@ -7449,7 +7443,7 @@ else fi echo $ac_n "checking for login in -lutil""... $ac_c" 1>&6 -echo "configure:7453: checking for login in -lutil" >&5 +echo "configure:7447: checking for login in -lutil" >&5 ac_lib_var=`echo util'_'login | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7457,7 +7451,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lutil $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7466: \"$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 @@ -7496,7 +7490,7 @@ else fi echo $ac_n "checking for xdr_string in -lnsl""... $ac_c" 1>&6 -echo "configure:7500: checking for xdr_string in -lnsl" >&5 +echo "configure:7494: checking for xdr_string in -lnsl" >&5 ac_lib_var=`echo nsl'_'xdr_string | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7504,7 +7498,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7513: \"$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 @@ -7543,7 +7537,7 @@ else fi echo $ac_n "checking for elf_rawdata in -lelf""... $ac_c" 1>&6 -echo "configure:7547: checking for elf_rawdata in -lelf" >&5 +echo "configure:7541: checking for elf_rawdata in -lelf" >&5 ac_lib_var=`echo elf'_'elf_rawdata | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7551,7 +7545,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lelf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7560: \"$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 @@ -7590,7 +7584,7 @@ else fi echo $ac_n "checking for textdomain in -lintl""... $ac_c" 1>&6 -echo "configure:7594: checking for textdomain in -lintl" >&5 +echo "configure:7588: checking for textdomain in -lintl" >&5 ac_lib_var=`echo intl'_'textdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7598,7 +7592,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7607: \"$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 @@ -7637,7 +7631,7 @@ else fi echo $ac_n "checking for shm_open in -lposix4""... $ac_c" 1>&6 -echo "configure:7641: checking for shm_open in -lposix4" >&5 +echo "configure:7635: checking for shm_open in -lposix4" >&5 ac_lib_var=`echo posix4'_'shm_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7645,7 +7639,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7654: \"$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 @@ -7684,7 +7678,7 @@ else fi echo $ac_n "checking for iswupper in -lw""... $ac_c" 1>&6 -echo "configure:7688: checking for iswupper in -lw" >&5 +echo "configure:7682: checking for iswupper in -lw" >&5 ac_lib_var=`echo w'_'iswupper | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7692,7 +7686,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lw $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7701: \"$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 @@ -7734,7 +7728,7 @@ fi echo $ac_n "checking for pthread_attr_init in -lpthread""... $ac_c" 1>&6 -echo "configure:7738: checking for pthread_attr_init in -lpthread" >&5 +echo "configure:7732: checking for pthread_attr_init in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7742,7 +7736,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7751: \"$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 @@ -7772,7 +7766,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6 -echo "configure:7776: checking for pthread_attr_init in -lc_r" >&5 +echo "configure:7770: checking for pthread_attr_init in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7780,7 +7774,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7789: \"$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 @@ -7810,7 +7804,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_attr_init in -lc""... $ac_c" 1>&6 -echo "configure:7814: checking for pthread_attr_init in -lc" >&5 +echo "configure:7808: checking for pthread_attr_init in -lc" >&5 ac_lib_var=`echo c'_'pthread_attr_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7818,7 +7812,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7827: \"$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 @@ -7877,7 +7871,7 @@ then rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:7881: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:7875: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -7970,13 +7964,13 @@ else fi echo $ac_n "checking "for PR_GetCurrentThread in -lnspr$NSPR_VERSION"""... $ac_c" 1>&6 -echo "configure:7974: checking "for PR_GetCurrentThread in -lnspr$NSPR_VERSION"" >&5 +echo "configure:7968: checking "for PR_GetCurrentThread in -lnspr$NSPR_VERSION"" >&5 LIBS="-lnspr$NSPR_VERSION $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then NSPR_LIBS="-lnspr$NSPR_VERSION $NSPR_LIBS" result="yes" else cat > conftest.$ac_ext < #include @@ -7986,7 +7980,7 @@ else } EOF -if { (eval echo configure:7990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then NSPR_LIBS="-lnspr$NSPR_VERSION $NSPR_LIBS" result="yes" else @@ -8005,13 +7999,13 @@ if test "$_NSPR_NEEDS_THREAD_LIB" = 1; then LIBS=$_SAVE_LIBS echo $ac_n "checking "for PR_GetCurrentThread in -lnspr$NSPR_VERSION with thread lib"""... $ac_c" 1>&6 -echo "configure:8009: checking "for PR_GetCurrentThread in -lnspr$NSPR_VERSION with thread lib"" >&5 +echo "configure:8003: checking "for PR_GetCurrentThread in -lnspr$NSPR_VERSION with thread lib"" >&5 LIBS="-lnspr$NSPR_VERSION $NSPR_LIBS $LIBS" if test "$cross_compiling" = yes; then NSPR_LIBS="-lnspr$NSPR_VERSION $NSPR_LIBS" result="yes" else cat > conftest.$ac_ext < #include @@ -8021,7 +8015,7 @@ else } EOF -if { (eval echo configure:8025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then NSPR_LIBS="-lnspr$NSPR_VERSION $NSPR_LIBS" result="yes" else @@ -8038,7 +8032,7 @@ echo "$ac_t"""$result"" 1>&6 fi echo $ac_n "checking for PL_CreateOptState in -lplc$NSPR_VERSION""... $ac_c" 1>&6 -echo "configure:8042: checking for PL_CreateOptState in -lplc$NSPR_VERSION" >&5 +echo "configure:8036: checking for PL_CreateOptState in -lplc$NSPR_VERSION" >&5 ac_lib_var=`echo plc$NSPR_VERSION'_'PL_CreateOptState | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8046,7 +8040,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lplc$NSPR_VERSION $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8055: \"$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 @@ -8079,7 +8073,7 @@ MISSING_NSPR="$MISSING_NSPR -lplc$NSPR_VERSION" fi echo $ac_n "checking for PL_NewHashTable in -lplds$NSPR_VERSION""... $ac_c" 1>&6 -echo "configure:8083: checking for PL_NewHashTable in -lplds$NSPR_VERSION" >&5 +echo "configure:8077: checking for PL_NewHashTable in -lplds$NSPR_VERSION" >&5 ac_lib_var=`echo plds$NSPR_VERSION'_'PL_NewHashTable | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8087,7 +8081,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lplds$NSPR_VERSION $NSPR_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8096: \"$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 @@ -8137,7 +8131,7 @@ if test "${NSPR_DIR}" -a -d "${NSPR_DIR}"; then fi echo $ac_n "checking whether have system NSPR""... $ac_c" 1>&6 -echo "configure:8141: checking whether have system NSPR" >&5 +echo "configure:8135: checking whether have system NSPR" >&5 if test "$MISSING_NSPR"; then echo "$ac_t""no (will build it from source)" 1>&6 NSPR_INCLUDE_DIR= @@ -8149,7 +8143,7 @@ else fi echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:8153: checking whether mmap() sees write()s" >&5 +echo "configure:8147: checking whether mmap() sees write()s" >&5 mmap_test_prog=' @@ -8188,11 +8182,11 @@ if test "$cross_compiling" = yes; then result="yes" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -8217,13 +8211,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:8221: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:8215: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -8241,7 +8235,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -8263,7 +8257,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:8267: checking for 8-bit clean memcmp" >&5 +echo "configure:8261: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8271,7 +8265,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -8301,12 +8295,12 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" for ac_func in random qsort strerror lchown fchmod snprintf localtime_r statvfs memmove usleep do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8305: checking for $ac_func" >&5 +echo "configure:8299: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8355,12 +8349,12 @@ done echo $ac_n "checking how to call gettimeofday""... $ac_c" 1>&6 -echo "configure:8359: checking how to call gettimeofday" >&5 +echo "configure:8353: checking how to call gettimeofday" >&5 if eval "test \"`echo '$''{'ac_cv_gettimeofday_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8369,7 +8363,7 @@ struct timeval tv; struct timezone tzp; gettimeofday(&tv, &tzp); ; return 0; } EOF -if { (eval echo configure:8373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gettimeofday_args=2 else @@ -8377,7 +8371,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext < #include @@ -8385,7 +8379,7 @@ int main() { struct timeval tv; gettimeofday(&tv); ; return 0; } EOF -if { (eval echo configure:8389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gettimeofday_args=1 else @@ -8421,7 +8415,7 @@ fi echo $ac_n "checking for /dev/zero""... $ac_c" 1>&6 -echo "configure:8425: checking for /dev/zero" >&5 +echo "configure:8419: checking for /dev/zero" >&5 if test "$HAVE_DEV_ZERO"; then cat >> confdefs.h <<\EOF #define HAVE_DEV_ZERO 1 @@ -8438,19 +8432,19 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for valloc""... $ac_c" 1>&6 -echo "configure:8442: checking for valloc" >&5 +echo "configure:8436: checking for valloc" >&5 if eval "test \"`echo '$''{'ac_cv_valloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { void *ptr = valloc(1); ; return 0; } EOF -if { (eval echo configure:8454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_valloc=true else @@ -8476,7 +8470,7 @@ fi fi echo $ac_n "checking whether va_list assignments need array notation""... $ac_c" 1>&6 -echo "configure:8480: checking whether va_list assignments need array notation" >&5 +echo "configure:8474: checking whether va_list assignments need array notation" >&5 if eval "test \"`echo '$''{'ac_cv_valistisarray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8484,7 +8478,7 @@ else ac_cv_valistisarray=false else cat > conftest.$ac_ext < #include @@ -8497,7 +8491,7 @@ else } int main() { foo(0, 123); return(0); } EOF -if { (eval echo configure:8501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_valistisarray=false else @@ -8573,12 +8567,12 @@ EOF esac echo $ac_n "checking for sys_errlist/sys_nerr""... $ac_c" 1>&6 -echo "configure:8577: checking for sys_errlist/sys_nerr" >&5 +echo "configure:8571: checking for sys_errlist/sys_nerr" >&5 if eval "test \"`echo '$''{'ac_cv_syserrlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8586,7 +8580,7 @@ int main() { char *foo = sys_errlist[sys_nerr-1]; ; return 0; } EOF -if { (eval echo configure:8590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_syserrlist=true else @@ -8613,7 +8607,7 @@ if test "$GNU_CXX"; then _MOZ_RTTI_FLAGS=${_COMPILER_PREFIX}-fno-rtti echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:8617: checking for C++ exceptions flag" >&5 +echo "configure:8611: checking for C++ exceptions flag" >&5 if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8645,12 +8639,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for ios::binary""... $ac_c" 1>&6 -echo "configure:8649: checking for ios::binary" >&5 +echo "configure:8643: checking for ios::binary" >&5 if eval "test \"`echo '$''{'ac_cv_ios_binary'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8659,7 +8653,7 @@ char *buffer = "config.log"; fstream *mFileStream=new fstream(buffer, ios::binary); ; return 0; } EOF -if { (eval echo configure:8663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8657: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ios_binary=true else @@ -8683,12 +8677,12 @@ fi echo $ac_n "checking for ios::bin""... $ac_c" 1>&6 -echo "configure:8687: checking for ios::bin" >&5 +echo "configure:8681: checking for ios::bin" >&5 if eval "test \"`echo '$''{'ac_cv_ios_bin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -8697,7 +8691,7 @@ char *buffer = "config.log"; fstream *mFileStream=new fstream(buffer, ios::bin); ; return 0; } EOF -if { (eval echo configure:8701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_ios_bin=true else @@ -8720,19 +8714,19 @@ else fi echo $ac_n "checking for ostreams""... $ac_c" 1>&6 -echo "configure:8724: checking for ostreams" >&5 +echo "configure:8718: checking for ostreams" >&5 if eval "test \"`echo '$''{'ac_cv_ostream'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { streambuf *xxx; ostream *foo=new ostream(xxx); ; return 0; } EOF -if { (eval echo configure:8736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ostream=true else @@ -8755,19 +8749,19 @@ else _SAVE_LIBS=$LIBS LIBS="$LIBS -lstdc++" echo $ac_n "checking for ostreams in -lstdc++""... $ac_c" 1>&6 -echo "configure:8759: checking for ostreams in -lstdc++" >&5 +echo "configure:8753: checking for ostreams in -lstdc++" >&5 if eval "test \"`echo '$''{'ac_cv_lib_stdcpp_ostream'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { ostream *foo=new ostream(); ; return 0; } EOF -if { (eval echo configure:8771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_stdcpp_ostream=true else @@ -8792,19 +8786,19 @@ EOF fi echo $ac_n "checking for C++ \"bool\" keyword""... $ac_c" 1>&6 -echo "configure:8796: checking for C++ \"bool\" keyword" >&5 +echo "configure:8790: checking for C++ \"bool\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_bool=yes else @@ -8826,12 +8820,12 @@ fi echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:8830: checking for C++ \"explicit\" keyword" >&5 +echo "configure:8824: checking for C++ \"explicit\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -8862,12 +8856,12 @@ EOF fi echo $ac_n "checking for C++ template specialization support""... $ac_c" 1>&6 -echo "configure:8866: checking for C++ template specialization support" >&5 +echo "configure:8860: checking for C++ template specialization support" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_template_specialization'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct X { int a; }; class Y {}; @@ -8877,7 +8871,7 @@ X int_x; X y_x; ; return 0; } EOF -if { (eval echo configure:8881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_template_specialization=yes else @@ -8907,12 +8901,12 @@ EOF fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:8911: checking for modern C++ template specialization syntax support" >&5 +echo "configure:8905: checking for modern C++ template specialization syntax support" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct X { int a; }; class Y {}; @@ -8922,7 +8916,7 @@ X int_x; X y_x; ; return 0; } EOF -if { (eval echo configure:8926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else @@ -8944,12 +8938,12 @@ fi echo $ac_n "checking to determine if the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:8948: checking to determine if the C++ \"using\" keyword can change access" >&5 +echo "configure:8942: checking to determine if the C++ \"using\" keyword can change access" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_using_can_change_access'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_using_can_change_access=yes else @@ -8981,12 +8975,12 @@ EOF fi echo $ac_n "checking to determine if the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:8985: checking to determine if the C++ \"using\" keyword resolves ambiguity" >&5 +echo "configure:8979: checking to determine if the C++ \"using\" keyword resolves ambiguity" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_using_resolves_ambiguity'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9000: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_using_resolves_ambiguity=yes else @@ -9023,19 +9017,19 @@ EOF fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:9027: checking for \"std::\" namespace" >&5 +echo "configure:9021: checking for \"std::\" namespace" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return std::min(0, 1); ; return 0; } EOF -if { (eval echo configure:9039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else @@ -9057,12 +9051,12 @@ fi echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:9061: checking for C++ reinterpret_cast" >&5 +echo "configure:9055: checking for C++ reinterpret_cast" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <(z); ; return 0; } EOF -if { (eval echo configure:9074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -9091,19 +9085,19 @@ EOF fi echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:9095: checking whether C++ requires implementation of unused virtual methods" >&5 +echo "configure:9089: checking whether C++ requires implementation of unused virtual methods" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_cpp_unused_required=no else @@ -9133,19 +9127,19 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:9137: checking for LC_MESSAGES" >&5 +echo "configure:9131: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { int category = LC_MESSAGES; ; return 0; } EOF -if { (eval echo configure:9149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else @@ -9525,12 +9519,12 @@ cross_compiling=$ac_cv_prog_cxx_cross _SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS ${_WARNING_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 -echo "configure:9529: checking whether C++ compiler has -pedantic long long bug" >&5 +echo "configure:9523: checking whether C++ compiler has -pedantic long long bug" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="no" else @@ -9591,16 +9585,16 @@ if test "$_IGNORE_LONG_LONG_WARNINGS"; then _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 -echo "configure:9595: checking whether compiler supports -Wno-long-long" >&5 +echo "configure:9589: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" @@ -9738,6 +9732,7 @@ if test "${enable_boehm+set}" = set; then EOF GC_LEAK_DETECTOR=1 + elif test "$enableval" = "no"; then : else @@ -9794,7 +9789,7 @@ fi echo $ac_n "checking webshell leaks option""... $ac_c" 1>&6 -echo "configure:9798: checking webshell leaks option" >&5 +echo "configure:9793: 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" @@ -9868,7 +9863,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:9872: checking for malloc in -lefence" >&5 +echo "configure:9867: 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 @@ -9876,7 +9871,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lefence $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9886: \"$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 @@ -9923,7 +9918,7 @@ fi echo $ac_n "checking for cplus_demangle in -liberty""... $ac_c" 1>&6 -echo "configure:9927: checking for cplus_demangle in -liberty" >&5 +echo "configure:9922: 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 @@ -9931,7 +9926,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liberty "-liberty" $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9941: \"$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 @@ -10140,7 +10135,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:10144: checking for $ac_word" >&5 +echo "configure:10139: 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 @@ -10233,10 +10228,6 @@ esac - - - - @@ -10258,7 +10249,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:10262: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:10253: 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 @@ -10266,7 +10257,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10272: \"$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 @@ -10306,7 +10297,7 @@ if test "$SYSTEM_JPEG" = 1; then SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -10320,7 +10311,7 @@ else } EOF -if { (eval echo configure:10324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -10358,16 +10349,16 @@ if test "$ZLIB_DIR" = no; then SYSTEM_ZLIB= else echo $ac_n "checking "for zlib.h"""... $ac_c" 1>&6 -echo "configure:10362: checking "for zlib.h"" >&5 +echo "configure:10353: checking "for zlib.h"" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" SYSTEM_ZLIB=1 else @@ -10381,7 +10372,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:10385: checking for gzread in -lz" >&5 +echo "configure:10376: 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 @@ -10389,7 +10380,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $ZLIB_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10395: \"$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 @@ -10446,7 +10437,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:10450: checking for png_get_valid in -lpng" >&5 +echo "configure:10441: 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 @@ -10454,7 +10445,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lpng $PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10460: \"$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 @@ -10493,7 +10484,7 @@ if test "$SYSTEM_PNG" = 1; then SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -10507,7 +10498,7 @@ else } EOF -if { (eval echo configure:10511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -10574,9 +10565,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:10578: checking "for FCInitialize in -lfullsoft"" >&5; +echo "configure:10569: checking "for FCInitialize in -lfullsoft"" >&5; cat > conftest.$ac_ext < #include "fullsoft.h" @@ -10584,7 +10575,7 @@ int main() { FCInitialize(); exit(0); ; return 0; } EOF -if { (eval echo configure:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10579: \"$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 @@ -11159,9 +11150,6 @@ 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 -s%@MOZ_COMPONENT_XPCOM_LIBS@%$MOZ_COMPONENT_XPCOM_LIBS%g -s%@MOZ_COMPONENT_LIBS@%$MOZ_COMPONENT_LIBS%g s%@MOZ_GLE@%$MOZ_GLE%g s%@MOZ_BUILD_ROOT@%$MOZ_BUILD_ROOT%g s%@MOZ_POST_DSO_LIB_COMMAND@%$MOZ_POST_DSO_LIB_COMMAND%g diff --git a/mozilla/configure.in b/mozilla/configure.in index 5174c5256e2..69c30db6a01 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -456,18 +456,6 @@ case "$host" in esac -dnl ======================================================== -dnl MOZ_COMPONENTS_LIBS -dnl -dnl 'extra' link flags iff this is a component -dnl See the IS_COMPONENT rule in rules.mk -dnl ======================================================== - -MOZ_COMPONENT_NSPR_LIBS='-L$(DIST)/bin $(NSPR_LIBS)' -MOZ_COMPONENT_XPCOM_LIBS='-L$(DIST)/bin -lxpcom' -MOZ_COMPONENT_LIBS='$(MOZ_COMPONENT_NSPR_LIBS) $(MOZ_COMPONENT_XPCOM_LIBS)' - - dnl ======================================================== dnl Check which style vtables we're using on Solaris dnl Options current are: @@ -2795,7 +2783,8 @@ MOZ_ARG_ENABLE_BOOL(profile, MOZ_ARG_ENABLE_BOOL(boehm, [ --enable-boehm Enable the Boehm Garbage Collector], AC_DEFINE(GC_LEAK_DETECTOR) - GC_LEAK_DETECTOR=1) + GC_LEAK_DETECTOR=1 +) dnl This will enable logging of addref, release, ctor, dtor. MOZ_ARG_ENABLE_BOOL(logrefcnt, @@ -3065,10 +3054,6 @@ AC_SUBST(BUILD_IDLC) AC_SUBST(MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS) -AC_SUBST(MOZ_COMPONENT_NSPR_LIBS) -AC_SUBST(MOZ_COMPONENT_XPCOM_LIBS) -AC_SUBST(MOZ_COMPONENT_LIBS) - AC_SUBST(MOZ_GLE) AC_SUBST(MOZ_BUILD_ROOT) diff --git a/mozilla/db/mork/build/Makefile.in b/mozilla/db/mork/build/Makefile.in index 95c8564ebb1..85bc202b4b3 100644 --- a/mozilla/db/mork/build/Makefile.in +++ b/mozilla/db/mork/build/Makefile.in @@ -45,7 +45,7 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/editor/txmgr/src/Makefile.in b/mozilla/editor/txmgr/src/Makefile.in index dd6efe3968a..6af3d70916c 100644 --- a/mozilla/editor/txmgr/src/Makefile.in +++ b/mozilla/editor/txmgr/src/Makefile.in @@ -40,10 +40,8 @@ CPPSRCS = \ $(NULL) EXTRA_DSO_LDOPTS = \ - -L$(DIST)/bin \ - -L$(DIST)/lib \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ - -lxpcom \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/editor/txmgr/tests/Makefile.in b/mozilla/editor/txmgr/tests/Makefile.in index 20a80e7d833..49d680d53b7 100644 --- a/mozilla/editor/txmgr/tests/Makefile.in +++ b/mozilla/editor/txmgr/tests/Makefile.in @@ -30,7 +30,7 @@ PROGRAM = TestTXMgr CPPSRCS = TestTXMgr.cpp -LIBS = -lxpcom $(NSPR_LIBS) +LIBS = $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/editor/txtsvc/src/Makefile.in b/mozilla/editor/txtsvc/src/Makefile.in index 8c3083db982..618045cb3da 100644 --- a/mozilla/editor/txtsvc/src/Makefile.in +++ b/mozilla/editor/txtsvc/src/Makefile.in @@ -41,8 +41,8 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ - -lxpcom \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/cookie/Makefile.in b/mozilla/extensions/cookie/Makefile.in index f987d40adb3..2abe0d77cef 100644 --- a/mozilla/extensions/cookie/Makefile.in +++ b/mozilla/extensions/cookie/Makefile.in @@ -52,8 +52,8 @@ EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ - -lxpcom \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/cookie/tests/Makefile.in b/mozilla/extensions/cookie/tests/Makefile.in index 543a57c0488..72465a1ff25 100644 --- a/mozilla/extensions/cookie/tests/Makefile.in +++ b/mozilla/extensions/cookie/tests/Makefile.in @@ -31,7 +31,7 @@ CPPSRCS = TestCookie.cpp REQUIRES = js cookie pref xpcom include -LIBS = -lxpcom $(NSPR_LIBS) +LIBS = $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/pics/tests/Makefile.in b/mozilla/extensions/pics/tests/Makefile.in index 63e47e97f11..573ae0615c4 100644 --- a/mozilla/extensions/pics/tests/Makefile.in +++ b/mozilla/extensions/pics/tests/Makefile.in @@ -33,7 +33,7 @@ CPPSRCS = TestPICS.cpp REQUIRES = js pics pref xpcom include LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ -lpics \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/extensions/wallet/src/Makefile.in b/mozilla/extensions/wallet/src/Makefile.in index 4145db6ba81..823040f035e 100644 --- a/mozilla/extensions/wallet/src/Makefile.in +++ b/mozilla/extensions/wallet/src/Makefile.in @@ -55,7 +55,7 @@ CHROME_FILES = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/extensions/xmlterm/geckoterm/Makefile.in b/mozilla/extensions/xmlterm/geckoterm/Makefile.in index 45c2286121d..fcfe24b275a 100644 --- a/mozilla/extensions/xmlterm/geckoterm/Makefile.in +++ b/mozilla/extensions/xmlterm/geckoterm/Makefile.in @@ -71,7 +71,7 @@ GTK_GLUE = -lgtksuperwin XP_DIST_LIBS = \ -lraptorgfx \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(JSJ_LIB) \ $(NULL) diff --git a/mozilla/gfx/tests/Makefile.in b/mozilla/gfx/tests/Makefile.in index 40888c43804..d4c5d368c66 100644 --- a/mozilla/gfx/tests/Makefile.in +++ b/mozilla/gfx/tests/Makefile.in @@ -36,7 +36,7 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=) LIBS = \ -lraptorgfx \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(MOZ_TIMER_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/gfx/tests/coverage/Makefile.in b/mozilla/gfx/tests/coverage/Makefile.in index 00b1e04a9b7..dc27ffdd172 100644 --- a/mozilla/gfx/tests/coverage/Makefile.in +++ b/mozilla/gfx/tests/coverage/Makefile.in @@ -34,7 +34,7 @@ CPPSRCS = \ $(NULL) LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(MOZ_WIDGET_SUPPORT_LIBS) \ -lraptorgfx \ diff --git a/mozilla/htmlparser/robot/test/Makefile.in b/mozilla/htmlparser/robot/test/Makefile.in index 20bc929051c..a0d3a0813d5 100644 --- a/mozilla/htmlparser/robot/test/Makefile.in +++ b/mozilla/htmlparser/robot/test/Makefile.in @@ -34,7 +34,7 @@ CPPSRCS = RobotMain.cpp LIBS = \ -lDebugRobot \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/htmlparser/tests/logparse/Makefile.in b/mozilla/htmlparser/tests/logparse/Makefile.in index 1a1e6281b67..fac82ae3799 100644 --- a/mozilla/htmlparser/tests/logparse/Makefile.in +++ b/mozilla/htmlparser/tests/logparse/Makefile.in @@ -32,7 +32,7 @@ CPPSRCS = logparse.cpp LIBS = \ -lraptorhtmlpars \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/htmlparser/tests/outsinks/Makefile.in b/mozilla/htmlparser/tests/outsinks/Makefile.in index 6e63dee182b..3bd8fbef334 100644 --- a/mozilla/htmlparser/tests/outsinks/Makefile.in +++ b/mozilla/htmlparser/tests/outsinks/Makefile.in @@ -34,7 +34,7 @@ CPPSRCS = \ $(NULL) LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/intl/chardet/tests/Makefile.in b/mozilla/intl/chardet/tests/Makefile.in index e4543106770..830db5493e2 100644 --- a/mozilla/intl/chardet/tests/Makefile.in +++ b/mozilla/intl/chardet/tests/Makefile.in @@ -30,7 +30,7 @@ PROGRAM = DetectCharset CPPSRCS = DetectCharset.cpp -LIBS = -lxpcom $(NSPR_LIBS) +LIBS = $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/intl/locale/tests/Makefile.in b/mozilla/intl/locale/tests/Makefile.in index 3347ebac5d5..e4fba39a2a2 100644 --- a/mozilla/intl/locale/tests/Makefile.in +++ b/mozilla/intl/locale/tests/Makefile.in @@ -35,7 +35,7 @@ SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=) LOCAL_INCLUDES = -I$(srcdir)/../src -LIBS = -lxpcom $(NSPR_LIBS) +LIBS = $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/intl/lwbrk/tests/Makefile.in b/mozilla/intl/lwbrk/tests/Makefile.in index af5bac02d62..299f1049939 100644 --- a/mozilla/intl/lwbrk/tests/Makefile.in +++ b/mozilla/intl/lwbrk/tests/Makefile.in @@ -30,7 +30,7 @@ PROGRAM = TestLineBreak CPPSRCS = TestLineBreak.cpp -LIBS = -lxpcom $(NSPR_LIBS) +LIBS = $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/intl/strres/tests/Makefile.in b/mozilla/intl/strres/tests/Makefile.in index 3e378dcc835..845f1fbc6aa 100644 --- a/mozilla/intl/strres/tests/Makefile.in +++ b/mozilla/intl/strres/tests/Makefile.in @@ -40,7 +40,7 @@ EXPORT_RESOURCE = \ LIBS = \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/intl/unicharutil/tests/Makefile.in b/mozilla/intl/unicharutil/tests/Makefile.in index 7d154c9a5df..66df471e29f 100644 --- a/mozilla/intl/unicharutil/tests/Makefile.in +++ b/mozilla/intl/unicharutil/tests/Makefile.in @@ -35,7 +35,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s endif LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/js/src/xpconnect/loader/Makefile.in b/mozilla/js/src/xpconnect/loader/Makefile.in index 0d6732d5a3b..3b2c30548bb 100644 --- a/mozilla/js/src/xpconnect/loader/Makefile.in +++ b/mozilla/js/src/xpconnect/loader/Makefile.in @@ -33,7 +33,7 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DJSFILE -DJS_THREADSAFE ifneq ($(OS_ARCH),BeOS) -LIBS += -lmozjs -lxpcom $(NSPR_LIBS) +LIBS += -lmozjs $(XPCOM_LIBS) $(NSPR_LIBS) endif EXTRA_DSO_LDOPTS += \ diff --git a/mozilla/js/src/xpconnect/shell/Makefile.in b/mozilla/js/src/xpconnect/shell/Makefile.in index 49064e0ba20..b6ba75dfce8 100644 --- a/mozilla/js/src/xpconnect/shell/Makefile.in +++ b/mozilla/js/src/xpconnect/shell/Makefile.in @@ -45,7 +45,7 @@ CPPSRCS = xpcshell.cpp LIBS = \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in index 01558120fb4..4f7954a3f4c 100644 --- a/mozilla/js/src/xpconnect/src/Makefile.in +++ b/mozilla/js/src/xpconnect/src/Makefile.in @@ -76,7 +76,7 @@ IS_COMPONENT = 1 ifneq ($(OS_ARCH),BeOS) LIBS += \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) endif diff --git a/mozilla/js/src/xpconnect/tests/Makefile.in b/mozilla/js/src/xpconnect/tests/Makefile.in index ca8305b7b05..fd5b4e2d7f3 100644 --- a/mozilla/js/src/xpconnect/tests/Makefile.in +++ b/mozilla/js/src/xpconnect/tests/Makefile.in @@ -49,7 +49,7 @@ LIBS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/layout/base/tests/Makefile.in b/mozilla/layout/base/tests/Makefile.in index e5290d06800..2a64908533d 100644 --- a/mozilla/layout/base/tests/Makefile.in +++ b/mozilla/layout/base/tests/Makefile.in @@ -37,7 +37,7 @@ LIBS += \ -lraptorgfx \ -lmozjs \ $(MOZ_TIMER_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in index 97d1b7e6bb4..c43928a2da2 100644 --- a/mozilla/layout/build/Makefile.in +++ b/mozilla/layout/build/Makefile.in @@ -88,7 +88,7 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_TIMER_LIBS) \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ -lraptorgfx \ -ljsdom \ -lmozjs \ diff --git a/mozilla/layout/html/tests/Makefile.in b/mozilla/layout/html/tests/Makefile.in index 169ec6f7d47..5aaf4492218 100644 --- a/mozilla/layout/html/tests/Makefile.in +++ b/mozilla/layout/html/tests/Makefile.in @@ -47,7 +47,7 @@ LIBS = \ $(MOZ_TIMER_LIBS) \ -lmozjs \ -lraptorgfx \ - -lxpcom \ + $(XPCOM_LIBS) \ $(TK_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/addrbook/build/Makefile.in b/mozilla/mailnews/addrbook/build/Makefile.in index 1aa04746f68..34ded4f3190 100644 --- a/mozilla/mailnews/addrbook/build/Makefile.in +++ b/mozilla/mailnews/addrbook/build/Makefile.in @@ -44,7 +44,7 @@ EXTRA_DSO_LDOPTS = \ $(DIST)/lib/librdfutil_s.a \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/build/Makefile.in b/mozilla/mailnews/base/build/Makefile.in index 0586b123e89..a680f8b5e6b 100644 --- a/mozilla/mailnews/base/build/Makefile.in +++ b/mozilla/mailnews/base/build/Makefile.in @@ -46,7 +46,7 @@ EXTRA_DSO_LDOPTS = \ $(DIST)/lib/librdfutil_s.a \ $(MOZ_TIMER_LIBS) \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/base/tests/Makefile.in b/mozilla/mailnews/base/tests/Makefile.in index 9bf5611be31..dcea630f57c 100644 --- a/mozilla/mailnews/base/tests/Makefile.in +++ b/mozilla/mailnews/base/tests/Makefile.in @@ -37,7 +37,7 @@ LIBS = \ -L$(DIST)/lib \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/base/tests/identity/Makefile.in b/mozilla/mailnews/base/tests/identity/Makefile.in index 46b3896acfc..b1147ab7602 100644 --- a/mozilla/mailnews/base/tests/identity/Makefile.in +++ b/mozilla/mailnews/base/tests/identity/Makefile.in @@ -31,7 +31,7 @@ CPPSRCS = identity.cpp LIBS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/base/util/Makefile.in b/mozilla/mailnews/base/util/Makefile.in index e8b7957d518..54e33646daa 100644 --- a/mozilla/mailnews/base/util/Makefile.in +++ b/mozilla/mailnews/base/util/Makefile.in @@ -70,7 +70,7 @@ EXPORTS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lrdfutil_s \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/compose/build/Makefile.in b/mozilla/mailnews/compose/build/Makefile.in index 1418b04eaa7..835623283fa 100644 --- a/mozilla/mailnews/compose/build/Makefile.in +++ b/mozilla/mailnews/compose/build/Makefile.in @@ -43,7 +43,7 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ -lmsgbaseutil \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/compose/tests/compose/Makefile.in b/mozilla/mailnews/compose/tests/compose/Makefile.in index a6da1e4af16..2836f561d98 100644 --- a/mozilla/mailnews/compose/tests/compose/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose/Makefile.in @@ -32,7 +32,7 @@ CPPSRCS = test.cpp LIBS = \ -lmsgbaseutil \ - -lxpcom \ + $(XPCOM_LIBS) \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/mailnews/compose/tests/compose2/Makefile.in b/mozilla/mailnews/compose/tests/compose2/Makefile.in index a682682653d..571631bc346 100644 --- a/mozilla/mailnews/compose/tests/compose2/Makefile.in +++ b/mozilla/mailnews/compose/tests/compose2/Makefile.in @@ -33,7 +33,7 @@ CPPSRCS = test2.cpp LIBS = \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ -lraptorgfx \ -lmsgbaseutil \ diff --git a/mozilla/mailnews/compose/tests/geturl/Makefile.in b/mozilla/mailnews/compose/tests/geturl/Makefile.in index f6b93dcba64..66898acf501 100644 --- a/mozilla/mailnews/compose/tests/geturl/Makefile.in +++ b/mozilla/mailnews/compose/tests/geturl/Makefile.in @@ -35,7 +35,7 @@ CPPSRCS = \ LIBS = \ $(MOZ_TIMER_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/mailnews/compose/tests/sendlater/Makefile.in b/mozilla/mailnews/compose/tests/sendlater/Makefile.in index e815aec7f51..94ce2bc8619 100644 --- a/mozilla/mailnews/compose/tests/sendlater/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendlater/Makefile.in @@ -33,7 +33,7 @@ CPPSRCS = test.cpp LIBS = \ $(MOZ_TIMER_LIBS) \ -lraptorgfx \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ -lmsgbaseutil \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/compose/tests/sendpage/Makefile.in b/mozilla/mailnews/compose/tests/sendpage/Makefile.in index a99a54ee7f8..0612a8850c9 100644 --- a/mozilla/mailnews/compose/tests/sendpage/Makefile.in +++ b/mozilla/mailnews/compose/tests/sendpage/Makefile.in @@ -32,7 +32,7 @@ CPPSRCS = Test.cpp LIBS = \ $(MOZ_TIMER_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ -lmsgbaseutil \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/compose/tests/smtp/Makefile.in b/mozilla/mailnews/compose/tests/smtp/Makefile.in index c3aef8df5b2..176ff491240 100644 --- a/mozilla/mailnews/compose/tests/smtp/Makefile.in +++ b/mozilla/mailnews/compose/tests/smtp/Makefile.in @@ -31,7 +31,7 @@ PROGRAM = smtpTest CPPSRCS = smtpTest.cpp LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/mailnews/db/msgdb/build/Makefile.in b/mozilla/mailnews/db/msgdb/build/Makefile.in index 10d35764c7b..5456e7a8aa6 100644 --- a/mozilla/mailnews/db/msgdb/build/Makefile.in +++ b/mozilla/mailnews/db/msgdb/build/Makefile.in @@ -41,7 +41,7 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/imap/build/Makefile.in b/mozilla/mailnews/imap/build/Makefile.in index f69dbd39745..d5a1569d2c9 100644 --- a/mozilla/mailnews/imap/build/Makefile.in +++ b/mozilla/mailnews/imap/build/Makefile.in @@ -43,7 +43,7 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lrdfutil_s \ -lmsgbaseutil \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/imap/tests/harness/Makefile.in b/mozilla/mailnews/imap/tests/harness/Makefile.in index 2e8c4549770..2f0f076c6fa 100644 --- a/mozilla/mailnews/imap/tests/harness/Makefile.in +++ b/mozilla/mailnews/imap/tests/harness/Makefile.in @@ -33,7 +33,7 @@ CPPSRCS = imapProtocolTest.cpp LIBS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmsgbaseutil \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/import/src/Makefile.in b/mozilla/mailnews/import/src/Makefile.in index 3096b973171..e99d7df5dd3 100644 --- a/mozilla/mailnews/import/src/Makefile.in +++ b/mozilla/mailnews/import/src/Makefile.in @@ -54,7 +54,7 @@ include $(topsrcdir)/config/rules.mk EXTRA_DSO_LDOPTS += \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/import/text/src/Makefile.in b/mozilla/mailnews/import/text/src/Makefile.in index 91ec579ff56..2696405e485 100644 --- a/mozilla/mailnews/import/text/src/Makefile.in +++ b/mozilla/mailnews/import/text/src/Makefile.in @@ -41,7 +41,7 @@ CPPSRCS = nsTextFactory.cpp \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/local/build/Makefile.in b/mozilla/mailnews/local/build/Makefile.in index b39febcfe06..e4981f72d50 100644 --- a/mozilla/mailnews/local/build/Makefile.in +++ b/mozilla/mailnews/local/build/Makefile.in @@ -44,7 +44,7 @@ EXTRA_DSO_LDOPTS = \ -L$(DIST)/lib \ $(DIST)/lib/librdfutil_s.a \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/local/tests/mailbox/Makefile.in b/mozilla/mailnews/local/tests/mailbox/Makefile.in index 7dccdfd741c..dc4f675d6bb 100644 --- a/mozilla/mailnews/local/tests/mailbox/Makefile.in +++ b/mozilla/mailnews/local/tests/mailbox/Makefile.in @@ -46,7 +46,7 @@ LIBS = \ -lnetcnvts \ -lnetwork \ -lnetlib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lpwcac \ -lmozjs \ -lmork \ diff --git a/mozilla/mailnews/local/tests/mboxParser/Makefile.in b/mozilla/mailnews/local/tests/mboxParser/Makefile.in index 765f47092fe..73b4e99d025 100644 --- a/mozilla/mailnews/local/tests/mboxParser/Makefile.in +++ b/mozilla/mailnews/local/tests/mboxParser/Makefile.in @@ -42,7 +42,7 @@ LIBS = \ -lnetcnvts \ -lnetwork \ -lnetlib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lpwcac \ -lmozjs \ $(NSPR_LIBS) \ diff --git a/mozilla/mailnews/local/tests/pop3/Makefile.in b/mozilla/mailnews/local/tests/pop3/Makefile.in index b795cf6efb6..3492f024e8e 100644 --- a/mozilla/mailnews/local/tests/pop3/Makefile.in +++ b/mozilla/mailnews/local/tests/pop3/Makefile.in @@ -31,7 +31,7 @@ CPPSRCS = pop3Test.cpp LIBS = \ -lmsgbaseutil \ - -lxpcom \ + $(XPCOM_LIBS) \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/mailnews/mime/abstatus/build/Makefile.in b/mozilla/mailnews/mime/abstatus/build/Makefile.in index 8dc5c549196..4ac9826c629 100644 --- a/mozilla/mailnews/mime/abstatus/build/Makefile.in +++ b/mozilla/mailnews/mime/abstatus/build/Makefile.in @@ -35,7 +35,7 @@ CPPSRCS = nsMiscStatusFactory.cpp EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -labstat_s \ $(NULL) diff --git a/mozilla/mailnews/mime/abstatus/src/Makefile.in b/mozilla/mailnews/mime/abstatus/src/Makefile.in index 87a2c547962..19ab530d37f 100644 --- a/mozilla/mailnews/mime/abstatus/src/Makefile.in +++ b/mozilla/mailnews/mime/abstatus/src/Makefile.in @@ -36,7 +36,7 @@ EXPORTS = nsMimeMiscStatus.h EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/mozilla/mailnews/mime/build/Makefile.in b/mozilla/mailnews/mime/build/Makefile.in index 8ec7572ab8f..36685321d38 100644 --- a/mozilla/mailnews/mime/build/Makefile.in +++ b/mozilla/mailnews/mime/build/Makefile.in @@ -43,7 +43,7 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in b/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in index ee2f79f3026..c54aa0a1d3e 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/calendar/Makefile.in @@ -40,7 +40,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/signstub/Makefile.in b/mozilla/mailnews/mime/cthandlers/signstub/Makefile.in index 66f33a37504..e64bc84c63f 100644 --- a/mozilla/mailnews/mime/cthandlers/signstub/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/signstub/Makefile.in @@ -40,7 +40,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in index 29896608cc0..a3394ade304 100644 --- a/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/smimestub/Makefile.in @@ -40,7 +40,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in index 99081754710..821f0a8e179 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in +++ b/mozilla/mailnews/mime/cthandlers/vcard/Makefile.in @@ -42,7 +42,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/mime/emitters/build/Makefile.in b/mozilla/mailnews/mime/emitters/build/Makefile.in index 5ad40aa3ab8..64df6a6e0b1 100644 --- a/mozilla/mailnews/mime/emitters/build/Makefile.in +++ b/mozilla/mailnews/mime/emitters/build/Makefile.in @@ -43,7 +43,7 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/mailnews/mime/emitters/src/Makefile.in b/mozilla/mailnews/mime/emitters/src/Makefile.in index 1dc4cf32aaf..6be834a819b 100644 --- a/mozilla/mailnews/mime/emitters/src/Makefile.in +++ b/mozilla/mailnews/mime/emitters/src/Makefile.in @@ -52,7 +52,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/mozilla/mailnews/mime/tests/mimetest/Makefile.in b/mozilla/mailnews/mime/tests/mimetest/Makefile.in index 4b67625894c..c4870c591ee 100644 --- a/mozilla/mailnews/mime/tests/mimetest/Makefile.in +++ b/mozilla/mailnews/mime/tests/mimetest/Makefile.in @@ -32,7 +32,7 @@ CPPSRCS = mimetest.cpp LIBS = \ -L$(DIST)/bin \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ diff --git a/mozilla/mailnews/news/build/Makefile.in b/mozilla/mailnews/news/build/Makefile.in index c8b75df717e..37f85bd493a 100644 --- a/mozilla/mailnews/news/build/Makefile.in +++ b/mozilla/mailnews/news/build/Makefile.in @@ -40,7 +40,7 @@ EXTRA_DSO_LDOPTS = \ $(SHARED_LIBRARY_LIBS) \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmsgbaseutil \ -L$(DIST)/lib \ -lrdfutil_s \ diff --git a/mozilla/mailnews/news/src/Makefile.in b/mozilla/mailnews/news/src/Makefile.in index 27294886eb1..c1b3ee91e5b 100644 --- a/mozilla/mailnews/news/src/Makefile.in +++ b/mozilla/mailnews/news/src/Makefile.in @@ -63,7 +63,7 @@ EXPORTS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmsgbaseutil \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/mailnews/news/tests/newsParser/Makefile.in b/mozilla/mailnews/news/tests/newsParser/Makefile.in index 80606020a44..4dd336a7540 100644 --- a/mozilla/mailnews/news/tests/newsParser/Makefile.in +++ b/mozilla/mailnews/news/tests/newsParser/Makefile.in @@ -35,7 +35,7 @@ LIBS = \ -lmozjs \ -lraptorgfx \ -lmsgbaseutil \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/modules/libjar/Makefile.in b/mozilla/modules/libjar/Makefile.in index f8b3e84986e..c8ac694e5e7 100644 --- a/mozilla/modules/libjar/Makefile.in +++ b/mozilla/modules/libjar/Makefile.in @@ -51,7 +51,7 @@ XPIDLSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ $(ZLIB_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/modules/libpref/src/Makefile.in b/mozilla/modules/libpref/src/Makefile.in index 0d9d2527694..ed2febef16e 100644 --- a/mozilla/modules/libpref/src/Makefile.in +++ b/mozilla/modules/libpref/src/Makefile.in @@ -69,7 +69,7 @@ endif EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NULL) diff --git a/mozilla/netwerk/cache/filecache/test/Makefile.in b/mozilla/netwerk/cache/filecache/test/Makefile.in index e5c0b73f9c3..14134898fe7 100644 --- a/mozilla/netwerk/cache/filecache/test/Makefile.in +++ b/mozilla/netwerk/cache/filecache/test/Makefile.in @@ -36,7 +36,7 @@ endif LIBS = \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozdbm_s \ $(MOZ_NECKO_UTIL_LIBS) \ $(LOST_SYM_LIBS) \ diff --git a/mozilla/netwerk/streamconv/test/Makefile.in b/mozilla/netwerk/streamconv/test/Makefile.in index aabf595a113..3947197fe7a 100644 --- a/mozilla/netwerk/streamconv/test/Makefile.in +++ b/mozilla/netwerk/streamconv/test/Makefile.in @@ -41,7 +41,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s endif LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/netwerk/test/Makefile.in b/mozilla/netwerk/test/Makefile.in index 4729d522a76..d1dc64144d0 100644 --- a/mozilla/netwerk/test/Makefile.in +++ b/mozilla/netwerk/test/Makefile.in @@ -52,7 +52,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxpcomio_s -lxptinfo -lmozreg_s endif LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/parser/htmlparser/robot/test/Makefile.in b/mozilla/parser/htmlparser/robot/test/Makefile.in index 20bc929051c..a0d3a0813d5 100644 --- a/mozilla/parser/htmlparser/robot/test/Makefile.in +++ b/mozilla/parser/htmlparser/robot/test/Makefile.in @@ -34,7 +34,7 @@ CPPSRCS = RobotMain.cpp LIBS = \ -lDebugRobot \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/parser/htmlparser/tests/logparse/Makefile.in b/mozilla/parser/htmlparser/tests/logparse/Makefile.in index 1a1e6281b67..fac82ae3799 100644 --- a/mozilla/parser/htmlparser/tests/logparse/Makefile.in +++ b/mozilla/parser/htmlparser/tests/logparse/Makefile.in @@ -32,7 +32,7 @@ CPPSRCS = logparse.cpp LIBS = \ -lraptorhtmlpars \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in index 6e63dee182b..3bd8fbef334 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/Makefile.in +++ b/mozilla/parser/htmlparser/tests/outsinks/Makefile.in @@ -34,7 +34,7 @@ CPPSRCS = \ $(NULL) LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/profile/pref-migrator/src/Makefile.in b/mozilla/profile/pref-migrator/src/Makefile.in index 60c0ccd8a6f..d06fa0a3f64 100644 --- a/mozilla/profile/pref-migrator/src/Makefile.in +++ b/mozilla/profile/pref-migrator/src/Makefile.in @@ -42,7 +42,7 @@ EXPORTS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ $(NSPR_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/profile/src/Makefile.in b/mozilla/profile/src/Makefile.in index 79687974b63..102438297b4 100644 --- a/mozilla/profile/src/Makefile.in +++ b/mozilla/profile/src/Makefile.in @@ -36,7 +36,7 @@ CPPSRCS = nsProfile.cpp \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/rdf/tests/domds/Makefile.in b/mozilla/rdf/tests/domds/Makefile.in index 9a6359c18e0..6a30b6c47b2 100644 --- a/mozilla/rdf/tests/domds/Makefile.in +++ b/mozilla/rdf/tests/domds/Makefile.in @@ -48,7 +48,7 @@ XPIDLSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lrdfutil_s \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/rdf/tests/dsds/Makefile.in b/mozilla/rdf/tests/dsds/Makefile.in index 8920b2bfdb0..55b4b4096e5 100644 --- a/mozilla/rdf/tests/dsds/Makefile.in +++ b/mozilla/rdf/tests/dsds/Makefile.in @@ -43,7 +43,7 @@ RESOURCE_SAMPLES = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/rdf/tests/localfile/Makefile.in b/mozilla/rdf/tests/localfile/Makefile.in index 134dcf4b063..1ee74456cb5 100644 --- a/mozilla/rdf/tests/localfile/Makefile.in +++ b/mozilla/rdf/tests/localfile/Makefile.in @@ -30,7 +30,7 @@ PROGRAM = localfile CPPSRCS = localfile.cpp LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/rdf/tests/rdfcat/Makefile.in b/mozilla/rdf/tests/rdfcat/Makefile.in index af09183583f..c320c1816ae 100644 --- a/mozilla/rdf/tests/rdfcat/Makefile.in +++ b/mozilla/rdf/tests/rdfcat/Makefile.in @@ -32,7 +32,7 @@ CPPSRCS = rdfcat.cpp LIBS = \ $(MOZ_TIMER_LIBS) \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(TK_LIBS) \ $(NULL) diff --git a/mozilla/rdf/tests/rdfpoll/Makefile.in b/mozilla/rdf/tests/rdfpoll/Makefile.in index 963d2156a53..557b949e023 100644 --- a/mozilla/rdf/tests/rdfpoll/Makefile.in +++ b/mozilla/rdf/tests/rdfpoll/Makefile.in @@ -32,7 +32,7 @@ CPPSRCS = rdfpoll.cpp LIBS = \ $(MOZ_TIMER_LIBS) \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(TK_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/rdf/tests/rdfsink/Makefile.in b/mozilla/rdf/tests/rdfsink/Makefile.in index 108e6eaf6a1..fbed60fe8fc 100644 --- a/mozilla/rdf/tests/rdfsink/Makefile.in +++ b/mozilla/rdf/tests/rdfsink/Makefile.in @@ -30,7 +30,7 @@ PROGRAM = rdfsink CPPSRCS = rdfsink.cpp LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/uriloader/build/Makefile.in b/mozilla/uriloader/build/Makefile.in index a799b4e8267..20fdb36d59d 100644 --- a/mozilla/uriloader/build/Makefile.in +++ b/mozilla/uriloader/build/Makefile.in @@ -42,7 +42,7 @@ EXTRA_DSO_LDOPTS = \ $(MKSHLIB_UNFORCE_ALL) \ -L$(DIST)/lib \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/webshell/embed/gtk/lib/Makefile.in b/mozilla/webshell/embed/gtk/lib/Makefile.in index 651788b03bf..cb4535cd65b 100644 --- a/mozilla/webshell/embed/gtk/lib/Makefile.in +++ b/mozilla/webshell/embed/gtk/lib/Makefile.in @@ -94,7 +94,7 @@ MOZILLA_INCLUDES = -I@MOZILLA_DIR@/include -I@NSPR_DIR@/include NULL = NSPR_LIBS = -L@NSPR_DIR@/lib -lplds$(NSPR_VERSION) -lplc$(NSPR_VERSION) -lnspr$(NSPR_VERSION) @LIBPTHREAD@ -BASE_LIBS = -lmozjs -lxpcom $(NULL) +BASE_LIBS = -lmozjs $(XPCOM_LIBS) $(NULL) GECKO_LIBS = -lraptorgfx $(NULL) diff --git a/mozilla/webshell/embed/xlib/gtk/Makefile.in b/mozilla/webshell/embed/xlib/gtk/Makefile.in index 498980fc066..6c0f2c993d2 100644 --- a/mozilla/webshell/embed/xlib/gtk/Makefile.in +++ b/mozilla/webshell/embed/xlib/gtk/Makefile.in @@ -38,7 +38,7 @@ LIBS = \ $(MOZ_TIMER_LIBS) \ $(NETLIB_LIBS) \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(JSJ_LIB) \ $(NSPR_LIBS) \ $(MOZ_GTK_LDFLAGS) -lxlibrgb \ diff --git a/mozilla/webshell/embed/xlib/motif/Makefile.in b/mozilla/webshell/embed/xlib/motif/Makefile.in index 8173c4d8249..7b1e9dcbf7d 100644 --- a/mozilla/webshell/embed/xlib/motif/Makefile.in +++ b/mozilla/webshell/embed/xlib/motif/Makefile.in @@ -40,7 +40,7 @@ LIBS = \ $(MOZ_TIMER_LIBS) \ $(NETLIB_LIBS) \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(JSJ_LIB) \ $(NSPR_LIBS) \ $(MOZ_MOTIF_LDFLAGS) -lxlibrgb \ diff --git a/mozilla/webshell/embed/xlib/qt/Makefile.in b/mozilla/webshell/embed/xlib/qt/Makefile.in index ec7cb84d72d..4291a58509c 100644 --- a/mozilla/webshell/embed/xlib/qt/Makefile.in +++ b/mozilla/webshell/embed/xlib/qt/Makefile.in @@ -47,7 +47,7 @@ LIBS = \ $(MOZ_TIMER_LIBS) \ $(NETLIB_LIBS) \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(JSJ_LIB) \ $(NSPR_LIBS) \ $(MOZ_QT_LDFLAGS) -lxlibrgb \ diff --git a/mozilla/webshell/embed/xlib/xt/Makefile.in b/mozilla/webshell/embed/xlib/xt/Makefile.in index 0525fefe9cd..1102ef387e9 100644 --- a/mozilla/webshell/embed/xlib/xt/Makefile.in +++ b/mozilla/webshell/embed/xlib/xt/Makefile.in @@ -39,7 +39,7 @@ LIBS = \ $(MOZ_TIMER_LIBS) \ $(NETLIB_LIBS) \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(JSJ_LIB) \ $(NSPR_LIBS) \ $(MOZ_MOTIF_LDFLAGS) -lxlibrgb \ diff --git a/mozilla/webshell/tests/viewer/Makefile.in b/mozilla/webshell/tests/viewer/Makefile.in index 3140c5ee945..4e6cbdfd6ac 100644 --- a/mozilla/webshell/tests/viewer/Makefile.in +++ b/mozilla/webshell/tests/viewer/Makefile.in @@ -103,7 +103,7 @@ endif XP_DIST_LIBS = \ -lraptorgfx \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(JSJ_LIB) \ $(NULL) @@ -135,8 +135,10 @@ QT_LIBS = -lviewer_qt_s $(XP_LIBS) $(MOZ_QT_LDFLAGS) XLIB_LIBS = -lviewer_xlib_s $(XP_LIBS) $(MOZ_XLIB_LDFLAGS) GTK_LIBS = -lviewer_gtk_s -lgtksuperwin $(XP_LIBS) $(MOZ_GTK_LDFLAGS) +XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS)) + EXTRA_DEPS = \ - $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \ + $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s.a))) \ $(UNIX_VIEWER_TK_LIBS) \ $(XP_NS_UNDERBAR_CRAP) \ $(NULL) diff --git a/mozilla/widget/src/rhapsody/Makefile.in b/mozilla/widget/src/rhapsody/Makefile.in index 4e7344b4208..a313cb80ab8 100644 --- a/mozilla/widget/src/rhapsody/Makefile.in +++ b/mozilla/widget/src/rhapsody/Makefile.in @@ -33,7 +33,7 @@ REQUIRES = util img xpcom raptor netlib CPPSRCS = nsObject.cpp -EXTRA_DSO_LDOPTS = -L$(DIST)/bin -lxpcom $(NSPR_LIBS) +EXTRA_DSO_LDOPTS = -L$(DIST)/bin $(XPCOM_LIBS) $(NSPR_LIBS) include $(topsrcdir)/config/rules.mk diff --git a/mozilla/widget/tests/scribble/Makefile.in b/mozilla/widget/tests/scribble/Makefile.in index 5789ad46c2d..8e3cc943c71 100644 --- a/mozilla/widget/tests/scribble/Makefile.in +++ b/mozilla/widget/tests/scribble/Makefile.in @@ -36,7 +36,7 @@ CPPSRCS = \ LIBS = \ $(MOZ_WIDGET_SUPPORT_LIBS) \ $(MOZ_TIMER_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ -lraptorgfx \ $(NSPR_LIBS) \ diff --git a/mozilla/widget/tests/widget/Makefile.in b/mozilla/widget/tests/widget/Makefile.in index c022782993b..3cd9a924974 100644 --- a/mozilla/widget/tests/widget/Makefile.in +++ b/mozilla/widget/tests/widget/Makefile.in @@ -36,7 +36,7 @@ CPPSRCS = \ LIBS = \ $(MOZ_TIMER_LIBS) \ $(MOZ_WIDGET_SUPPORT_LIBS) \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ -lraptorgfx \ $(NSPR_LIBS) \ diff --git a/mozilla/xpcom/base/Makefile.in b/mozilla/xpcom/base/Makefile.in index 219cceee543..22fce8284e1 100644 --- a/mozilla/xpcom/base/Makefile.in +++ b/mozilla/xpcom/base/Makefile.in @@ -74,7 +74,7 @@ XPIDLSRCS = \ $(NULL) ifdef GC_LEAK_DETECTOR -XPIDLSRCS = nsILeakDetector.idl +XPIDLSRCS += nsILeakDetector.idl endif EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) diff --git a/mozilla/xpcom/proxy/tests/Makefile.in b/mozilla/xpcom/proxy/tests/Makefile.in index f04153e4374..64259e5494d 100644 --- a/mozilla/xpcom/proxy/tests/Makefile.in +++ b/mozilla/xpcom/proxy/tests/Makefile.in @@ -38,7 +38,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s endif LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in index c957aab9060..26983ca8cf4 100644 --- a/mozilla/xpcom/reflect/xptcall/tests/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/tests/Makefile.in @@ -36,9 +36,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s endif LIBS = \ - -L$(DIST)/bin \ - -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in index 68222d68e43..5b479aa396f 100644 --- a/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in +++ b/mozilla/xpcom/reflect/xptinfo/tests/Makefile.in @@ -37,9 +37,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s endif LIBS = \ - -L$(DIST)/bin \ - -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index b6bd2f05077..f876f5b8ad1 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -71,7 +71,7 @@ endif LIBS += \ $(MOZ_TIMER_LIBS) \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(TK_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/xpcom/tools/registry/Makefile.in b/mozilla/xpcom/tools/registry/Makefile.in index 7172663926a..9f359c7bec4 100644 --- a/mozilla/xpcom/tools/registry/Makefile.in +++ b/mozilla/xpcom/tools/registry/Makefile.in @@ -35,7 +35,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lmozreg_s endif LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(TK_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/xpcom/typelib/xpt/tests/Makefile.in b/mozilla/xpcom/typelib/xpt/tests/Makefile.in index 9a18910584a..c43d63d5b43 100644 --- a/mozilla/xpcom/typelib/xpt/tests/Makefile.in +++ b/mozilla/xpcom/typelib/xpt/tests/Makefile.in @@ -38,9 +38,7 @@ LOST_SYM_LIBS = -lxpcomds_s -lxptinfo -lmozreg_s endif LIBS = \ - -L$(DIST)/bin \ - -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(LOST_SYM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/bootstrap/Makefile.in b/mozilla/xpfe/bootstrap/Makefile.in index 01099de6c5f..c4abcf1e5d1 100644 --- a/mozilla/xpfe/bootstrap/Makefile.in +++ b/mozilla/xpfe/bootstrap/Makefile.in @@ -38,7 +38,7 @@ CPPSRCS = \ XP_DIST_LIBS = \ -lraptorgfx \ -lmozjs \ - -lxpcom \ + $(XPCOM_LIBS) \ $(OJI_LIBS) \ $(NULL) @@ -82,8 +82,10 @@ ifdef GC_LEAK_DETECTOR LIBS += -lboehm endif +XP_DIST_DEP_LIBS := $(filter-out -L$(DIST)/bin -L$(DIST)/lib, $(XP_DIST_LIBS)) + EXTRA_DEPS = \ - $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_LIBS:-l%_s=lib/lib%_s.a))) \ + $(addprefix $(DIST)/,$(patsubst -l%,bin/lib%$(DLL_SUFFIX),$(XP_DIST_DEP_LIBS:-l%_s=lib/lib%_s.a))) \ $(XP_NS_UNDERBAR_CRAP) \ $(NULL) diff --git a/mozilla/xpfe/components/bookmarks/src/Makefile.in b/mozilla/xpfe/components/bookmarks/src/Makefile.in index 201d76959e4..ab9271457aa 100644 --- a/mozilla/xpfe/components/bookmarks/src/Makefile.in +++ b/mozilla/xpfe/components/bookmarks/src/Makefile.in @@ -35,7 +35,7 @@ CPPSRCS = nsBookmarksService.cpp EXTRA_DSO_LDOPTS = \ $(MOZ_TIMER_LIBS) \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/directory/Makefile.in b/mozilla/xpfe/components/directory/Makefile.in index 18edab58593..f2cb9860f77 100644 --- a/mozilla/xpfe/components/directory/Makefile.in +++ b/mozilla/xpfe/components/directory/Makefile.in @@ -47,7 +47,7 @@ CHROME_L10N = locale/en-US/directory.dtd EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ -lmozjs \ $(NULL) diff --git a/mozilla/xpfe/components/find/src/Makefile.in b/mozilla/xpfe/components/find/src/Makefile.in index 6dfae200ba8..60d54364306 100644 --- a/mozilla/xpfe/components/find/src/Makefile.in +++ b/mozilla/xpfe/components/find/src/Makefile.in @@ -35,7 +35,7 @@ CPPSRCS = nsFindComponent.cpp EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/history/src/Makefile.in b/mozilla/xpfe/components/history/src/Makefile.in index baadb68568a..ad76b52d67c 100644 --- a/mozilla/xpfe/components/history/src/Makefile.in +++ b/mozilla/xpfe/components/history/src/Makefile.in @@ -36,7 +36,7 @@ CPPSRCS = nsGlobalHistory.cpp \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/regviewer/Makefile.in b/mozilla/xpfe/components/regviewer/Makefile.in index a95e9b7446a..d6a390c2990 100644 --- a/mozilla/xpfe/components/regviewer/Makefile.in +++ b/mozilla/xpfe/components/regviewer/Makefile.in @@ -47,7 +47,7 @@ CHROME_L10N = locale/en-US/regviewer.dtd EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/related/src/Makefile.in b/mozilla/xpfe/components/related/src/Makefile.in index 7edf4277054..b9e790dbf4e 100644 --- a/mozilla/xpfe/components/related/src/Makefile.in +++ b/mozilla/xpfe/components/related/src/Makefile.in @@ -34,7 +34,7 @@ CPPSRCS = nsRelatedLinksHandler.cpp EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/sample/src/Makefile.in b/mozilla/xpfe/components/sample/src/Makefile.in index 0fe10e13ab1..fb11022bb91 100644 --- a/mozilla/xpfe/components/sample/src/Makefile.in +++ b/mozilla/xpfe/components/sample/src/Makefile.in @@ -35,7 +35,7 @@ CPPSRCS = nsSampleAppShellComponent.cpp EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lnetlib \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/search/src/Makefile.in b/mozilla/xpfe/components/search/src/Makefile.in index c0121344ecd..4e10852a125 100755 --- a/mozilla/xpfe/components/search/src/Makefile.in +++ b/mozilla/xpfe/components/search/src/Makefile.in @@ -38,7 +38,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(MOZ_TIMER_LIBS) \ $(NSPR_LIBS) \ diff --git a/mozilla/xpfe/components/shistory/src/Makefile.in b/mozilla/xpfe/components/shistory/src/Makefile.in index 5caf54653de..7ab3642d709 100644 --- a/mozilla/xpfe/components/shistory/src/Makefile.in +++ b/mozilla/xpfe/components/shistory/src/Makefile.in @@ -39,7 +39,7 @@ CPPSRCS = nsSHEntry.cpp \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/timebomb/tools/Makefile.in b/mozilla/xpfe/components/timebomb/tools/Makefile.in index 9047026ccf4..ee2e716dc72 100644 --- a/mozilla/xpfe/components/timebomb/tools/Makefile.in +++ b/mozilla/xpfe/components/timebomb/tools/Makefile.in @@ -13,7 +13,7 @@ CPPSRCS = \ $(NULL) LIBS = \ - -lxpcom \ + $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/ucth/src/Makefile.in b/mozilla/xpfe/components/ucth/src/Makefile.in index b103c7fdd6e..dd3f7da1cc1 100644 --- a/mozilla/xpfe/components/ucth/src/Makefile.in +++ b/mozilla/xpfe/components/ucth/src/Makefile.in @@ -35,7 +35,7 @@ CPPSRCS = nsUnknownContentTypeHandler.cpp EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ -L$(DIST)/lib \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NSPR_LIBS) \ $(NULL) diff --git a/mozilla/xpfe/components/xfer/src/Makefile.in b/mozilla/xpfe/components/xfer/src/Makefile.in index 26329479814..a7b9e5d81f0 100644 --- a/mozilla/xpfe/components/xfer/src/Makefile.in +++ b/mozilla/xpfe/components/xfer/src/Makefile.in @@ -37,7 +37,7 @@ CPPSRCS = \ EXTRA_DSO_LDOPTS = \ -L$(DIST)/bin \ - -lxpcom \ + $(XPCOM_LIBS) \ -lmozjs \ $(NSPR_LIBS) \ $(NULL)