More WIP, rewrite the script namespace manager to make registration of names be category driven, more nsIClassInfo fun, things are getting closer...XPCDOM_20010223_BRANCH

24 files changed, 352 insertions, 128 deletions

diff --git a/Makefile b/Makefile
index 33c64e34..2cf44b60 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #! gmake
 
 #
@@ -17,7 +18,11 @@
 # Reserved.
 #
 
-MOD_DEPTH = .
+MOD_DEPTH	= .
+topsrcdir	= .
+srcdir		= .
+
+include $(MOD_DEPTH)/config/autoconf.mk
 
 DIRS = config pr lib
 
@@ -26,7 +31,18 @@ PR_CLIENT_BUILD = 1
 PR_CLIENT_BUILD_UNIX = 1
 endif
 
-include $(MOD_DEPTH)/config/rules.mk
+DIST_GARBAGE = config.cache config.log config.status
+
+all:: config.status export
+
+include $(topsrcdir)/config/rules.mk
+
+config.status:: configure
+ifeq ($(OS_ARCH),WINNT)
+	sh $(srcdir)/configure --no-create --no-recursion
+else
+	./config.status --recheck && ./config.status
+endif
 
 #
 # The -ll option of zip converts CR LF to LF.
@@ -44,10 +60,11 @@ ifdef PR_CLIENT_BUILD_UNIX
 endif
 endif
 
+# Delete config/autoconf.mk last because it is included by every makefile.
 distclean::
 	@echo "cd pr/tests; $(MAKE) $@"
 	@$(MAKE) -C pr/tests $@
-	rm -f config/my_config.mk config/my_overrides.mk
+	rm -f config/autoconf.mk
 
 release::
 	echo $(BUILD_NUMBER) > $(RELEASE_DIR)/$(BUILD_NUMBER)/version.df
diff --git a/config/Makefile b/config/Makefile
index e4ffc4d2..ccd2230a 100644
--- a/config/Makefile
+++ b/config/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #! gmake
 
 #
@@ -18,11 +19,19 @@
 #
 
 MOD_DEPTH	= ..
+topsrcdir	= ..
+srcdir		= .
+
+include $(MOD_DEPTH)/config/autoconf.mk
 
 # Indicate that this directory builds build tools.
 INTERNAL_TOOLS	= 1
 
-include $(MOD_DEPTH)/config/config.mk
+# autoconf.mk must be deleted last (from the top-level directory)
+# because it is included by every makefile.
+DIST_GARBAGE	= nsprincl.mk nsprincl.sh
+
+include $(topsrcdir)/config/config.mk
 
 CSRCS	= now.c
 
@@ -85,7 +94,7 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
 OS_CFLAGS = $(OS_EXE_CFLAGS)
 endif
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 PROGS	= $(OBJDIR)/now$(PROG_SUFFIX)
 
@@ -115,4 +124,3 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
 else
 	$(CC) $(XCFLAGS) $< $(XLDOPTS) $(OUTOPTION)$@
 endif
-
diff --git a/lib/Makefile b/lib/Makefile
index 9c0f653a..441bce92 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,15 +18,19 @@
 
 #! gmake
 
-MOD_DEPTH = ..
+MOD_DEPTH	= ..
+topsrcdir	= ..
+srcdir		= .
+
+include $(MOD_DEPTH)/config/autoconf.mk
 
 export NSPR20=1
 
-include $(MOD_DEPTH)/config/config.mk
+include $(topsrcdir)/config/config.mk
 
 DIRS = ds libc
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/lib/ds/Makefile b/lib/ds/Makefile
index 9c689c80..11c45655 100644
--- a/lib/ds/Makefile
+++ b/lib/ds/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,18 +18,24 @@
 
 #! gmake
 
-MOD_DEPTH = ../..
+MOD_DEPTH	= ../..
+topsrcdir	= ../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+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$(MOD_DEPTH)/pr/include
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include
 
 CSRCS = \
 	plarena.c \
@@ -42,6 +49,8 @@ HEADERS = \
 	plhash.h \
 	$(NULL)
 
+HEADERS := $(addprefix $(srcdir)/, $(HEADERS))
+
 ifeq ($(OS_ARCH), WINNT)
 ifeq ($(OS_TARGET), WIN16)
 # OS_CFLAGS = $(OS_EXE_CFLAGS)
