diff options
author | cls%seawood.org <devnull@localhost> | 2001-03-31 02:28:59 +0000 |
---|---|---|
committer | cls%seawood.org <devnull@localhost> | 2001-03-31 02:28:59 +0000 |
commit | c801a59fab3a6376832bf28b86a74cf58a786991 (patch) | |
tree | 2aa1484876cff48fe9471627d9131a7625898f78 | |
parent | 94dd5370b7f6f0a5e7a3157c83d2e073c05720b7 (diff) | |
download | nspr-hg-c801a59fab3a6376832bf28b86a74cf58a786991.tar.gz |
Clean up nspr client branch after autoconf landing.
Remove win16 & non-USE_AUTOCONF Makefile ifdefs.
Set RESOLVE_LINK_SYMBOLS for win32
Set LIBNSPR & LIBPLC in configure.in
Update PR_MD_CSRCS & PR_MD_ASFILES for non-tinderbox ports.
Remove USE_AUTOCONF ifdefs around needed platform specific idefs.
Bug #73919 r=bryner
-rw-r--r-- | config/autoconf.mk.in | 3 | ||||
-rw-r--r-- | config/config.mk | 121 | ||||
-rw-r--r-- | config/rules.mk | 58 | ||||
-rwxr-xr-x | configure | 257 | ||||
-rw-r--r-- | configure.in | 85 | ||||
-rw-r--r-- | lib/ds/Makefile.in | 61 | ||||
-rw-r--r-- | lib/libc/src/Makefile.in | 60 | ||||
-rw-r--r-- | lib/msgc/src/Makefile.in | 60 | ||||
-rw-r--r-- | lib/prstreams/Makefile.in | 56 | ||||
-rw-r--r-- | pr/include/md/Makefile.in | 140 | ||||
-rw-r--r-- | pr/src/Makefile.in | 112 | ||||
-rw-r--r-- | pr/src/md/Makefile.in | 24 | ||||
-rw-r--r-- | pr/src/md/unix/Makefile.in | 254 | ||||
-rw-r--r-- | pr/src/md/unix/objs.mk | 223 | ||||
-rw-r--r-- | pr/src/memory/Makefile.in | 9 | ||||
-rw-r--r-- | pr/src/misc/Makefile.in | 15 | ||||
-rw-r--r-- | pr/src/threads/Makefile.in | 9 | ||||
-rw-r--r-- | pr/tests/Makefile.in | 91 |
18 files changed, 301 insertions, 1337 deletions
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 72e0ba14..46dbc8a4 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -17,6 +17,9 @@ DLL_SUFFIX = @DLL_SUFFIX@ MOD_VERSION = @NSPR_VERSION@ MOD_NAME = @NSPR_MODNAME@ +LIBNSPR = @LIBNSPR@ +LIBPLC = @LIBPLC@ + CROSS_COMPILE = @CROSS_COMPILE@ BUILD_OPT = @MOZ_OPTIMIZE@ diff --git a/config/config.mk b/config/config.mk index 6828298f..4cc92889 100644 --- a/config/config.mk +++ b/config/config.mk @@ -40,8 +40,6 @@ ifndef srcdir srcdir=. endif -ifdef USE_AUTOCONF - NFSPWD = $(MOD_DEPTH)/config/nfspwd CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\ @@ -85,9 +83,7 @@ endif GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*) -ifdef USE_AUTOCONF DIST_GARBAGE += Makefile -endif DEFINES += -DFORCE_PR_LOG @@ -107,108 +103,6 @@ ifeq ($(USE_IPV6),1) DEFINES += -D_PR_INET6 endif -else # ! USE_AUTOCONF - -ifndef NSPR_MY_CONFIG_MK -NSPR_MY_CONFIG_MK = $(MOD_DEPTH)/config/my_config.mk -endif - -# -# The variable definitions in this file are used to -# override variable values set by NSPR's build system. -# This file, if present, is included at the end of config.mk. -# -# For example: -# -# DIST=/usr/local/nspr -# -ifndef NSPR_MY_OVERRIDES_MK -NSPR_MY_OVERRIDES_MK = $(MOD_DEPTH)/config/my_overrides.mk -endif - --include $(NSPR_MY_CONFIG_MK) - -include $(MOD_DEPTH)/config/module.df - -include $(MOD_DEPTH)/config/arch.mk - -ifndef NSDEPTH -NSDEPTH = $(MOD_DEPTH)/.. -endif - -# -# Default command macros; can be overridden in <arch>.mk. -# -# XXX FIXME: I removed CCF and LINKEXE. -AS = $(CC) -ASFLAGS = $(CFLAGS) -PURIFY = purify $(PURIFYOPTIONS) -LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) -NFSPWD = $(MOD_DEPTH)/config/nfspwd - -CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\ - $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) -CCCFLAGS = $(CCC_ONLY_FLAGS) $(OPTIMIZER) $(OS_CFLAGS)\ - $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) -# For purify -NOMD_CFLAGS = $(CC_ONLY_FLAGS) $(OPTIMIZER) $(NOMD_OS_CFLAGS)\ - $(XP_DEFINE) $(DEFINES) $(INCLUDES) $(XCFLAGS) - -include $(MOD_DEPTH)/config/$(OS_TARGET).mk - -# Figure out where the binary code lives. -BUILD = $(OBJDIR_NAME) -OBJDIR = $(OBJDIR_NAME) -DIST = $(NSDEPTH)/dist/$(OBJDIR_NAME) -ifeq ($(MOZ_BITS),16) -MOZ_INCL = $(NSDEPTH)/dist/public/win16 -MOZ_DIST = $(NSDEPTH)/dist/WIN16D_D.OBJ -endif - -# if not using autoconf, set these values accordingly -prefix = $(DIST) -exec_prefix = $(prefix) -bindir = $(prefix)/bin -includedir = $(prefix)/include -libdir = $(prefix)/lib - -VPATH = $(OBJDIR) -DEPENDENCIES = $(OBJDIR)/.md - -ifdef BUILD_DEBUG_GC -DEFINES += -DDEBUG_GC -endif - -GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*) - -#################################################################### -# -# The NSPR-specific configuration -# -#################################################################### - -OS_CFLAGS += -DFORCE_PR_LOG - -ifeq ($(_PR_NO_CLOCK_TIMER),1) -OS_CFLAGS += -D_PR_NO_CLOCK_TIMER -endif - -ifeq ($(USE_PTHREADS), 1) -OS_CFLAGS += -D_PR_PTHREADS -UHAVE_CVAR_BUILT_ON_SEM -endif - -ifeq ($(PTHREADS_USER), 1) -OS_CFLAGS += -DPTHREADS_USER -UHAVE_CVAR_BUILT_ON_SEM -endif - -ifeq ($(USE_IPV6),1) -OS_CFLAGS += -D_PR_INET6 -endif - -ifdef GC_LEAK_DETECTOR -OS_CFLAGS += -DGC_LEAK_DETECTOR -endif - #################################################################### # # Configuration for the release process @@ -229,6 +123,17 @@ RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib --include $(NSPR_MY_OVERRIDES_MK) +# +# The variable definitions in this file are used to +# override variable values set by NSPR's build system. +# This file, if present, is included at the end of config.mk. +# +# For example: +# +# DIST=/usr/local/nspr +# +ifndef NSPR_MY_OVERRIDES_MK +NSPR_MY_OVERRIDES_MK = $(MOD_DEPTH)/config/my_overrides.mk +endif -endif # USE_AUTOCONF +-include $(NSPR_MY_OVERRIDES_MK) diff --git a/config/rules.mk b/config/rules.mk index 25d33c45..20cd44d3 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -89,7 +89,7 @@ ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) # Win95, Win16, and OS/2 require library names conforming to the 8.3 rule. # other platforms do not. # -ifeq (,$(filter-out WIN95 WIN16 OS2,$(OS_TARGET))) +ifeq (,$(filter-out WIN95 OS2,$(OS_TARGET))) LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) @@ -132,25 +132,9 @@ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \ $(addprefix $(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX))) endif -ifeq ($(OS_TARGET), WIN16) - comma := , - empty := - space := $(empty) $(empty) - W16OBJS = $(subst $(space),$(comma)$(space),$(strip $(OBJS))) - W16TEMP =$(OS_LIBS) $(EXTRA_LIBS) - ifeq ($(strip $(W16TEMP)),) - W16LIBS = - else - W16LIBS = library $(subst $(space),$(comma)$(space),$(strip $(W16TEMP))) - endif - W16DEF = $(notdir $(basename $(SHARED_LIBRARY))).DEF -endif - ifeq ($(OS_ARCH), WINNT) -ifneq ($(OS_TARGET), WIN16) OBJS += $(RES) endif -endif ifeq ($(MOZ_OS2_TOOLS),VACPP) EXTRA_LIBS := $(patsubst -l%,$(DIST)/lib/%.$(LIB_SUFFIX),$(EXTRA_LIBS)) @@ -281,19 +265,10 @@ $(LIBRARY): $(OBJS) ifeq ($(MOZ_OS2_TOOLS),VACPP) $(AR) $(subst /,\\,$(OBJS)) $(AR_FLAGS) else -ifdef USE_AUTOCONF $(AR) $(AR_FLAGS) $(OBJS) $(AR_EXTRA_ARGS) -else - $(AR) $(OBJS) $(AR_EXTRA_ARGS) -endif # USE_AUTOCONF endif $(RANLIB) $@ -ifeq ($(OS_TARGET), WIN16) -$(IMPORT_LIBRARY): $(SHARED_LIBRARY) - wlib $(OS_LIB_FLAGS) $@ +$(SHARED_LIBRARY) -endif - ifeq ($(OS_TARGET), OS2) $(IMPORT_LIBRARY): $(SHARED_LIBRARY) $(IMPLIB) $@ $(SHARED_LIBRARY).def @@ -312,25 +287,7 @@ ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -bM:SRE -bnoentry $(OS_LIBS) $(EXTRA_LIBS) else # AIX 4.1 ifeq ($(OS_ARCH), WINNT) -ifeq ($(OS_TARGET), WIN16) - echo system windows dll initinstance >w16link - echo option map >>w16link - echo option oneautodata >>w16link - echo option heapsize=32K >>w16link - echo option $(OS_DLL_OPTION) >>w16link - echo debug $(DEBUGTYPE) all >>w16link - echo name $@ >>w16link - echo file >>w16link - echo $(W16OBJS) >>w16link - echo $(W16IMPORTS) >>w16link - echo $(W16LIBS) >>w16link - echo $(W16_EXPORTS) >>w16link - echo libfile libentry >>w16link - $(LINK) @w16link. - rm w16link -else # WIN16 - $(LINK_DLL) -MAP $(DLLBASE) $(OS_LIBS) $(EXTRA_LIBS) $(OBJS) -endif # WINNT + $(LINK_DLL) -MAP $(DLLBASE) $(DLL_LIBS) $(EXTRA_LIBS) $(OBJS) else ifeq ($(OS_ARCH),OS2) # append ( >> ) doesn't seem to be working under OS/2 gmake. Run through OS/2 shell instead. @@ -350,11 +307,7 @@ ifeq ($(OS_TARGET), OpenVMS) $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OBJDIR)/VMSuni.opt @echo "`translate $@`" > $(@:.$(DLL_SUFFIX)=.vms) else # OpenVMS -ifdef USE_AUTOCONF $(MKSHLIB) $(OBJS) $(EXTRA_LIBS) -else - $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(OS_LIBS) -endif # USE_AUTOCONF endif # OpenVMS endif # OS2 endif # WINNT @@ -394,14 +347,7 @@ WCCFLAGS3 = $(subst -D,-d,$(WCCFLAGS2)) $(OBJDIR)/%.$(OBJ_SUFFIX): %.c @$(MAKE_OBJDIR) ifeq ($(OS_ARCH), WINNT) -ifeq ($(OS_TARGET), WIN16) -# $(MOD_DEPTH)/config/w16opt $(WCCFLAGS3) - echo $(WCCFLAGS3) >w16wccf - $(CC) -zq -fo$(OBJDIR)\\$*.$(OBJ_SUFFIX) @w16wccf $*.c - rm w16wccf -else $(CC) -Fo$@ -c $(CFLAGS) $< -endif else ifeq ($(MOZ_OS2_TOOLS),VACPP) $(CC) -Fo$@ -c $(CFLAGS) $< @@ -690,6 +690,8 @@ OBJDIR=. OBJDIR_NAME=. NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' NOSUCHFILE=/no-such-file +LIBNSPR='-L$(libdir) -lnspr$(MOD_VERSION)' +LIBPLC='-L$(libdir) -lplc$(MOD_VERSION)' RESOLVE_LINK_SYMBOLS= @@ -821,7 +823,7 @@ if test -z "$SKIP_PATH_CHECKS"; then # Extract the first word of "$WHOAMI whoami", so it can be a program name with args. set dummy $WHOAMI whoami; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:825: checking for $ac_word" >&5 +echo "configure:827: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -886,14 +888,14 @@ if test "$target" != "$host"; then _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 -echo "configure:890: checking for $host compiler" >&5 +echo "configure:892: checking for $host compiler" >&5 if test -z "$HOST_CC"; then for ac_prog in gcc cc /usr/ucb/cc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:897: checking for $ac_word" >&5 +echo "configure:899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -940,16 +942,16 @@ test -n "$HOST_CC" || HOST_CC="""" LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:944: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:946: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <<EOF -#line 946 "configure" +#line 948 "configure" #include "confdefs.h" int main() { return(0); ; return 0; } EOF -if { (eval echo configure:953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_host_cc_works=1 echo "$ac_t""yes" 1>&6 else @@ -970,7 +972,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:974: checking for $ac_word" >&5 +echo "configure:976: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1005,7 +1007,7 @@ test -n "$CC" || CC="echo" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1009: checking for $ac_word" >&5 +echo "configure:1011: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1035,7 +1037,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1039: checking for $ac_word" >&5 +echo "configure:1041: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1086,7 +1088,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1090: checking for $ac_word" >&5 +echo "configure:1092: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1118,7 +1120,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1122: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1124: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1129,12 +1131,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1133 "configure" +#line 1135 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1160,12 +1162,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1164: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1166: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1169: checking whether we are using GNU C" >&5 +echo "configure:1171: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1174,7 +1176,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1193,7 +1195,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1197: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1199: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1230,7 +1232,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1234: checking for $ac_word" >&5 +echo "configure:1236: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1267,7 +1269,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1271: checking for $ac_word" >&5 +echo "configure:1273: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1299,7 +1301,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1303: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1305: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1310,12 +1312,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1314 "configure" +#line 1316 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1341,12 +1343,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1345: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1347: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1350: checking whether we are using GNU C++" >&5 +echo "configure:1352: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1355,7 +1357,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1374,7 +1376,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1378: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1380: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1411,7 +1413,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1415: checking for $ac_word" >&5 +echo "configure:1417: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1448,7 +1450,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1452: checking for $ac_word" >&5 +echo "configure:1454: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1485,7 +1487,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1489: checking for $ac_word" >&5 +echo "configure:1491: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1522,7 +1524,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1526: checking for $ac_word" >&5 +echo "configure:1528: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1559,7 +1561,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1563: checking for $ac_word" >&5 +echo "configure:1565: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1596,7 +1598,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1600: checking for $ac_word" >&5 +echo "configure:1602: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1633,7 +1635,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1637: checking for $ac_word" >&5 +echo "configure:1639: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1671,7 +1673,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1675: checking for $ac_word" >&5 +echo "configure:1677: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1703,7 +1705,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1707: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1709: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1714,12 +1716,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1718 "configure" +#line 1720 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1745,12 +1747,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1749: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1751: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1754: checking whether we are using GNU C++" >&5 +echo "configure:1756: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1759,7 +1761,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1778,7 +1780,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1782: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1784: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1815,7 +1817,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1819: checking for $ac_word" >&5 +echo "configure:1821: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1845,7 +1847,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1849: checking for $ac_word" >&5 +echo "configure:1851: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1896,7 +1898,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1900: checking for $ac_word" >&5 +echo "configure:1902: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1928,7 +1930,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1932: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1934: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1939,12 +1941,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1943 "configure" +#line 1945 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1970,12 +1972,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1974: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1976: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1979: checking whether we are using GNU C" >&5 +echo "configure:1981: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1984,7 +1986,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2003,7 +2005,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2007: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2009: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2038,7 +2040,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2042: checking for $ac_word" >&5 +echo "configure:2044: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2070,7 +2072,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2074: checking for $ac_word" >&5 +echo "configure:2076: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2111,7 +2113,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2115: checking for $ac_word" >&5 +echo "configure:2117: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2152,7 +2154,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2156: checking for $ac_word" >&5 +echo "configure:2158: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2193,7 +2195,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2197: checking for $ac_word" >&5 +echo "configure:2199: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2234,7 +2236,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2238: checking for $ac_word" >&5 +echo "configure:2240: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2275,7 +2277,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2279: checking for $ac_word" >&5 +echo "configure:2281: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2341,7 +2343,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2345: checking for $ac_word" >&5 +echo "configure:2347: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2561,7 +2563,6 @@ EOF EOF DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall' - OS_LIBS="-lc_r $OS_LIBS" case "${target_os}" in aix3.2*) USE_NSPR_THREADS=1 @@ -2605,6 +2606,7 @@ EOF DSO_LDOPTS= USE_PTHREADS=1 AIX_LINK_OPTS='-bnso -berok' + LIBNSPR='-L$(libdir) -lnspr$(MOD_VERSION)_shr' ;; aix4.3*) cat >> confdefs.h <<\EOF @@ -2926,6 +2928,7 @@ EOF DLL_SUFFIX=sl DSO_LDOPTS='-b +h $(notdir $@)' PR_MD_CSRCS=hpux.c + PR_MD_ASFILES=os_HPUX.s if test -n "$USE_64"; then MDCPUCFG_H=_hpux64.cfg else @@ -3283,6 +3286,7 @@ EOF EOF PR_MD_ARCH_DIR=windows + RESOLVE_LINK_SYMBOLS=1 if test -n "$GNU_CC"; then cat >> confdefs.h <<\EOF @@ -3318,7 +3322,7 @@ EOF OPTIMIZER="$OPTIMIZER -Z7" DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV" LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" - fi + fi else if test -n "$USE_DEBUG_RTL"; then CFLAGS="$CFLAGS -MDd" @@ -3329,6 +3333,7 @@ EOF DLLFLAGS='-DEBUG -DEBUGTYPE:CV -OUT:"$@"' if test -n "$GLOWCODE"; then DLLFLAGS='-DEBUG -DEBUGTYPE:both -INCLUDE:_GlowCode -OUT:"$@"' + DLL_LIBS='$(GLOWDIR)/glowcode.lib' fi OBJDIR_TAG=_DBG LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" @@ -3337,7 +3342,16 @@ EOF DLLFLAGS="$DLLFLAGS -PROFILE -MAP" fi fi - fi + + if test "$OS_TARGET" = "WINNT"; then + CFLAGS="$CFLAGS -GT" + LIBNSPR='$(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)' + else + LIBNSPR='$(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)' + fi + fi # GNU_CC if test -n "$USE_STATIC_TLS"; then cat >> confdefs.h <<\EOF @@ -3347,9 +3361,6 @@ EOF fi if test "$OS_TARGET" = "WINNT"; then - if test -z "$GNU_CC"; then - CFLAGS="$CFLAGS -GT" - fi if test "$CPU_ARCH" = "x86"; then CFLAGS="$CFLAGS -G5" fi @@ -3467,6 +3478,8 @@ EOF CXXFLAGS="$CXXFLAGS -fPIC -Wall -pipe" DSO_LDOPTS=-G fi + MDCPUCFG_H=_ncr.cfg + PR_MD_CSRCS=ncr.c ;; mips-nec-sysv*) @@ -3497,6 +3510,8 @@ EOF fi OS_LIBS="$OS_LIBS -lsocket -lnsl -ldl" DSO_LDOPTS=-G + MDCPUCFG_H=_nec.cfg + PR_MD_CSRCS=nec.c ;; *-netbsd*) @@ -3531,6 +3546,8 @@ EOF if test "$LIBRUNPATH"; then DSO_LDOPTS="$DSO_LDOPTS -R$(LIBRUNPATH)" fi + MDCPUCFG_H=_netbsd.cfg + PR_MD_CSRCS=netbsd.c ;; mips-sony-newsos*) @@ -3566,6 +3583,8 @@ EOF CFLAGS="$CFLAGS -Xa -fullwarn" CXXFLAGS="$CXXFLAGS -Xa -fullwarn" DSO_LDOPTS=-G + MDCPUCFG_H=_sony.cfg + PR_MD_CSRCS=sony.c ;; *-nextstep*|*-openstep*) @@ -3589,6 +3608,8 @@ EOF CXXFLAGS="$CXXFLAGS -Wall -fno-common -pipe -traditional-cpp -posix" USE_NSPR_THREADS=1 DLL_SUFFIX=dylib + MDCPUCFG_H=_nextstep.cfg + PR_MD_CSRCS=nextstep.c ;; @@ -3722,6 +3743,8 @@ EOF fi DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(notdir $@)' + MDCPUCFG_H=_osf1.cfg + PR_MD_CSRCS=osf1.c ;; *-qnx*) @@ -3738,6 +3761,8 @@ EOF EOF USE_NSPR_THREADS=1 + MDCPUCFG_H=_qnx.cfg + PR_MD_CSRCS=qnx.c ;; *-rhapsody*) @@ -3772,6 +3797,8 @@ EOF MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@' DLL_SUFFIX=dylib USE_PTHREADS=1 + MDCPUCFG_H=_rhapsody.cfg + PR_MD_CSRCS=rhapsody.c ;; *-*-sco*) @@ -3804,6 +3831,8 @@ EOF USE_NSPR_THREADS=1 CPU_ARCH=x86 DSO_LDOPTS='-b elf -G' + MDCPUCFG_H=_scoos.cfg + PR_MD_SRCS=scoos.c ;; *-sinix*) @@ -3864,6 +3893,11 @@ EOF OS_LIBS="$OS_LIBS -lsocket -lnsl -lresolv -ldl -lc" USE_NSPR_THREADS=1 + MDCPUCFG_H=_reliantunix.cfg + PR_MD_CSRCS=reliantunix.c + if test "${OS_ARCH}" = "mips"; then + PR_MD_ASFILES=os_ReliantUNIX.s + fi ;; *-sunos*) @@ -3884,6 +3918,12 @@ EOF DSO_LDOPTS= DSO_CFLAGS=-fPIC USE_NSPR_THREADS=1 + if test "$OS_RELEASE" = "4.1.3_U1"; then + _OPTIMIZE_FLAGS= + OS_LIBS="$OS_LIBS -lm" + fi + MDCPUCFG_H=_sunos4.cfg + PR_MD_CSRCS=sunos4.c ;; *-solaris*) @@ -4020,6 +4060,7 @@ EOF CC='$(NSDEPTH)/build/hcc cc' CXX='$(NSDEPTH)/build/hcpp CC' + MDCPUCFG_H=_unixware.cfg else cat >> confdefs.h <<\EOF #define _LARGEFILE64_SOURCE 1 @@ -4033,7 +4074,9 @@ EOF #define _PR_HAVE_SOCKADDR_LEN 1 EOF + MDCPUCFG_H=_unixware7.cfg fi + PR_MD_CSRCS=unixware.c DSO_LDOPTS=-G CPU_ARCH=x86 ;; @@ -4137,6 +4180,8 @@ EOF DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /nologo' EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /nologo' fi + LIBNSPR='$(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)' ;; esac @@ -4158,12 +4203,12 @@ fi if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4162: checking for dlopen" >&5 +echo "configure:4207: checking for dlopen" >&5 if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4167 "configure" +#line 4212 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dlopen(); below. */ @@ -4186,7 +4231,7 @@ dlopen(); ; return 0; } EOF -if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_dlopen=yes" else @@ -4205,7 +4250,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4209: checking for dlopen in -ldl" >&5 +echo "configure:4254: 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 @@ -4213,7 +4258,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4217 "configure" +#line 4262 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4224,7 +4269,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4273: \"$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 @@ -4251,7 +4296,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:4255: checking how to run the C preprocessor" >&5 +echo "configure:4300: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -4266,13 +4311,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 4270 "configure" +#line 4315 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4276: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4321: \"$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 : @@ -4283,13 +4328,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 4287 "configure" +#line 4332 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4338: \"$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 : @@ -4300,13 +4345,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 4304 "configure" +#line 4349 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4355: \"$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 : @@ -4332,13 +4377,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:4336: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4381: 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 <<EOF -#line 4342 "configure" +#line 4387 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -4356,7 +4401,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 4360 "configure" +#line 4405 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -4380,12 +4425,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4384: checking for $ac_func" >&5 +echo "configure:4429: 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 <<EOF -#line 4389 "configure" +#line 4434 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4408,7 +4453,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4457: \"$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 @@ -4439,7 +4484,7 @@ done echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4443: checking for pthread_create in -lpthreads" >&5 +echo "configure:4488: checking for pthread_create in -lpthreads" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4461,7 +4506,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4465: checking for pthread_create in -lpthread" >&5 +echo "configure:4510: checking for pthread_create in -lpthread" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4483,7 +4528,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4487: checking for pthread_create in -lc_r" >&5 +echo "configure:4532: checking for pthread_create in -lc_r" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4505,7 +4550,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:4509: checking for pthread_create in -lc" >&5 +echo "configure:4554: checking for pthread_create in -lc" >&5 echo " #include <pthread.h> void *foo(void *v) { int a = 1; } @@ -4655,7 +4700,7 @@ if test -n "$USE_PTHREADS"; 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:4659: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:4704: 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 @@ -4671,7 +4716,7 @@ echo "configure:4659: checking whether ${CC-cc} accepts -pthread" >&5 ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:4675: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:4720: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -4734,21 +4779,30 @@ EOF fi case "$target" in -*-aix4.1*) - if test -z "$USE_PTHREADS"; then - cat >> confdefs.h <<\EOF +*-aix*) + if test -n "$USE_NSPR_THREADS"; then + OS_LIBS="$OS_LIBS -lc" + else + OS_LIBS="$OS_LIBS -lc_r" + fi + case "$target_os" in + aix4.1*) + if test -z "$USE_PTHREADS"; then + cat >> confdefs.h <<\EOF #define AIX_RENAME_SELECT 1 EOF - fi - ;; -*-aix4.23*) - if test -z "$USE_NSPR_THREADS"; then - cat >> confdefs.h <<\EOF + fi + ;; + aix4.23*) + if test -z "$USE_NSPR_THREADS"; then + cat >> confdefs.h <<\EOF #define HAVE_POINTER_LOCALTIME_R 1 EOF - fi + fi + ;; + esac ;; *-bsdi*) if test -n "$USE_PTHREADS"; then @@ -4924,6 +4978,9 @@ fi + + + MAKEFILES=" Makefile config/Makefile @@ -5153,6 +5210,8 @@ s%@USE_BTHREADS@%$USE_BTHREADS%g s%@USE_USER_PTHREADS@%$USE_USER_PTHREADS%g s%@USE_NATIVE_THREADS@%$USE_NATIVE_THREADS%g s%@USE_NSPR_THREADS@%$USE_NSPR_THREADS%g +s%@LIBNSPR@%$LIBNSPR%g +s%@LIBPLC@%$LIBPLC%g s%@NSPR_VERSION@%$NSPR_VERSION%g s%@NSPR_MODNAME@%$NSPR_MODNAME%g s%@MDCPUCFG_H@%$MDCPUCFG_H%g diff --git a/configure.in b/configure.in index f9b3ee3a..2bfa8735 100644 --- a/configure.in +++ b/configure.in @@ -52,6 +52,8 @@ OBJDIR=. OBJDIR_NAME=. NSINSTALL='$(MOD_DEPTH)/config/$(OBJDIR_NAME)/nsinstall' NOSUCHFILE=/no-such-file +LIBNSPR='-L$(libdir) -lnspr$(MOD_VERSION)' +LIBPLC='-L$(libdir) -lplc$(MOD_VERSION)' dnl Link in libraries necessary to resolve all symbols for shared libs RESOLVE_LINK_SYMBOLS= @@ -481,7 +483,6 @@ case "$target" in AC_DEFINE(AIX) AC_DEFINE(SYSV) DSO_LDOPTS='-brtl -bM:SRE -bnoentry -bexpall' - OS_LIBS="-lc_r $OS_LIBS" case "${target_os}" in aix3.2*) USE_NSPR_THREADS=1 @@ -501,6 +502,7 @@ case "$target" in DSO_LDOPTS= USE_PTHREADS=1 AIX_LINK_OPTS='-bnso -berok' + LIBNSPR='-L$(libdir) -lnspr$(MOD_VERSION)_shr' ;; aix4.3*) AC_DEFINE(AIX_HAVE_ATOMIC_OP_H) @@ -672,6 +674,7 @@ case "$target" in DLL_SUFFIX=sl DSO_LDOPTS='-b +h $(notdir $@)' PR_MD_CSRCS=hpux.c + PR_MD_ASFILES=os_HPUX.s if test -n "$USE_64"; then MDCPUCFG_H=_hpux64.cfg else @@ -915,6 +918,7 @@ case "$target" in AC_DEFINE(XP_PC) AC_DEFINE(WIN32) PR_MD_ARCH_DIR=windows + RESOLVE_LINK_SYMBOLS=1 if test -n "$GNU_CC"; then AC_DEFINE(NONAMELESSUNION) @@ -947,7 +951,7 @@ case "$target" in OPTIMIZER="$OPTIMIZER -Z7" DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV" LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" - fi + fi else if test -n "$USE_DEBUG_RTL"; then CFLAGS="$CFLAGS -MDd" @@ -958,6 +962,7 @@ case "$target" in DLLFLAGS='-DEBUG -DEBUGTYPE:CV -OUT:"$@"' if test -n "$GLOWCODE"; then DLLFLAGS='-DEBUG -DEBUGTYPE:both -INCLUDE:_GlowCode -OUT:"$@"' + DLL_LIBS='$(GLOWDIR)/glowcode.lib' fi OBJDIR_TAG=_DBG LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" @@ -966,16 +971,22 @@ case "$target" in DLLFLAGS="$DLLFLAGS -PROFILE -MAP" fi fi - fi + + if test "$OS_TARGET" = "WINNT"; then + CFLAGS="$CFLAGS -GT" + LIBNSPR='$(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX)' + else + LIBNSPR='$(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)' + fi + fi # GNU_CC if test -n "$USE_STATIC_TLS"; then AC_DEFINE(_PR_USE_STATIC_TLS) fi if test "$OS_TARGET" = "WINNT"; then - if test -z "$GNU_CC"; then - CFLAGS="$CFLAGS -GT" - fi if test "$CPU_ARCH" = "x86"; then CFLAGS="$CFLAGS -G5" fi @@ -1054,6 +1065,8 @@ case "$target" in CXXFLAGS="$CXXFLAGS -fPIC -Wall -pipe" DSO_LDOPTS=-G fi + MDCPUCFG_H=_ncr.cfg + PR_MD_CSRCS=ncr.c ;; mips-nec-sysv*) @@ -1069,6 +1082,8 @@ mips-nec-sysv*) fi OS_LIBS="$OS_LIBS -lsocket -lnsl -ldl" DSO_LDOPTS=-G + MDCPUCFG_H=_nec.cfg + PR_MD_CSRCS=nec.c ;; *-netbsd*) @@ -1094,6 +1109,8 @@ mips-nec-sysv*) if test "$LIBRUNPATH"; then DSO_LDOPTS="$DSO_LDOPTS -R$(LIBRUNPATH)" fi + MDCPUCFG_H=_netbsd.cfg + PR_MD_CSRCS=netbsd.c ;; mips-sony-newsos*) @@ -1108,6 +1125,8 @@ mips-sony-newsos*) CFLAGS="$CFLAGS -Xa -fullwarn" CXXFLAGS="$CXXFLAGS -Xa -fullwarn" DSO_LDOPTS=-G + MDCPUCFG_H=_sony.cfg + PR_MD_CSRCS=sony.c ;; *-nextstep*|*-openstep*) @@ -1119,6 +1138,8 @@ mips-sony-newsos*) CXXFLAGS="$CXXFLAGS -Wall -fno-common -pipe -traditional-cpp -posix" USE_NSPR_THREADS=1 DLL_SUFFIX=dylib + MDCPUCFG_H=_nextstep.cfg + PR_MD_CSRCS=nextstep.c ;; @@ -1204,6 +1225,8 @@ mips-sony-newsos*) AC_DEFINE(OSF1_HAVE_MACHINE_BUILTINS_H) fi DSO_LDOPTS='-shared -all -expect_unresolved "*" -soname $(notdir $@)' + MDCPUCFG_H=_osf1.cfg + PR_MD_CSRCS=osf1.c ;; *-qnx*) @@ -1211,6 +1234,8 @@ mips-sony-newsos*) AC_DEFINE(QNX) AC_DEFINE(_PR_NEED_H_ERRNO) USE_NSPR_THREADS=1 + MDCPUCFG_H=_qnx.cfg + PR_MD_CSRCS=qnx.c ;; *-rhapsody*) @@ -1230,6 +1255,8 @@ mips-sony-newsos*) MKSHLIB='$(CC) -arch $(CPU_ARCH) $(DSO_LDOPTS) -o $@' DLL_SUFFIX=dylib USE_PTHREADS=1 + MDCPUCFG_H=_rhapsody.cfg + PR_MD_CSRCS=rhapsody.c ;; *-*-sco*) @@ -1244,6 +1271,8 @@ mips-sony-newsos*) USE_NSPR_THREADS=1 CPU_ARCH=x86 DSO_LDOPTS='-b elf -G' + MDCPUCFG_H=_scoos.cfg + PR_MD_SRCS=scoos.c ;; *-sinix*) @@ -1280,6 +1309,11 @@ mips-sony-newsos*) OS_LIBS="$OS_LIBS -lsocket -lnsl -lresolv -ldl -lc" USE_NSPR_THREADS=1 + MDCPUCFG_H=_reliantunix.cfg + PR_MD_CSRCS=reliantunix.c + if test "${OS_ARCH}" = "mips"; then + PR_MD_ASFILES=os_ReliantUNIX.s + fi ;; *-sunos*) @@ -1294,6 +1328,12 @@ mips-sony-newsos*) DSO_LDOPTS= DSO_CFLAGS=-fPIC USE_NSPR_THREADS=1 + if test "$OS_RELEASE" = "4.1.3_U1"; then + _OPTIMIZE_FLAGS= + OS_LIBS="$OS_LIBS -lm" + fi + MDCPUCFG_H=_sunos4.cfg + PR_MD_CSRCS=sunos4.c ;; *-solaris*) @@ -1379,11 +1419,14 @@ mips-sony-newsos*) AC_DEFINE(_PR_NO_LARGE_FILES) CC='$(NSDEPTH)/build/hcc cc' CXX='$(NSDEPTH)/build/hcpp CC' + MDCPUCFG_H=_unixware.cfg else AC_DEFINE(_LARGEFILE64_SOURCE) AC_DEFINE(_PR_HAVE_OFF64_T) AC_DEFINE(_PR_HAVE_SOCKADDR_LEN) + MDCPUCFG_H=_unixware7.cfg fi + PR_MD_CSRCS=unixware.c DSO_LDOPTS=-G CPU_ARCH=x86 ;; @@ -1457,6 +1500,8 @@ mips-sony-newsos*) DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /nologo' EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /nologo' fi + LIBNSPR='$(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)' + LIBPLC='$(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX)' ;; esac @@ -1748,15 +1793,24 @@ fi dnl Special thread exceptions case "$target" in -*-aix4.1*) - if test -z "$USE_PTHREADS"; then - AC_DEFINE(AIX_RENAME_SELECT) - fi - ;; -*-aix4.[23]*) - if test -z "$USE_NSPR_THREADS"; then - AC_DEFINE(HAVE_POINTER_LOCALTIME_R) +*-aix*) + if test -n "$USE_NSPR_THREADS"; then + OS_LIBS="$OS_LIBS -lc" + else + OS_LIBS="$OS_LIBS -lc_r" fi + case "$target_os" in + aix4.1*) + if test -z "$USE_PTHREADS"; then + AC_DEFINE(AIX_RENAME_SELECT) + fi + ;; + aix4.[23]*) + if test -z "$USE_NSPR_THREADS"; then + AC_DEFINE(HAVE_POINTER_LOCALTIME_R) + fi + ;; + esac ;; *-bsdi*) if test -n "$USE_PTHREADS"; then @@ -1857,6 +1911,9 @@ AC_SUBST(USE_USER_PTHREADS) AC_SUBST(USE_NATIVE_THREADS) AC_SUBST(USE_NSPR_THREADS) +AC_SUBST(LIBNSPR) +AC_SUBST(LIBPLC) + AC_SUBST(NSPR_VERSION) AC_SUBST(NSPR_MODNAME) AC_SUBST(MDCPUCFG_H) diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in index aa0887d3..6eea0f00 100644 --- a/lib/ds/Makefile.in +++ b/lib/ds/Makefile.in @@ -26,15 +26,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifndef USE_AUTOCONF -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif -endif #!USE_AUTOCONF - INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include CSRCS = \ @@ -52,62 +43,16 @@ HEADERS = \ HEADERS := $(addprefix $(srcdir)/, $(HEADERS)) ifeq ($(OS_ARCH), WINNT) -ifeq ($(OS_TARGET), WIN16) -# OS_CFLAGS = $(OS_EXE_CFLAGS) -EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) -else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/plds.res RESNAME=plds.rc OS_LIBS = user32.lib -ifeq ($(OS_TARGET),WIN95) -EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib -else -EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib -endif - -ifdef MOZ_DEBUG -ifdef GLOWCODE -EXTRA_LIBS += $(GLOWDIR)/glowcode.lib -endif -endif -endif - -ifndef USE_AUTOCONF - -ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) +endif # WINNT -else -ifeq ($(OS_ARCH), AIX) -ifeq ($(CLASSIC_NSPR),1) -OS_LIBS += -lc -else -OS_LIBS += -lc_r -endif -endif -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr -else -EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) -endif -endif -endif - -# On NCR and SCOOS, we can't link with extra libraries when -# we build a shared library. If we do so, the linker doesn't -# complain, but we would run into weird problems at run-time. -# Therefore on these platforms, we link just the .o files. -ifeq ($(OS_ARCH),NCR) -EXTRA_LIBS = -endif -ifeq ($(OS_ARCH),SCOOS) -EXTRA_LIBS = -endif -endif #!USE_AUTOCONF +EXTRA_LIBS = $(LIBNSPR) ifdef RESOLVE_LINK_SYMBOLS -EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) $(OS_LIBS) +EXTRA_LIBS += $(OS_LIBS) endif LIBRARY_NAME = plds diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in index 448b85fa..7400b99a 100644 --- a/lib/libc/src/Makefile.in +++ b/lib/libc/src/Makefile.in @@ -26,15 +26,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifndef USE_AUTOCONF -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif -endif #!USE_AUTOCONF - INCLUDES = -I$(includedir) CSRCS =\ @@ -60,60 +51,15 @@ LIBRARY_VERSION = $(MOD_VERSION) RELEASE_LIBS = $(TARGETS) ifeq ($(OS_ARCH),WINNT) -ifeq ($(OS_TARGET), WIN16) -EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib -else DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/plc.res RESNAME=plc.rc -ifeq ($(OS_TARGET),WIN95) -EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib -else -EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib -endif - -ifdef MOZ_DEBUG -ifdef GLOWCODE -EXTRA_LIBS += $(GLOWDIR)/glowcode.lib -endif -endif -endif - -ifndef USE_AUTOCONF - -ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) +endif # WINNT -else -ifeq ($(OS_ARCH), AIX) -ifeq ($(CLASSIC_NSPR),1) -OS_LIBS += -lc -else -OS_LIBS += -lc_r -endif -endif -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr -else -EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) -endif -endif -endif - -# On NCR and SCOOS, we can't link with extra libraries when -# we build a shared library. If we do so, the linker doesn't -# complain, but we would run into weird problems at run-time. -# Therefore on these platforms, we link just the .o files. -ifeq ($(OS_ARCH),NCR) -EXTRA_LIBS = -endif -ifeq ($(OS_ARCH),SCOOS) -EXTRA_LIBS = -endif -endif #!USE_AUTOCONF +EXTRA_LIBS = $(LIBNSPR) ifdef RESOLVE_LINK_SYMBOLS -EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) $(OS_LIBS) +EXTRA_LIBS += $(OS_LIBS) endif GARBAGE += $(TINC) diff --git a/lib/msgc/src/Makefile.in b/lib/msgc/src/Makefile.in index bb115e97..9960e4d8 100644 --- a/lib/msgc/src/Makefile.in +++ b/lib/msgc/src/Makefile.in @@ -26,23 +26,12 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - INCLUDES = -I$(includedir) -I../include CSRCS = prgcapi.c prmsgc.c ifeq ($(OS_ARCH),WINNT) -ifeq ($(OS_TARGET),WIN16) -CSRCS += win16gc.c -else CSRCS += win32gc.c -endif else ifeq ($(OS_ARCH),OS2) CSRCS += os2gc.c @@ -53,53 +42,18 @@ endif NSPR_VERSION = $(MOD_VERSION) +EXTRA_LIBS = $(LIBNSPR) + +ifdef RESOLVE_LINK_SYMBOLS +EXTRA_LIBS += $(OS_LIBS) +endif + ifeq ($(OS_ARCH), WINNT) -ifeq ($(OS_TARGET), WIN16) -EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).lib -else DLLBASE=/BASE:0x30000000 #RES=$(OBJDIR)/ds.res #RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc #OS_LIBS = user32.lib -EXTRA_LIBS = $(libdir)/libnspr$(NSPR_VERSION).lib - -ifdef MOZ_DEBUG -ifdef GLOWCODE -EXTRA_LIBS += $(GLOWDIR)/glowcode.lib -endif -endif -endif - -else -ifeq ($(MOZ_OS2_TOOLS),VACPP) -EXTRA_LIBS = $(libdir)/nspr$(NSPR_VERSION).$(LIB_SUFFIX) - -else -ifeq ($(OS_ARCH), AIX) -ifeq ($(CLASSIC_NSPR),1) -OS_LIBS += -lc -else -OS_LIBS += -lc_r -endif -endif -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION)_shr -else -EXTRA_LIBS = -L$(libdir) -lnspr$(NSPR_VERSION) -endif -endif -endif - -# On NCR and SCOOS, we can't link with extra libraries when -# we build a shared library. If we do so, the linker doesn't -# complain, but we would run into weird problems at run-time. -# Therefore on these platforms, we link just the .o files. -ifeq ($(OS_ARCH),NCR) -EXTRA_LIBS = -endif -ifeq ($(OS_ARCH),SCOOS) -EXTRA_LIBS = -endif +endif # WINNT LIBRARY_NAME = msgc LIBRARY_VERSION = $(MOD_VERSION) diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in index 72151664..57ac02c8 100644 --- a/lib/prstreams/Makefile.in +++ b/lib/prstreams/Makefile.in @@ -26,7 +26,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifndef USE_AUTOCONF # Disable optimization of the nspr on SunOS4.1.3 ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_RELEASE),4.1.3_U1) @@ -53,7 +52,6 @@ endif ifeq ($(OS_ARCH), BeOS) CFLAGS += -frtti -fexceptions endif -endif # !USE_AUTOCONF INCLUDES = -I$(includedir) @@ -69,29 +67,20 @@ CXXSRCS = \ OBJS = $(addprefix $(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX)) $(CXXSRCS:.cpp=.$(OBJ_SUFFIX))) -ifndef USE_AUTOCONF +LIBRARY_NAME = prstrms +LIBRARY_VERSION = $(MOD_VERSION) + +RELEASE_HEADERS = $(HEADERS) +RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) +RELEASE_LIBS = $(TARGETS) + +include $(topsrcdir)/config/rules.mk + ifeq ($(OS_ARCH), WINNT) - ifeq ($(OS_TARGET), WIN16) - EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib - else - DLLBASE=/BASE:0x30000000 + DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/prstrms.res RESNAME=prstrms.rc - OS_LIBS = user32.lib - ifeq ($(OS_TARGET), WIN95) - EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).lib - else - EXTRA_LIBS = $(libdir)/libnspr$(MOD_VERSION).lib - endif - endif else - ifeq ($(OS_ARCH),OS2) - ifeq ($(MOZ_OS2_TOOLS),VACPP) - EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) - else - EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) -lstdcpp - endif - else ifeq ($(OS_ARCH), AIX) ifeq ($(OS_RELEASE), 4.1) ifeq ($(CLASSIC_NSPR),1) @@ -110,12 +99,6 @@ else OS_LIBS += -ldl endif endif - ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) - EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION)_shr - else - EXTRA_LIBS = -L$(libdir) -lnspr$(MOD_VERSION) - endif -endif endif # On NCR and SCOOS, we can't link with extra libraries when @@ -135,20 +118,17 @@ endif ifeq ($(OS_ARCH), UNIXWARE) OS_LIBS += -lC endif -endif # !USE_AUTOCONF -ifdef RESOLVE_LINK_SYMBOLS -EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) +ifeq ($(OS_ARCH),WINNT) +OS_LIBS += user32.lib endif -LIBRARY_NAME = prstrms -LIBRARY_VERSION = $(MOD_VERSION) +EXTRA_LIBS = $(LIBNSPR) -RELEASE_HEADERS = $(HEADERS) -RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR) -RELEASE_LIBS = $(TARGETS) +ifdef RESOLVE_LINK_SYMBOLS +EXTRA_LIBS += $(OS_LIBS) +endif -include $(topsrcdir)/config/rules.mk # # Version information generation (begin) @@ -182,9 +162,9 @@ ifeq ($(OS_ARCH), WINNT) $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $< else ifeq ($(MOZ_OS2_TOOLS), VACPP) - $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c + $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $< else - $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c + $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $< endif endif # diff --git a/pr/include/md/Makefile.in b/pr/include/md/Makefile.in index ed7a7a8a..5f02cbd2 100644 --- a/pr/include/md/Makefile.in +++ b/pr/include/md/Makefile.in @@ -29,146 +29,6 @@ CONFIGS = $(wildcard $(srcdir)/*.cfg) include $(topsrcdir)/config/rules.mk -ifndef USE_AUTOCONF - -ifeq ($(OS_ARCH),IRIX) -ifeq ($(USE_64), 1) -MDCPUCFG_H = _irix64.cfg -else -MDCPUCFG_H = _irix32.cfg -endif -endif - -ifeq ($(OS_ARCH),WINNT) -ifeq ($(OS_TARGET), WIN95) -MDCPUCFG_H = _win95.cfg -else -ifeq ($(OS_TARGET), WIN16) -MDCPUCFG_H = _win16.cfg -else -MDCPUCFG_H = _winnt.cfg -endif -endif -endif - -ifeq ($(OS_ARCH),OS2) -MDCPUCFG_H = _os2.cfg -endif - -ifeq ($(OS_ARCH),AIX) -ifeq ($(USE_64),1) -MDCPUCFG_H = _aix64.cfg -else -ifeq ($(USE_IPV6),1) -MDCPUCFG_H = _aix32in6.cfg -else -MDCPUCFG_H = _aix32.cfg -endif -endif -endif - -ifeq ($(OS_ARCH),BSD_OS) -MDCPUCFG_H = _bsdi.cfg -endif - -ifeq ($(OS_ARCH),FreeBSD) -MDCPUCFG_H = _freebsd.cfg -endif - -ifeq ($(OS_ARCH),OpenBSD) -MDCPUCFG_H = _openbsd.cfg -endif - -ifeq ($(OS_ARCH),OpenVMS) -MDCPUCFG_H = _openvms.cfg -endif - -ifeq ($(OS_ARCH),NetBSD) -MDCPUCFG_H = _netbsd.cfg -endif - -ifeq ($(OS_ARCH),HP-UX) -ifeq ($(USE_64), 1) -MDCPUCFG_H = _hpux64.cfg -else -MDCPUCFG_H = _hpux32.cfg -endif -endif - -ifeq ($(OS_ARCH),Linux) -MDCPUCFG_H = _linux.cfg -endif - -ifeq ($(OS_ARCH),OSF1) -MDCPUCFG_H = _osf1.cfg -endif - -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -MDCPUCFG_H = _sunos4.cfg -else -ifeq ($(USE_64),1) -MDCPUCFG_H = _solaris64.cfg -else -MDCPUCFG_H = _solaris32.cfg -endif -endif -endif - -ifeq ($(OS_ARCH),SINIX) -MDCPUCFG_H = _reliantunix.cfg -endif - -ifeq ($(OS_ARCH),Rhapsody) -MDCPUCFG_H = _rhapsody.cfg -endif - -ifeq ($(OS_ARCH),NEXTSTEP) -MDCPUCFG_H = _nextstep.cfg -endif - -ifeq ($(OS_ARCH),NEWS-OS) -MDCPUCFG_H = _sony.cfg -endif - -ifeq ($(OS_ARCH),NEC) -MDCPUCFG_H = _nec.cfg -endif - -ifeq ($(OS_ARCH),SCOOS) -MDCPUCFG_H = _scoos.cfg -endif - -ifeq ($(OS_ARCH),UNIXWARE) -ifeq (,$(filter-out 2.1,$(OS_RELEASE))) -MDCPUCFG_H = _unixware.cfg -else -MDCPUCFG_H = _unixware7.cfg -endif -endif - -ifeq ($(OS_ARCH),NCR) -MDCPUCFG_H = _ncr.cfg -endif - -ifeq ($(OS_ARCH),DGUX) -MDCPUCFG_H = _dgux.cfg -endif - -ifeq ($(OS_ARCH),QNX) -MDCPUCFG_H = _qnx.cfg -endif - -ifeq ($(OS_TARGET),NTO) -MDCPUCFG_H = _nto.cfg -endif - -ifeq ($(OS_ARCH),BeOS) -MDCPUCFG_H = _beos.cfg -endif - -endif # ! USE_AUTOCONF - export:: $(MDCPUCFG_H) ifeq ($(MOZ_BITS),16) cp $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in index 3f577482..4aab9979 100644 --- a/pr/src/Makefile.in +++ b/pr/src/Makefile.in @@ -45,8 +45,6 @@ ifeq ($(USE_CPLUS), 1) DIRS += cplus endif -ifndef USE_AUTOCONF - # # Define platform-dependent OS_LIBS # @@ -54,8 +52,6 @@ ifndef USE_AUTOCONF # Disable optimization of the nspr on SunOS4.1.3 ifeq ($(OS_ARCH),SunOS) ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -export OPTIMIZER OS_LIBS = -lm else # 4.1.3_U1 ifdef USE_PTHREADS @@ -146,18 +142,16 @@ ifeq ($(OS_ARCH),NEWS-OS) OS_LIBS = -lsocket -lnsl -lgen -lresolv endif -ifdef GC_LEAK_DETECTOR -OS_LIBS += -L$(libdir) -lboehm -endif - -endif # USE_AUTOCONF - ifeq ($(OS_ARCH),WINNT) -ifneq ($(OS_TARGET),WIN16) OS_LIBS = advapi32.lib wsock32.lib endif + +ifdef GC_LEAK_DETECTOR +EXTRA_LIBS = -L$(libdir) -lboehm endif +EXTRA_LIBS += $(OS_LIBS) + # # Define platform-dependent OBJS # @@ -260,110 +254,16 @@ OBJS += memory/$(OBJDIR)/prgcleak.$(OBJ_SUFFIX) endif ifeq ($(OS_ARCH), WINNT) -ifneq ($(OS_TARGET),WIN16) DLLBASE=/BASE:0x30000000 RES=$(OBJDIR)/nspr.res RESNAME=nspr.rc -ifdef MOZ_DEBUG -ifdef GLOWCODE -EXTRA_LIBS += $(GLOWDIR)/glowcode.lib -endif -endif -endif endif # WINNT -ifdef USE_AUTOCONF - include $(srcdir)/md/$(PR_MD_ARCH_DIR)/objs.mk ifdef USE_BTHREADS include $(srcdir)/bthreads/objs.mk endif -else - -ifeq ($(OS_ARCH), WINNT) -ifeq ($(OS_TARGET), WIN16) -OBJS += md/windows/$(OBJDIR)/w16null.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16proc.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16thred.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16fmem.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16sock.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16mem.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16io.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16gc.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16error.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w16callb.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntinrval.$(OBJ_SUFFIX) -EXTRA_LIBS += $(MOD_DEPTH)/tools/winsock.lib -W16_EXPORTS = EXPORT _malloc.2=_PR_MD_malloc RESIDENT, \ - _realloc.3=_PR_MD_realloc RESIDENT, \ - _calloc.4=_PR_MD_calloc RESIDENT, \ - _free.5=_PR_MD_free RESIDENT, \ - _getenv.9=_PR_MD_getenv RESIDENT, \ - _printf.11=_PR_MD_printf RESIDENT, \ - _strftime.13=_PR_MD_strftime RESIDENT, \ - _sscanf.33=_PR_MD_sscanf RESIDENT, \ - _putenv.10=_PR_MD_putenv RESIDENT, \ - _fprintf.12=_PR_MD_fprintf RESIDENT -else -ifeq ($(OS_TARGET), WIN95) -OBJS += md/windows/$(OBJDIR)/w95io.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w95sock.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w95thred.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w95cv.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntgc.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntmisc.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntinrval.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntsec.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntsem.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w32ipcsem.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w32rng.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w32shm.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w95dllmain.$(OBJ_SUFFIX) -else -OBJS += md/windows/$(OBJDIR)/ntdllmn.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntio.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntgc.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntthread.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntmisc.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntinrval.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntsec.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/ntsem.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w32ipcsem.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w32rng.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w32shm.$(OBJ_SUFFIX) \ - md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX) -endif -endif - -ifeq ($(OS_ARCH),OS2) -OBJS += md/os2/$(OBJDIR)/os2io.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2sock.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2thred.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2cv.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2gc.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2misc.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2inrval.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2sem.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2_errors.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2poll.$(OBJ_SUFFIX) \ - md/os2/$(OBJDIR)/os2rng.$(OBJ_SUFFIX) -else - -ifeq ($(OS_ARCH), BeOS) - include $(srcdir)/md/beos/objs.mk - include $(srcdir)/bthreads/objs.mk -else - # Unix - include $(srcdir)/md/unix/objs.mk -endif # BeOS -endif # OS2 -endif # WINNT -endif # !USE_AUTOCONF - LIBRARY_NAME = nspr LIBRARY_VERSION = $(MOD_VERSION) @@ -371,8 +271,6 @@ RELEASE_LIBS = $(TARGETS) include $(topsrcdir)/config/rules.mk -EXTRA_LIBS = $(OS_LIBS) - ifeq ($(BUILD_AIX_RTL_LIBC),1) TARGETS += $(AIX_RTL_LIBC) # XXX is this a shared library? diff --git a/pr/src/md/Makefile.in b/pr/src/md/Makefile.in index f027be8d..461afd29 100644 --- a/pr/src/md/Makefile.in +++ b/pr/src/md/Makefile.in @@ -26,31 +26,7 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifdef USE_AUTOCONF DIRS = $(PR_MD_ARCH_DIR) -else - -ifeq ($(OS_ARCH),WINNT) - DIRS = windows -else - ifeq ($(OS_ARCH),OS2) - DIRS = os2 - else - ifeq ($(OS_ARCH),BeOS) - DIRS = beos - else - DIRS = unix - endif - endif -endif - -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif -endif # USE_AUTOCONF CSRCS = \ prosdep.c \ diff --git a/pr/src/md/unix/Makefile.in b/pr/src/md/unix/Makefile.in index 8ed247aa..526f9df0 100644 --- a/pr/src/md/unix/Makefile.in +++ b/pr/src/md/unix/Makefile.in @@ -24,17 +24,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifndef USE_AUTOCONF - -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif - -endif # ! USE_AUTOCONF - CSRCS = \ unix.c \ unix_errors.c \ @@ -52,236 +41,6 @@ ifeq ($(PTHREADS_USER),1) CSRCS += pthreads_user.c endif -ifndef USE_AUTOCONF - -IRIX_CSRCS = \ - irix.c \ - $(NULL) - -SUNOS4_CSRCS = \ - sunos4.c \ - $(NULL) - -SOLARIS_CSRCS = \ - solaris.c \ - $(NULL) - -AIX_CSRCS = \ - aix.c \ - $(NULL) - -FREEBSD_CSRCS = \ - freebsd.c \ - $(NULL) - -NETBSD_CSRCS = \ - netbsd.c \ - $(NULL) - -OPENBSD_CSRCS = \ - openbsd.c \ - $(NULL) - -BSDI_CSRCS = \ - bsdi.c \ - $(NULL) - -HPUX_CSRCS = \ - hpux.c \ - $(NULL) - -OPENVMS_CSRCS = \ - openvms.c \ - $(NULL) - -OSF1_CSRCS = \ - osf1.c \ - $(NULL) - -LINUX_CSRCS = \ - linux.c \ - $(NULL) - -UNIXWARE_CSRCS = \ - unixware.c \ - $(NULL) - -RELIANTUNIX_CSRCS = \ - reliantunix.c \ - $(NULL) - -RHAPSODY_CSRCS = \ - rhapsody.c \ - $(NULL) - -NEXTSTEP_CSRCS = \ - nextstep.c \ - $(NULL) - -NEC_CSRCS = \ - nec.c \ - $(NULL) - -SONY_CSRCS = \ - sony.c \ - $(NULL) - -NCR_CSRCS = \ - ncr.c \ - $(NULL) - -SCOOS_CSRCS = \ - scoos.c \ - $(NULL) - -DGUX_CSRCS = \ - dgux.c \ - $(NULL) - -QNX_CSRCS = \ - qnx.c \ - $(NULL) - -NTO_CSRCS = \ - nto.c \ - $(NULL) - -ifeq ($(OS_ARCH),IRIX) -CSRCS += $(IRIX_CSRCS) -endif - -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -CSRCS += $(SUNOS4_CSRCS) -else -CSRCS += $(SOLARIS_CSRCS) -endif -endif - -ifeq ($(OS_ARCH),AIX) -CSRCS += $(AIX_CSRCS) -endif -ifeq ($(OS_ARCH),FreeBSD) -CSRCS += $(FREEBSD_CSRCS) -endif -ifeq ($(OS_ARCH),NetBSD) -CSRCS += $(NETBSD_CSRCS) -endif -ifeq ($(OS_ARCH),OpenBSD) -CSRCS += $(OPENBSD_CSRCS) -endif -ifeq ($(OS_ARCH),BSD_OS) -CSRCS += $(BSDI_CSRCS) -endif -ifeq ($(OS_ARCH),HP-UX) -CSRCS += $(HPUX_CSRCS) -endif -ifeq ($(OS_ARCH),OpenVMS) -CSRCS += $(OPENVMS_CSRCS) -endif -ifeq ($(OS_ARCH),OSF1) -CSRCS += $(OSF1_CSRCS) -endif -ifeq ($(OS_ARCH),Linux) -CSRCS += $(LINUX_CSRCS) -endif -ifeq ($(OS_ARCH),UNIXWARE) -CSRCS += $(UNIXWARE_CSRCS) -endif -ifeq ($(OS_ARCH),SINIX) -CSRCS += $(RELIANTUNIX_CSRCS) -endif -ifeq ($(OS_ARCH),Rhapsody) -CSRCS += $(RHAPSODY_CSRCS) -endif -ifeq ($(OS_ARCH),NEXTSTEP) -CSRCS += $(NEXTSTEP_CSRCS) -endif -ifeq ($(OS_ARCH),NEC) -CSRCS += $(NEC_CSRCS) -endif -ifeq ($(OS_ARCH),NEWS-OS) -CSRCS += $(SONY_CSRCS) -endif -ifeq ($(OS_ARCH),NCR) -CSRCS += $(NCR_CSRCS) -endif -ifeq ($(OS_ARCH),SCOOS) -CSRCS += $(SCOOS_CSRCS) -endif -ifeq ($(OS_ARCH),DGUX) -CSRCS += $(DGUX_CSRCS) -endif -ifeq ($(OS_ARCH),NTO) -CSRCS += $(NTO_CSRCS) -endif -ifeq ($(OS_ARCH),QNX) -ifeq ($(OS_TARGET),NTO) -CSRCS += $(NTO_CSRCS) -else -CSRCS += $(QNX_CSRCS) -endif -endif - -# -# Some Unix platforms have an assembly language file. -# E.g., AIX 3.2, Solaris (both sparc and x86). -# -ifeq ($(OS_ARCH), AIX) - ifeq ($(OS_RELEASE), 3.2) - ASFILES = os_$(OS_ARCH).s - endif -endif - -ifeq ($(OS_ARCH),SunOS) - ifneq ($(OS_RELEASE),4.1.3_U1) - ifneq ($(LOCAL_THREADS_ONLY),1) - ifeq ($(CPU_ARCH),x86) - ASFILES = os_$(OS_ARCH)_x86.s - else - ASFILES = os_$(OS_ARCH).s - ifneq ($(USE_64),1) - ASFILES += os_$(OS_ARCH)_32.s - endif - endif - endif - endif -endif - -ifeq ($(OS_ARCH),Linux) - ifeq ($(CPU_ARCH),x86) - ASFILES = os_Linux_x86.s - endif -endif - -ifeq ($(OS_ARCH), SINIX) - ifeq ($(CPU_ARCH),mips) - ASFILES = os_ReliantUNIX.s - endif -endif - -ifeq ($(OS_ARCH)$(OS_RELEASE),BSD_OS2.1) - ASFILES = os_BSD_386_2.s -endif - -ifeq ($(OS_ARCH), IRIX) - ASFILES = os_Irix.s -endif - -ifeq ($(OS_ARCH), HP-UX) - ASFILES = os_HPUX.s -endif - -TARGETS = $(OBJS) - -ifeq ($(OS_ARCH),AIX) -ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE))) -ifneq ($(USE_PTHREADS), 1) -#TARGETS += $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) -endif -endif -endif - ifeq ($(OS_ARCH),SunOS) ifneq ($(OS_RELEASE),4.1.3_U1) ifeq ($(OS_TEST),sun4u) @@ -295,15 +54,11 @@ ifeq ($(OS_ARCH),SunOS) endif endif -else # USE_AUTOCONF - CSRCS += $(PR_MD_CSRCS) ASFILES += $(PR_MD_ASFILES) TARGETS = $(OBJS) -endif # ! USE_AUTOCONF - INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private DEFINES += -D_NSPR_BUILD_ @@ -311,15 +66,7 @@ DEFINES += -D_NSPR_BUILD_ include $(topsrcdir)/config/rules.mk export:: $(TARGETS) -#ifeq ($(OS_ARCH),AIX) -#ifeq (,$(filter-out 3.2 4.1,$(OS_RELEASE))) -#ifneq ($(USE_PTHREADS), 1) -# $(INSTALL) -m 444 $(OBJDIR)/aixwrap.$(OBJ_SUFFIX) $(libdir) -#endif -#endif -#endif -ifndef USE_AUTOCONF ifeq ($(OS_ARCH),SunOS) ifneq ($(OS_RELEASE),4.1.3_U1) ifeq ($(OS_TEST),sun4u) @@ -339,4 +86,3 @@ clean:: endif endif endif -endif #!USE_AUTOCONF diff --git a/pr/src/md/unix/objs.mk b/pr/src/md/unix/objs.mk index d2aa9cb4..575584b6 100644 --- a/pr/src/md/unix/objs.mk +++ b/pr/src/md/unix/objs.mk @@ -35,232 +35,9 @@ ifeq ($(PTHREADS_USER),1) CSRCS += pthreads_user.c endif -ifdef USE_AUTOCONF - CSRCS += $(PR_MD_CSRCS) ASFILES += $(PR_MD_ASFILES) -else # ! USE_AUTOCONF -IRIX_CSRCS = \ - irix.c \ - $(NULL) - -SUNOS4_CSRCS = \ - sunos4.c \ - $(NULL) - -SOLARIS_CSRCS = \ - solaris.c \ - $(NULL) - -AIX_CSRCS = \ - aix.c \ - $(NULL) - -FREEBSD_CSRCS = \ - freebsd.c \ - $(NULL) - -NETBSD_CSRCS = \ - netbsd.c \ - $(NULL) - -OPENBSD_CSRCS = \ - openbsd.c \ - $(NULL) - -BSDI_CSRCS = \ - bsdi.c \ - $(NULL) - -HPUX_CSRCS = \ - hpux.c \ - $(NULL) - -OSF1_CSRCS = \ - osf1.c \ - $(NULL) - -OPENVMS_CSRCS = \ - openvms.c \ - $(NULL) - -LINUX_CSRCS = \ - linux.c \ - $(NULL) - -UNIXWARE_CSRCS = \ - unixware.c \ - $(NULL) - -RELIANTUNIX_CSRCS = \ - reliantunix.c \ - $(NULL) - -RHAPSODY_CSRCS = \ - rhapsody.c \ - $(NULL) - -NEXTSTEP_CSRCS = \ - nextstep.c \ - $(NULL) - -NEC_CSRCS = \ - nec.c \ - $(NULL) - -SONY_CSRCS = \ - sony.c \ - $(NULL) - -NCR_CSRCS = \ - ncr.c \ - $(NULL) - -SCOOS_CSRCS = \ - scoos.c \ - $(NULL) - -DGUX_CSRCS = \ - dgux.c \ - $(NULL) - -QNX_CSRCS = \ - qnx.c \ - $(NULL) - -NTO_CSRCS = \ - nto.c \ - $(NULL) - -ifeq ($(OS_ARCH),IRIX) -CSRCS += $(IRIX_CSRCS) -endif - -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -CSRCS += $(SUNOS4_CSRCS) -else -CSRCS += $(SOLARIS_CSRCS) -endif -endif - -ifeq ($(OS_ARCH),AIX) -CSRCS += $(AIX_CSRCS) -endif -ifeq ($(OS_ARCH),FreeBSD) -CSRCS += $(FREEBSD_CSRCS) -endif -ifeq ($(OS_ARCH),NetBSD) -CSRCS += $(NETBSD_CSRCS) -endif -ifeq ($(OS_ARCH),OpenBSD) -CSRCS += $(OPENBSD_CSRCS) -endif -ifeq ($(OS_ARCH),BSD_OS) -CSRCS += $(BSDI_CSRCS) -endif -ifeq ($(OS_ARCH),HP-UX) -CSRCS += $(HPUX_CSRCS) -endif -ifeq ($(OS_ARCH),OSF1) -CSRCS += $(OSF1_CSRCS) -endif -ifeq ($(OS_ARCH),OpenVMS) -CSRCS += $(OPENVMS_CSRCS) -endif -ifeq ($(OS_ARCH),Linux) -CSRCS += $(LINUX_CSRCS) -endif -ifeq ($(OS_ARCH),UNIXWARE) -CSRCS += $(UNIXWARE_CSRCS) -endif -ifeq ($(OS_ARCH),SINIX) -CSRCS += $(RELIANTUNIX_CSRCS) -endif -ifeq ($(OS_ARCH),Rhapsody) -CSRCS += $(RHAPSODY_CSRCS) -endif -ifeq ($(OS_ARCH),NEXTSTEP) -CSRCS += $(NEXTSTEP_CSRCS) -endif -ifeq ($(OS_ARCH),NEC) -CSRCS += $(NEC_CSRCS) -endif -ifeq ($(OS_ARCH),NEWS-OS) -CSRCS += $(SONY_CSRCS) -endif -ifeq ($(OS_ARCH),NCR) -CSRCS += $(NCR_CSRCS) -endif -ifeq ($(OS_ARCH),SCOOS) -CSRCS += $(SCOOS_CSRCS) -endif -ifeq ($(OS_ARCH),DGUX) -CSRCS += $(DGUX_CSRCS) -endif -ifeq ($(OS_ARCH),NTO) -CSRCS += $(NTO_CSRCS) -endif -ifeq ($(OS_ARCH),QNX) -ifeq ($(OS_TARGET),NTO) -CSRCS += $(NTO_CSRCS) -else -CSRCS += $(QNX_CSRCS) -endif -endif - -# -# Some Unix platforms have an assembly language file. -# E.g., AIX 3.2, Solaris (both sparc and x86). -# -ifeq ($(OS_ARCH), AIX) - ifeq ($(OS_RELEASE), 3.2) - ASFILES = os_$(OS_ARCH).s - endif -endif - -ifeq ($(OS_ARCH),SunOS) - ifneq ($(OS_RELEASE),4.1.3_U1) - ifneq ($(LOCAL_THREADS_ONLY),1) - ifeq ($(CPU_ARCH),x86) - ASFILES = os_$(OS_ARCH)_x86.s - else - ASFILES = os_$(OS_ARCH).s - ifneq ($(USE_64),1) - ASFILES += os_$(OS_ARCH)_32.s - endif - endif - endif - endif -endif - -ifeq ($(OS_ARCH),Linux) - ifeq ($(CPU_ARCH),x86) - ASFILES = os_Linux_x86.s - endif -endif - -ifeq ($(OS_ARCH), SINIX) - ifeq ($(CPU_ARCH),mips) - ASFILES = os_ReliantUNIX.s - endif -endif - -ifeq ($(OS_ARCH), HP-UX) - ASFILES = os_HPUX.s -endif - -ifeq ($(OS_ARCH), IRIX) - ASFILES = os_Irix.s -endif - -ifeq ($(OS_ARCH)$(OS_RELEASE),BSD_OS2.1) - ASFILES = os_BSD_386_2.s -endif - -endif # !USE_AUTOCONF - OBJS += $(addprefix md/unix/$(OBJDIR)/,$(CSRCS:.c=.$(OBJ_SUFFIX))) \ $(addprefix md/unix/$(OBJDIR)/,$(ASFILES:.s=.$(OBJ_SUFFIX))) diff --git a/pr/src/memory/Makefile.in b/pr/src/memory/Makefile.in index 61a5291e..22d90c3c 100644 --- a/pr/src/memory/Makefile.in +++ b/pr/src/memory/Makefile.in @@ -26,15 +26,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifndef USE_AUTOCONF -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif -endif #!USE_AUTOCONF - CSRCS = prseg.c prshm.c prshma.c ifdef GC_LEAK_DETECTOR diff --git a/pr/src/misc/Makefile.in b/pr/src/misc/Makefile.in index d30462c4..0ba3d42e 100644 --- a/pr/src/misc/Makefile.in +++ b/pr/src/misc/Makefile.in @@ -26,15 +26,6 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifndef USE_AUTOCONF -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif -endif #!USE_AUTOCONF - CSRCS = \ pralarm.c \ pratom.c \ @@ -75,15 +66,13 @@ RELEASE_BINS = compile-et.pl prerr.properties include $(topsrcdir)/config/rules.mk -ifndef USE_AUTOCONF # An AIX Optimization bug causes PR_dtoa() to produce wrong result. # This suppresses optimization for this single compilation unit. ifeq ($(OS_ARCH), AIX) -$(OBJDIR)/prdtoa.o: +$(OBJDIR)/prdtoa.o: prdtoa.c @$(MAKE_OBJDIR) - $(CC) -o $@ -c $(filter-out -O, $(CFLAGS)) prdtoa.c + $(CC) -o $@ -c $(filter-out -O, $(CFLAGS)) $< endif -endif #!USE_AUTOCONF # # Generate prerr.h, prerr.c, and prerr.properties from prerr.et. diff --git a/pr/src/threads/Makefile.in b/pr/src/threads/Makefile.in index c31b6014..8524fa63 100644 --- a/pr/src/threads/Makefile.in +++ b/pr/src/threads/Makefile.in @@ -36,15 +36,6 @@ else endif endif -ifndef USE_AUTOCONF -# Disable optimization of the nspr on SunOS4.1.3 -ifeq ($(OS_ARCH),SunOS) -ifeq ($(OS_RELEASE),4.1.3_U1) -OPTIMIZER = -endif -endif -endif - ifdef USE_PTHREADS CSRCS = \ prcmon.c \ diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in index 9da6c712..d174081f 100644 --- a/pr/tests/Makefile.in +++ b/pr/tests/Makefile.in @@ -26,16 +26,7 @@ include $(MOD_DEPTH)/config/autoconf.mk include $(topsrcdir)/config/config.mk -ifeq ($(OS_TARGET), WIN16) -OS_CFLAGS = $(OS_EXE_CFLAGS) -W16STDIO = $(MOD_DEPTH)/pr/src/md/windows/$(OBJDIR)/w16stdio.$(OBJ_SUFFIX) -endif - -ifeq ($(OS_TARGET),WIN16) -DIRS = dll w16gui -else DIRS = dll -endif ifeq ($(OS_TARGET),OS2) OS_CFLAGS = $(OS_EXE_CFLAGS) @@ -198,38 +189,16 @@ TARGETS = $(PROGS) INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private -# Setting the variables LDOPTS and LIBPR. We first initialize -# them to the default values, then adjust them for some platforms. -LDOPTS = -L$(libdir) -LIBPR = -lnspr$(MOD_VERSION) -LIBPLC = -lplc$(MOD_VERSION) - -ifndef USE_AUTOCONF - ifeq ($(OS_ARCH), WINNT) -ifeq ($(OS_TARGET), WIN16) - LIBPR = $(libdir)/nspr$(MOD_VERSION).lib - LIBPLC= $(libdir)/plc$(MOD_VERSION).lib -else LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO - ifeq ($(OS_TARGET), WIN95) - LIBPR = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(libdir)/plc$(MOD_VERSION).$(LIB_SUFFIX) - else - LIBPR = $(libdir)/libnspr$(MOD_VERSION).$(LIB_SUFFIX) - LIBPLC= $(libdir)/libplc$(MOD_VERSION).$(LIB_SUFFIX) - endif ifdef PROFILE LDOPTS += -PROFILE -MAP endif # profile endif -endif ifeq ($(OS_ARCH),OS2) ifeq ($(MOZ_OS2_TOOLS),VACPP) LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO - LIBPR = $(libdir)/nspr$(MOD_VERSION).lib - LIBPLC = $(libdir)/plc$(MOD_VERSION).lib else ifeq ($(MOZ_OS2_EMX_OBJECTFORMAT),OMF) LDOPTS = -Zlinker /PM:VIO @@ -278,7 +247,7 @@ ifeq ($(OS_ARCH), OSF1) # I haven't figured out how to pass -rpath to cc on OSF1 V3.2, so # we do static linking. ifeq (,$(filter-out V2.0 V3.2,$(OS_RELEASE))) - LIBPR = $(libdir)/libnspr$(MOD_VERSION).a + LIBNSPR = $(libdir)/libnspr$(MOD_VERSION).a LIBPLC = $(libdir)/libplc$(MOD_VERSION).a EXTRA_LIBS = -lc_r else @@ -298,7 +267,7 @@ endif ifeq ($(OS_ARCH),AIX) LDOPTS += -blibpath:$(ABSOLUTE_LIB_DIR):/usr/lib:/lib ifeq ($(OS_ARCH)$(OS_RELEASE),AIX4.1) - LIBPR = -lnspr$(MOD_VERSION)_shr + LIBNSPR = -lnspr$(MOD_VERSION)_shr LIBPLC = -lplc$(MOD_VERSION)_shr else LDOPTS += -brtl @@ -367,7 +336,7 @@ ifeq ($(OS_ARCH), NEWS-OS) # libnspr.so etc. at program startup. Equivalent to the -R or -rpath # option for ld on other platforms. #export LD_RUN_PATH = $(ABSOLUTE_LIB_DIR) - LIBPR = $(libdir)/libnspr$(MOD_VERSION).a + LIBNSPR = $(libdir)/libnspr$(MOD_VERSION).a LIBPLC = $(libdir)/libplc$(MOD_VERSION).a EXTRA_LIBS = -lsocket -lnsl -lgen -lresolv endif @@ -450,7 +419,6 @@ LIBPTHREAD = -ldce endif endif -endif # !USE_AUTOCONF ##################################################### # @@ -460,11 +428,6 @@ endif # !USE_AUTOCONF include $(topsrcdir)/config/rules.mk -ifdef USE_AUTOCONF -$(OBJDIR)/%$(PROG_SUFFIX): %.c - $(CC) $< -o $@ $(CFLAGS) $(LDOPTS) $(LIBPLC) $(LIBPR) $(OS_LIBS) - -else AIX_PRE_4_2 = 0 ifeq ($(OS_ARCH),AIX) ifeq ($(OS_RELEASE),4.1) @@ -498,68 +461,46 @@ else $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) @$(MAKE_OBJDIR) ifeq ($(OS_ARCH), WINNT) -ifeq ($(OS_TARGET),WIN16) - echo system windows >w16link - echo name $@ >>w16link - echo option map >>w16link -# echo option CASEEXACT >>w16link - echo option stack=16K >>w16link - echo debug $(DEBUGTYPE) all >>w16link - echo file >>w16link - echo $< , >>w16link - echo $(W16STDIO) >>w16link - echo library >>w16link - echo $(LIBPR), >>w16link - echo $(LIBPLC), >>w16link - echo winsock.lib >>w16link - wlink @w16link. -else - link $(LDOPTS) $(EXTRA_LDOPTS) $< $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) wsock32.lib -out:$@ -endif + link $(LDOPTS) $(EXTRA_LDOPTS) $< $(LIBPLC) $(LIBNSPR) $(EXTRA_LIBS) wsock32.lib -out:$@ else ifeq ($(OS_ARCH),OS2) - $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) + $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBNSPR) $(OS_LIBS) $(EXTRA_LIBS) else - $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@ -endif -endif -endif - -endif # !USE_AUTOCONF + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(EXTRA_LIBS) -o $@ +endif # OS/2 +endif # WINNT +endif # AIX_PRE_4_2 export:: $(TARGETS) clean:: rm -f $(TARGETS) -ifndef USE_AUTOCONF # The following tests call BSD socket functions, so they need to link # with -lsocket on some platforms. ifeq ($(OS_ARCH),SunOS) ifneq ($(OS_RELEASE),4.1.3_U1) ifeq ($(USE_IPV6),1) $(OBJDIR)/gethost: $(OBJDIR)/gethost.o - $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) -lsocket $(EXTRA_LIBS) -o $@ + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@ endif $(OBJDIR)/prpoll: $(OBJDIR)/prpoll.o - $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) -lsocket $(EXTRA_LIBS) -o $@ + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) -lsocket $(EXTRA_LIBS) -o $@ endif endif ifeq ($(USE_PTHREADS), 1) $(OBJDIR)/attach: $(OBJDIR)/attach.o - $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ $(OBJDIR)/foreign: $(OBJDIR)/foreign.o - $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ $(OBJDIR)/provider: $(OBJDIR)/provider.o - $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ $(OBJDIR)/socket: $(OBJDIR)/socket.o - $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ $(OBJDIR)/testfile: $(OBJDIR)/testfile.o - $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ + $(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBNSPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@ endif -endif # !USE_AUTOCONF - # # Run the test programs with no arguments # |