@@ -64,7 +73,8 @@ endif
 endif
 endif
 
-else
+ifndef USE_AUTOCONF
+
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
 
@@ -94,6 +104,11 @@ endif
 ifeq ($(OS_ARCH),SCOOS)
 EXTRA_LIBS =
 endif
+endif #!USE_AUTOCONF
+
+ifdef RESOLVE_LINK_SYMBOLS
+EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) $(OS_LIBS)
+endif
 
 LIBRARY_NAME	= plds
 LIBRARY_VERSION	= $(MOD_VERSION)
@@ -102,7 +117,9 @@ RELEASE_HEADERS = $(HEADERS)
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
 RELEASE_LIBS	= $(TARGETS)
 
-include $(MOD_DEPTH)/config/rules.mk
+GARBAGE += $(TINC)
+
+include $(topsrcdir)/config/rules.mk
 
 #
 # Version information generation (begin)
@@ -133,12 +150,12 @@ $(TINC):
 
 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 ifeq ($(OS_ARCH), WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c
+	$(CC) -Fo$@ -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/lib/libc/Makefile b/lib/libc/Makefile
index 99366007..413867aa 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,15 +18,19 @@
 
 #! gmake
 
-MOD_DEPTH = ../..
+MOD_DEPTH	= ../..
+topsrcdir	= ../..
+srcdir		= .
+
+include $(MOD_DEPTH)/config/autoconf.mk
 
 export NSPR20=1
 
-include $(MOD_DEPTH)/config/config.mk
+include $(topsrcdir)/config/config.mk
 
 DIRS = include src
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/lib/libc/include/Makefile b/lib/libc/include/Makefile
index e5cec488..0b0a7f14 100644
--- a/lib/libc/include/Makefile
+++ b/lib/libc/include/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,15 +18,19 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
-include $(MOD_DEPTH)/config/config.mk
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-HEADERS = $(wildcard *.h)
+include $(MOD_DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+
+HEADERS = $(wildcard $(srcdir)/*.h)
 
 RELEASE_HEADERS = $(HEADERS)
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(HEADERS)
 	$(INSTALL) -m 444 $(HEADERS) $(includedir)
diff --git a/lib/libc/src/Makefile b/lib/libc/src/Makefile
index a6ca8482..99b3aee5 100644
--- a/lib/libc/src/Makefile
+++ b/lib/libc/src/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,16 +18,22 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+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)
 
@@ -72,7 +79,8 @@ endif
 endif
 endif
 
-else
+ifndef USE_AUTOCONF
+
 ifeq ($(MOZ_OS2_TOOLS),VACPP)
 EXTRA_LIBS = $(libdir)/nspr$(MOD_VERSION).$(LIB_SUFFIX)
 
@@ -102,8 +110,15 @@ endif
 ifeq ($(OS_ARCH),SCOOS)
 EXTRA_LIBS =
 endif
+endif #!USE_AUTOCONF
 
-include $(MOD_DEPTH)/config/rules.mk
+ifdef RESOLVE_LINK_SYMBOLS
+EXTRA_LIBS := -L$(libdir) -lnspr$(MOD_VERSION) $(OS_LIBS)
+endif
+
+GARBAGE += $(TINC)
+
+include $(topsrcdir)/config/rules.mk
 
 #
 # Version information generation (begin)
@@ -121,8 +136,6 @@ else
 	SUF = LL
 endif
 
-GARBAGE += $(TINC)
-
 $(TINC):
 	@$(MAKE_OBJDIR)
 	@$(ECHO) '#define _BUILD_STRING "$(SH_DATE)"' > $(TINC)
@@ -136,12 +149,12 @@ $(TINC):
 
 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 ifeq ($(OS_ARCH), WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c
+	$(CC) -Fo$@ -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/Makefile b/pr/Makefile
index d56a49bd..e24a2962 100644
--- a/pr/Makefile
+++ b/pr/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,8 +18,12 @@
 
 #! gmake
 
-MOD_DEPTH = ..
+MOD_DEPTH	= ..
+topsrcdir	= ..
+srcdir		= .
+
+include $(MOD_DEPTH)/config/autoconf.mk
 
 DIRS = include src
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
diff --git a/pr/include/Makefile b/pr/include/Makefile
index 532db120..1e23c2d7 100644
--- a/pr/include/Makefile
+++ b/pr/include/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,18 +18,22 @@
 
 #! gmake
 
-MOD_DEPTH = ../..
+MOD_DEPTH	= ../..
+topsrcdir	= ../..
+srcdir		= .
+
+include $(MOD_DEPTH)/config/autoconf.mk
 
 DIRS = md private obsolete
 
-include $(MOD_DEPTH)/config/config.mk
+include $(topsrcdir)/config/config.mk
 
-HEADERS = $(wildcard *.h)
+HEADERS = $(wildcard $(srcdir)/*.h)
 
 RELEASE_HEADERS = $(HEADERS)
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(RELEASE_HEADERS)
 	$(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)
diff --git a/pr/include/md/Makefile b/pr/include/md/Makefile
index 39ea2cf3..fdfdcbf8 100644
--- a/pr/include/md/Makefile
+++ b/pr/include/md/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,11 +18,18 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-HEADERS = $(wildcard *.h)
+include $(MOD_DEPTH)/config/autoconf.mk
 
-include $(MOD_DEPTH)/config/rules.mk
+HEADERS = $(wildcard $(srcdir)/*.h)
+CONFIGS = $(wildcard $(srcdir)/*.cfg)
+
+include $(topsrcdir)/config/rules.mk
+
+ifndef USE_AUTOCONF
 
 ifeq ($(OS_ARCH),IRIX)
 ifeq ($(USE_64), 1)
@@ -159,13 +167,16 @@ ifeq ($(OS_ARCH),BeOS)
 MDCPUCFG_H = _beos.cfg
 endif
 
+endif # ! USE_AUTOCONF
+
 export:: $(MDCPUCFG_H)
-	$(INSTALL) -m 444 $(MDCPUCFG_H) $(includedir)
 ifeq ($(MOZ_BITS),16)
 	cp $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h
 	$(INSTALL) -m 444 $(MDCPUCFG_H) $(MOZ_INCL)
 	mv -f $(includedir)/$(MDCPUCFG_H) $(MOZ_INCL)/prcpucfg.h
 else
+	$(INSTALL) -m 444 $(CONFIGS) $(includedir)/md
+	$(INSTALL) -m 444 $(srcdir)/$(MDCPUCFG_H) $(includedir)
 ifneq ($(OS_ARCH),OpenVMS)
 	mv -f $(includedir)/$(MDCPUCFG_H) $(includedir)/prcpucfg.h
 else
diff --git a/pr/include/obsolete/Makefile b/pr/include/obsolete/Makefile
index 4751c012..51733e8d 100644
--- a/pr/include/obsolete/Makefile
+++ b/pr/include/obsolete/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,16 +18,20 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
 
-HEADERS = $(wildcard *.h)
+include $(topsrcdir)/config/config.mk
+
+HEADERS = $(wildcard $(srcdir)/*.h)
 
 RELEASE_HEADERS = $(HEADERS)
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/obsolete
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(RELEASE_HEADERS)
 	$(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)/obsolete
diff --git a/pr/include/private/Makefile b/pr/include/private/Makefile
index b00ddd72..2717284c 100644
--- a/pr/include/private/Makefile
+++ b/pr/include/private/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,16 +18,21 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
 
 RELEASE_HEADERS = pprio.h pprthred.h prpriv.h
+RELEASE_HEADERS := $(addprefix $(srcdir)/, $(RELEASE_HEADERS))
 RELEASE_HEADERS_DEST = $(RELEASE_INCLUDE_DIR)/private
 
-HEADERS = $(RELEASE_HEADERS) pprmwait.h primpl.h
+HEADERS = $(RELEASE_HEADERS) $(srcdir)/pprmwait.h $(srcdir)/primpl.h
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(RELEASE_HEADERS)
 	$(INSTALL) -m 444 $(RELEASE_HEADERS) $(includedir)/private
diff --git a/pr/src/Makefile b/pr/src/Makefile
index 29c47cbc..db95ebcf 100644
--- a/pr/src/Makefile
+++ b/pr/src/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,13 @@
 
 #! gmake
 
-MOD_DEPTH = ../..
+MOD_DEPTH	= ../..
+topsrcdir	= ../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
 
 DIRS = io linking malloc md memory misc threads
 
@@ -40,6 +45,8 @@ ifeq ($(USE_CPLUS), 1)
 	DIRS += cplus
 endif
 
+ifndef USE_AUTOCONF
+
 #
 # Define platform-dependent OS_LIBS
 #
@@ -139,16 +146,18 @@ 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
 endif
 
-ifdef GC_LEAK_DETECTOR
-OS_LIBS		+= -L$(libdir) -lboehm
-endif
-
 #
 # Define platform-dependent OBJS
 #
@@ -261,7 +270,18 @@ 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)      \
@@ -319,8 +339,6 @@ OBJS +=	md/windows/$(OBJDIR)/ntdllmn.$(OBJ_SUFFIX) \
 endif
 endif
 
-else
-
 ifeq ($(OS_ARCH),OS2)
 OBJS +=	md/os2/$(OBJDIR)/os2io.$(OBJ_SUFFIX) \
 	md/os2/$(OBJDIR)/os2sock.$(OBJ_SUFFIX) \
@@ -336,21 +354,24 @@ OBJS +=	md/os2/$(OBJDIR)/os2io.$(OBJ_SUFFIX) \
 else
 
 ifeq ($(OS_ARCH), BeOS)
-	include md/beos/objs.mk
-	include bthreads/objs.mk
+	include $(srcdir)/md/beos/objs.mk
+	include $(srcdir)/bthreads/objs.mk
 else
 	# Unix
-	include md/unix/objs.mk
-endif
-endif
-endif
+	include $(srcdir)/md/unix/objs.mk
+endif # BeOS
+endif # OS2
+endif # WINNT
+endif # !USE_AUTOCONF
 
 LIBRARY_NAME = nspr
 LIBRARY_VERSION = $(MOD_VERSION)
 
 RELEASE_LIBS = $(TARGETS)
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
+
+EXTRA_LIBS = $(OS_LIBS)
 
 ifeq ($(BUILD_AIX_RTL_LIBC),1)
 TARGETS		+= $(AIX_RTL_LIBC)
@@ -361,7 +382,7 @@ endif
 # Version information generation (begin)
 #
 ECHO = echo
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 TINC = $(OBJDIR)/_pr_bld.h
 
 ifeq ($(OS_TARGET),OS2)
@@ -380,9 +401,9 @@ else
 	SUF = LL
 endif
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES		+= -D_NSPR_BUILD_
 
-GARBAGE     += $(TINC)
+GARBAGE		+= $(TINC)
 
 $(TINC):
 	@$(MAKE_OBJDIR)
@@ -397,12 +418,12 @@ $(TINC):
 
 $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
 ifeq ($(OS_ARCH), WINNT)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) prvrsion.c
+	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
 else
 ifeq ($(MOZ_OS2_TOOLS), VACPP)
-	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) prvrsion.c
+	$(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $<
 else
-	$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) prvrsion.c
+	$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) $<
 endif
 endif
 #
@@ -411,7 +432,7 @@ endif
 
 
 #
-# The Client build wants the shared libraries in $(bindir),
+# The Client build wants the shared libraries in $(bindir)
 # so we also install them there.
 #
 
@@ -438,3 +459,4 @@ $(AIX_RTL_LIBC): /usr/ccs/lib/libc.a
 	rtl_enable -o $@ $<
 endif
 
+
diff --git a/pr/src/io/Makefile b/pr/src/io/Makefile
index 2fb59680..9f89fa3a 100644
--- a/pr/src/io/Makefile
+++ b/pr/src/io/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,13 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
 
 # Disable optimization of the nspr on SunOS4.1.3
 ifeq ($(OS_ARCH),SunOS)
@@ -54,11 +59,11 @@ endif
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES	+= -D_NSPR_BUILD_
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/pr/src/linking/Makefile b/pr/src/linking/Makefile
index 0cb1f5e4..83eb283b 100644
--- a/pr/src/linking/Makefile
+++ b/pr/src/linking/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,13 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
 
 # Disable optimization of the nspr on SunOS4.1.3
 ifeq ($(OS_ARCH),SunOS)
@@ -34,11 +39,11 @@ CSRCS =           \
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES += -D_NSPR_BUILD_
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/pr/src/malloc/Makefile b/pr/src/malloc/Makefile
index 0c3d6395..e977d745 100644
--- a/pr/src/malloc/Makefile
+++ b/pr/src/malloc/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,13 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
 
 # Disable optimization of the nspr on SunOS4.1.3
 ifeq ($(OS_ARCH),SunOS)
@@ -30,13 +35,13 @@ endif
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES += -D_NSPR_BUILD_
 
 CSRCS = prmalloc.c prmem.c
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/pr/src/md/Makefile b/pr/src/md/Makefile
index 22287c39..88ef5967 100644
--- a/pr/src/md/Makefile
+++ b/pr/src/md/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,17 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+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
@@ -41,6 +50,7 @@ ifeq ($(OS_RELEASE),4.1.3_U1)
 OPTIMIZER =
 endif
 endif
+endif # USE_AUTOCONF
 
 CSRCS =          \
 	prosdep.c \
@@ -48,11 +58,11 @@ CSRCS =          \
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES	+= -D_NSPR_BUILD_
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/pr/src/md/windows/Makefile b/pr/src/md/windows/Makefile
index f496b77c..b36b2c47 100644
--- a/pr/src/md/windows/Makefile
+++ b/pr/src/md/windows/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,17 @@
 
 #! gmake
 
-MOD_DEPTH = ../../../..
+MOD_DEPTH	= ../../../..
+topsrcdir	= ../../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
+
+ifdef USE_AUTOCONF
+OS_TARGET=$(MOZ_WIN32_TARGET)
+endif
 
 ifeq ($(OS_TARGET), WIN16)
 CSRCS = \
@@ -76,11 +85,11 @@ endif
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES += -D_NSPR_BUILD_
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/pr/src/memory/Makefile b/pr/src/memory/Makefile
index 5d25f3e5..9ab63f9b 100644
--- a/pr/src/memory/Makefile
+++ b/pr/src/memory/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,16 +18,22 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+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
 
@@ -36,11 +43,11 @@ endif
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES += -D_NSPR_BUILD_
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/pr/src/misc/Makefile b/pr/src/misc/Makefile
index b39e1389..d39705a3 100644
--- a/pr/src/misc/Makefile
+++ b/pr/src/misc/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,16 +18,22 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+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  \
@@ -44,7 +51,7 @@ CSRCS = \
 	prlong.c   \
 	prnetdb.c  \
 	prolock.c  \
-	prrng.c  \
+	prrng.c    \
 	prsystem.c \
 	prtime.c   \
 	prthinfo.c \
@@ -60,14 +67,15 @@ endif
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES	+= -D_NSPR_BUILD_
 
 RELEASE_BINS = compile-et.pl prerr.properties
 
-include $(MOD_DEPTH)/config/rules.mk
+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)
@@ -75,12 +83,13 @@ $(OBJDIR)/prdtoa.o:
 	@$(MAKE_OBJDIR)
 	$(CC) -o $@ -c $(filter-out -O, $(CFLAGS)) prdtoa.c
 endif
+endif #!USE_AUTOCONF
 
 #
 # Generate prerr.h, prerr.c, and prerr.properties from prerr.et.
 #
 build_prerr:
-	perl compile-et.pl prerr.et
+	$(PERL) $(srcdir)/compile-et.pl prerr.et
 
 export:: $(TARGETS)
 
diff --git a/pr/src/threads/Makefile b/pr/src/threads/Makefile
index a8e92e03..168fc6f2 100644
--- a/pr/src/threads/Makefile
+++ b/pr/src/threads/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,13 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
 
 ifdef USE_PTHREADS
     DIRS =
@@ -31,12 +36,14 @@ 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 = \
@@ -66,11 +73,11 @@ endif
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES	+= -D_NSPR_BUILD_
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/pr/src/threads/combined/Makefile b/pr/src/threads/combined/Makefile
index 750164af..e517f30a 100644
--- a/pr/src/threads/combined/Makefile
+++ b/pr/src/threads/combined/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,16 +18,22 @@
 
 #! gmake
 
-MOD_DEPTH = ../../../..
+MOD_DEPTH	= ../../../..
+topsrcdir	= ../../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+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
 
 ifdef USE_PTHREADS
 CSRCS =         \
@@ -43,11 +50,11 @@ endif
 
 TARGETS	= $(OBJS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+INCLUDES = -I$(includedir) -I$(topsrcdir)/pr/include -I$(topsrcdir)/pr/include/private
 
-DEFINES     += -D_NSPR_BUILD_
+DEFINES	+= -D_NSPR_BUILD_
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 export:: $(TARGETS)
 
diff --git a/pr/tests/Makefile b/pr/tests/Makefile
index 4c988e57..75c0ded1 100644
--- a/pr/tests/Makefile
+++ b/pr/tests/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,13 @@
 
 #! gmake
 
-MOD_DEPTH = ../..
+MOD_DEPTH	= ../..
+topsrcdir	= ../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
 
 ifeq ($(OS_TARGET), WIN16)
 OS_CFLAGS = $(OS_EXE_CFLAGS)
@@ -85,7 +90,6 @@ CSRCS =             \
 	lockfile.c      \
 	logger.c		\
 	makedir.c		\
-	mbcs.c          \
 	multiacc.c		\
 	multiwait.c		\
 	many_cv.c		\
@@ -192,7 +196,7 @@ PROGS = $(addprefix $(OBJDIR)/, $(CSRCS:.c=$(PROG_SUFFIX)))
 
 TARGETS = $(PROGS)
 
-INCLUDES = -I$(includedir) -I$(MOD_DEPTH)/pr/include -I$(MOD_DEPTH)/pr/include/private
+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.
@@ -200,6 +204,8 @@ 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
@@ -412,6 +418,19 @@ LDOPTS += -pthread
 endif
 endif
 
+ifeq ($(OS_ARCH),FreeBSD)
+ifeq ($(USE_PTHREADS),1)
+LDOPTS += -pthread
+endif
+LDOPTS += -Xlinker -R $(ABSOLUTE_LIB_DIR)
+endif
+
+ifeq ($(OS_ARCH),OpenBSD)
+ifeq ($(USE_PTHREADS),1)
+LDOPTS += -pthread
+endif
+endif
+
 ifeq ($(OS_ARCH),BSD_OS)
 ifneq ($(OS_RELEASE),1.1)
 EXTRA_LIBS = -ldl
@@ -431,14 +450,21 @@ LIBPTHREAD = -ldce
 endif
 endif
 
+endif # !USE_AUTOCONF
+
 #####################################################
 #
 # The rules
 #
 #####################################################
 
-include $(MOD_DEPTH)/config/rules.mk
+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)
@@ -499,10 +525,13 @@ endif
 endif
 endif
 
+endif # !USE_AUTOCONF
+
 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)
@@ -529,6 +558,8 @@ $(OBJDIR)/testfile: $(OBJDIR)/testfile.o
 	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(LIBPTHREAD) $(EXTRA_LIBS) -o $@
 endif
 
+endif # !USE_AUTOCONF
+
 #
 # Run the test programs with no arguments
 #
diff --git a/pr/tests/dll/Makefile b/pr/tests/dll/Makefile
index 458ff291..83b058da 100644
--- a/pr/tests/dll/Makefile
+++ b/pr/tests/dll/Makefile
@@ -1,3 +1,4 @@
+# Generated automatically from Makefile.in by configure.
 #
 # The contents of this file are subject to the Netscape Public License
 # Version 1.1 (the "NPL"); you may not use this file except in
@@ -17,9 +18,13 @@
 
 #! gmake
 
-MOD_DEPTH = ../../..
+MOD_DEPTH	= ../../..
+topsrcdir	= ../../..
+srcdir		= .
 
-include $(MOD_DEPTH)/config/config.mk
+include $(MOD_DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/config.mk
 
 # Disable optimization of the nspr on SunOS4.1.3
 ifeq ($(OS_ARCH),SunOS)
@@ -74,7 +79,7 @@ ifeq ($(OS_ARCH),Rhapsody)
 DSO_LDOPTS = -bundle
 endif
 
-include $(MOD_DEPTH)/config/rules.mk
+include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_TARGET), WIN16)
 # Note: The Win16 target: my.dll requires these macros