diff options
| author | cvs2hg <devnull@localhost> | 2001-04-16 18:27:59 +0000 |
|---|---|---|
| committer | cvs2hg <devnull@localhost> | 2001-04-16 18:27:59 +0000 |
| commit | 5d71bf2333092cfa51a21805f75d766252dbadad (patch) | |
| tree | 307bc57015eefa51f886c66084ceda623d337e45 | |
| parent | 7b9b5a1f3c9ff532b9ccdf1d9dc216d3c8046833 (diff) | |
| download | nss-hg-5d71bf2333092cfa51a21805f75d766252dbadad.tar.gz | |
fixup commit for branch 'FOLDER_OUTLINER_20010417_BRANCH'FOLDER_OUTLINER_20010417_BASE
382 files changed, 16619 insertions, 4412 deletions
diff --git a/security/coreconf/.cvsignore b/security/coreconf/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/coreconf/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/coreconf/AIX.mk b/security/coreconf/AIX.mk index 1f62cb0a3..1a07f7cbc 100644 --- a/security/coreconf/AIX.mk +++ b/security/coreconf/AIX.mk @@ -32,7 +32,7 @@ # # Config stuff for AIX. # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk # # There are two implementation strategies available on AIX: diff --git a/security/coreconf/AIX3.2.mk b/security/coreconf/AIX3.2.mk index c93a00eef..d46cc89c4 100644 --- a/security/coreconf/AIX3.2.mk +++ b/security/coreconf/AIX3.2.mk @@ -32,4 +32,4 @@ # # Config stuff for AIX3.2.5 # -include $(CORE_DEPTH)/coreconf/AIX.mk +include $(CORECONF_SOURCE)/AIX.mk diff --git a/security/coreconf/AIX4.1.mk b/security/coreconf/AIX4.1.mk index ba93b4ce2..52835bcad 100644 --- a/security/coreconf/AIX4.1.mk +++ b/security/coreconf/AIX4.1.mk @@ -33,7 +33,7 @@ # Config stuff for AIX4.1 # -include $(CORE_DEPTH)/coreconf/AIX.mk +include $(CORECONF_SOURCE)/AIX.mk AIX_LINK_OPTS += -bnso -berok diff --git a/security/coreconf/AIX4.2.mk b/security/coreconf/AIX4.2.mk index e68846ff4..9f0c5c641 100644 --- a/security/coreconf/AIX4.2.mk +++ b/security/coreconf/AIX4.2.mk @@ -34,7 +34,7 @@ # Config stuff for AIX4.2 # -include $(CORE_DEPTH)/coreconf/AIX.mk +include $(CORECONF_SOURCE)/AIX.mk OS_CFLAGS += -DAIX4_2 DSO_LDOPTS = -brtl -bM:SRE -bnoentry $(EXPORT_RULES) diff --git a/security/coreconf/AIX4.3.mk b/security/coreconf/AIX4.3.mk index 1446ccc9c..b430fb44d 100644 --- a/security/coreconf/AIX4.3.mk +++ b/security/coreconf/AIX4.3.mk @@ -33,7 +33,7 @@ # Config stuff for AIX4.3 # -include $(CORE_DEPTH)/coreconf/AIX.mk +include $(CORECONF_SOURCE)/AIX.mk ifeq ($(USE_64), 1) diff --git a/security/coreconf/BSD_OS.mk b/security/coreconf/BSD_OS.mk index fe0fe92ec..3355d19f7 100644 --- a/security/coreconf/BSD_OS.mk +++ b/security/coreconf/BSD_OS.mk @@ -33,7 +33,7 @@ # Config stuff for BSD/OS # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = gcc CC = gcc diff --git a/security/coreconf/FreeBSD.mk b/security/coreconf/FreeBSD.mk index a6136baba..f50d041dc 100644 --- a/security/coreconf/FreeBSD.mk +++ b/security/coreconf/FreeBSD.mk @@ -33,7 +33,7 @@ # Config stuff for FreeBSD # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = gcc CC = gcc diff --git a/security/coreconf/FreeBSD2.mk b/security/coreconf/FreeBSD2.mk index 8a3cf543f..c71e28654 100644 --- a/security/coreconf/FreeBSD2.mk +++ b/security/coreconf/FreeBSD2.mk @@ -33,4 +33,4 @@ # Config stuff for FreeBSD2 # -include $(CORE_DEPTH)/coreconf/FreeBSD.mk +include $(CORECONF_SOURCE)/FreeBSD.mk diff --git a/security/coreconf/HP-UX.mk b/security/coreconf/HP-UX.mk index 2519ec3de..f7be20bb7 100644 --- a/security/coreconf/HP-UX.mk +++ b/security/coreconf/HP-UX.mk @@ -34,7 +34,7 @@ # Config stuff for HP-UX # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = cc diff --git a/security/coreconf/HP-UXA.09.03.mk b/security/coreconf/HP-UXA.09.03.mk index 7ac02ae2a..cacf62154 100644 --- a/security/coreconf/HP-UXA.09.03.mk +++ b/security/coreconf/HP-UXA.09.03.mk @@ -41,4 +41,4 @@ endif # # Config stuff for HP-UXA.09.03 # -include $(CORE_DEPTH)/coreconf/HP-UXA.09.mk +include $(CORECONF_SOURCE)/HP-UXA.09.mk diff --git a/security/coreconf/HP-UXA.09.07.mk b/security/coreconf/HP-UXA.09.07.mk index 9fcf4c826..f314be59e 100644 --- a/security/coreconf/HP-UXA.09.07.mk +++ b/security/coreconf/HP-UXA.09.07.mk @@ -40,4 +40,4 @@ endif # # Config stuff for HP-UXA.09.07 # -include $(CORE_DEPTH)/coreconf/HP-UXA.09.mk +include $(CORECONF_SOURCE)/HP-UXA.09.mk diff --git a/security/coreconf/HP-UXA.09.mk b/security/coreconf/HP-UXA.09.mk index 813a16f40..6f2554fe2 100644 --- a/security/coreconf/HP-UXA.09.mk +++ b/security/coreconf/HP-UXA.09.mk @@ -33,6 +33,6 @@ # # Config stuff for HP-UXA.09 # -include $(CORE_DEPTH)/coreconf/HP-UX.mk +include $(CORECONF_SOURCE)/HP-UX.mk OS_CFLAGS += -DHPUX9 diff --git a/security/coreconf/HP-UXB.10.01.mk b/security/coreconf/HP-UXB.10.01.mk index 718ee1184..f2f3502a0 100644 --- a/security/coreconf/HP-UXB.10.01.mk +++ b/security/coreconf/HP-UXB.10.01.mk @@ -37,4 +37,4 @@ endif # # Config stuff for HP-UXB.10.01 # -include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk +include $(CORECONF_SOURCE)/HP-UXB.10.mk diff --git a/security/coreconf/HP-UXB.10.10.mk b/security/coreconf/HP-UXB.10.10.mk index 54a78e6e2..9002ed452 100644 --- a/security/coreconf/HP-UXB.10.10.mk +++ b/security/coreconf/HP-UXB.10.10.mk @@ -41,7 +41,7 @@ endif # # Config stuff for HP-UXB.10.10 # -include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk +include $(CORECONF_SOURCE)/HP-UXB.10.mk OS_CFLAGS += -DHPUX10_10 diff --git a/security/coreconf/HP-UXB.10.20.mk b/security/coreconf/HP-UXB.10.20.mk index 5c14b9844..0c30374ef 100644 --- a/security/coreconf/HP-UXB.10.20.mk +++ b/security/coreconf/HP-UXB.10.20.mk @@ -41,7 +41,7 @@ endif # # Config stuff for HP-UXB.10.20 # -include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk +include $(CORECONF_SOURCE)/HP-UXB.10.mk OS_CFLAGS += -DHPUX10_20 diff --git a/security/coreconf/HP-UXB.10.30.mk b/security/coreconf/HP-UXB.10.30.mk index ef52d1122..9d1031a12 100644 --- a/security/coreconf/HP-UXB.10.30.mk +++ b/security/coreconf/HP-UXB.10.30.mk @@ -41,7 +41,7 @@ endif # # Config stuff for HP-UXB.10.30. # -include $(CORE_DEPTH)/coreconf/HP-UXB.10.mk +include $(CORECONF_SOURCE)/HP-UXB.10.mk OS_CFLAGS += -DHPUX10_30 diff --git a/security/coreconf/HP-UXB.10.mk b/security/coreconf/HP-UXB.10.mk index 77ca9bce7..039846dba 100644 --- a/security/coreconf/HP-UXB.10.mk +++ b/security/coreconf/HP-UXB.10.mk @@ -32,7 +32,7 @@ # # Config stuff for HP-UXB.10 # -include $(CORE_DEPTH)/coreconf/HP-UX.mk +include $(CORECONF_SOURCE)/HP-UX.mk OS_CFLAGS += -DHPUX10 OS_LIBS += -lpthread -lm diff --git a/security/coreconf/HP-UXB.11.00.mk b/security/coreconf/HP-UXB.11.00.mk index 0732202ae..b89a459f3 100644 --- a/security/coreconf/HP-UXB.11.00.mk +++ b/security/coreconf/HP-UXB.11.00.mk @@ -52,4 +52,4 @@ endif # # Config stuff for HP-UXB.11.00. # -include $(CORE_DEPTH)/coreconf/HP-UXB.11.mk +include $(CORECONF_SOURCE)/HP-UXB.11.mk diff --git a/security/coreconf/HP-UXB.11.mk b/security/coreconf/HP-UXB.11.mk index 08463214d..468cbc73c 100644 --- a/security/coreconf/HP-UXB.11.mk +++ b/security/coreconf/HP-UXB.11.mk @@ -32,7 +32,7 @@ # # Config stuff for HP-UXB.11 # -include $(CORE_DEPTH)/coreconf/HP-UX.mk +include $(CORECONF_SOURCE)/HP-UX.mk ifdef USE_LONG_LONGS USE_HYBRID = 1 diff --git a/security/coreconf/IRIX.mk b/security/coreconf/IRIX.mk index cc976e04c..e2f39b50a 100644 --- a/security/coreconf/IRIX.mk +++ b/security/coreconf/IRIX.mk @@ -33,7 +33,7 @@ # Config stuff for IRIX # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk # # The default implementation strategy for Irix is classic nspr. diff --git a/security/coreconf/IRIX5.2.mk b/security/coreconf/IRIX5.2.mk index fbb4a137b..f1da84cd7 100644 --- a/security/coreconf/IRIX5.2.mk +++ b/security/coreconf/IRIX5.2.mk @@ -32,4 +32,4 @@ # # Config stuff for IRIX 5.2 # -include $(CORE_DEPTH)/coreconf/IRIX5.mk +include $(CORECONF_SOURCE)/IRIX5.mk diff --git a/security/coreconf/IRIX5.3.mk b/security/coreconf/IRIX5.3.mk index b7134592b..a14d83f47 100644 --- a/security/coreconf/IRIX5.3.mk +++ b/security/coreconf/IRIX5.3.mk @@ -32,6 +32,6 @@ # # Config stuff for IRIX 5.3 # -include $(CORE_DEPTH)/coreconf/IRIX5.mk +include $(CORECONF_SOURCE)/IRIX5.mk OS_CFLAGS += -DIRIX5_3 diff --git a/security/coreconf/IRIX5.mk b/security/coreconf/IRIX5.mk index 56bfb0ea5..b0846dc57 100644 --- a/security/coreconf/IRIX5.mk +++ b/security/coreconf/IRIX5.mk @@ -33,7 +33,7 @@ # Config stuff for IRIX 5 # -include $(CORE_DEPTH)/coreconf/IRIX.mk +include $(CORECONF_SOURCE)/IRIX.mk ifndef NS_USE_GCC ODD_CFLAGS += -xgot diff --git a/security/coreconf/IRIX6.2.mk b/security/coreconf/IRIX6.2.mk index e17a0c3b6..a0d79777a 100644 --- a/security/coreconf/IRIX6.2.mk +++ b/security/coreconf/IRIX6.2.mk @@ -38,6 +38,6 @@ SHLIB_LD_OPTS += -no_unresolved -include $(CORE_DEPTH)/coreconf/IRIX6.mk +include $(CORECONF_SOURCE)/IRIX6.mk OS_CFLAGS += -DIRIX6_2 diff --git a/security/coreconf/IRIX6.3.mk b/security/coreconf/IRIX6.3.mk index a684a1e11..3821cb116 100644 --- a/security/coreconf/IRIX6.3.mk +++ b/security/coreconf/IRIX6.3.mk @@ -37,6 +37,6 @@ SHLIB_LD_OPTS += -no_unresolved -include $(CORE_DEPTH)/coreconf/IRIX6.mk +include $(CORECONF_SOURCE)/IRIX6.mk OS_CFLAGS += -DIRIX6_3 diff --git a/security/coreconf/IRIX6.5.mk b/security/coreconf/IRIX6.5.mk index 7f68d82cb..b996aa77b 100644 --- a/security/coreconf/IRIX6.5.mk +++ b/security/coreconf/IRIX6.5.mk @@ -37,6 +37,6 @@ SHLIB_LD_OPTS += -no_unresolved -include $(CORE_DEPTH)/coreconf/IRIX6.mk +include $(CORECONF_SOURCE)/IRIX6.mk OS_CFLAGS += -DIRIX6_5 -mips3 diff --git a/security/coreconf/IRIX6.mk b/security/coreconf/IRIX6.mk index a401dc6f3..5dbacba2b 100644 --- a/security/coreconf/IRIX6.mk +++ b/security/coreconf/IRIX6.mk @@ -33,7 +33,7 @@ # Config stuff for IRIX 6 # -include $(CORE_DEPTH)/coreconf/IRIX.mk +include $(CORECONF_SOURCE)/IRIX.mk ifndef NS_USE_GCC ifneq ($(USE_N32),1) diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk index 8024ac7e7..aa075e017 100644 --- a/security/coreconf/Linux.mk +++ b/security/coreconf/Linux.mk @@ -33,7 +33,7 @@ # Config stuff for Linux # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk # # The default implementation strategy for Linux is now pthreads diff --git a/security/coreconf/Linux2.1.mk b/security/coreconf/Linux2.1.mk index bfbfe6b90..fba23a5d9 100644 --- a/security/coreconf/Linux2.1.mk +++ b/security/coreconf/Linux2.1.mk @@ -33,7 +33,7 @@ # Config stuff for Linux 2.1 (ELF) # -include $(CORE_DEPTH)/coreconf/Linux.mk +include $(CORECONF_SOURCE)/Linux.mk ifeq ($(OS_RELEASE),2.1) OS_REL_CFLAGS += -DLINUX2_1 MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) diff --git a/security/coreconf/Linux2.2.mk b/security/coreconf/Linux2.2.mk index c552c1d76..92e2fcd94 100644 --- a/security/coreconf/Linux2.2.mk +++ b/security/coreconf/Linux2.2.mk @@ -33,7 +33,7 @@ # Config stuff for Linux 2.2 (ELF) # -include $(CORE_DEPTH)/coreconf/Linux.mk +include $(CORECONF_SOURCE)/Linux.mk OS_REL_CFLAGS += -DLINUX2_1 MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) diff --git a/security/coreconf/Linux2.4.mk b/security/coreconf/Linux2.4.mk index 3665f5bb3..89718521f 100644 --- a/security/coreconf/Linux2.4.mk +++ b/security/coreconf/Linux2.4.mk @@ -33,7 +33,7 @@ # Config stuff for Linux 2.4 (ELF) # -include $(CORE_DEPTH)/coreconf/Linux.mk +include $(CORECONF_SOURCE)/Linux.mk OS_REL_CFLAGS += -DLINUX2_1 MKSHLIB = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so) diff --git a/security/coreconf/LinuxELF1.2.mk b/security/coreconf/LinuxELF1.2.mk index 860787958..247af1feb 100644 --- a/security/coreconf/LinuxELF1.2.mk +++ b/security/coreconf/LinuxELF1.2.mk @@ -33,4 +33,4 @@ # Config stuff for Linux 1.2 (ELF) # -include $(CORE_DEPTH)/coreconf/Linux.mk +include $(CORECONF_SOURCE)/Linux.mk diff --git a/security/coreconf/LinuxELF2.0.mk b/security/coreconf/LinuxELF2.0.mk index a85dfafa9..ae10c6e6d 100644 --- a/security/coreconf/LinuxELF2.0.mk +++ b/security/coreconf/LinuxELF2.0.mk @@ -33,4 +33,4 @@ # Config stuff for Linux 2.0 (ELF) # -include $(CORE_DEPTH)/coreconf/Linux.mk +include $(CORECONF_SOURCE)/Linux.mk diff --git a/security/coreconf/Makefile b/security/coreconf/Makefile.in index 9f6fd6078..d880e7b2f 100644 --- a/security/coreconf/Makefile +++ b/security/coreconf/Makefile.in @@ -30,14 +30,16 @@ # may use your version of this file under either the MPL or the # GPL. # -DEPTH = .. + CORE_DEPTH = .. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@:$(CORECONF_SOURCE) -MODULE = coreconf +DIRS = nsinstall -DIRS = nsinstall mkdepend md +include autoconf.mk -include $(DEPTH)/coreconf/config.mk -include $(DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/config.mk -export:: libs +include $(CORECONF_SOURCE)/rules.mk diff --git a/security/coreconf/NCR3.0.mk b/security/coreconf/NCR3.0.mk index 8193bd1f5..72e0fe89d 100644 --- a/security/coreconf/NCR3.0.mk +++ b/security/coreconf/NCR3.0.mk @@ -33,7 +33,7 @@ # Config stuff for NCR SysVr4 v 3.0 # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = cc diff --git a/security/coreconf/NEC4.2.mk b/security/coreconf/NEC4.2.mk index 8e635f1ca..9c867e166 100644 --- a/security/coreconf/NEC4.2.mk +++ b/security/coreconf/NEC4.2.mk @@ -33,7 +33,7 @@ # Config stuff for NEC Mips SYSV # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = $(CORE_DEPTH)/build/hcc diff --git a/security/coreconf/NetBSD.mk b/security/coreconf/NetBSD.mk index cecf69695..d70283d39 100644 --- a/security/coreconf/NetBSD.mk +++ b/security/coreconf/NetBSD.mk @@ -33,7 +33,7 @@ # Config stuff for NetBSD # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = gcc CC = gcc diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk index 1a85c76db..9f866fad7 100644 --- a/security/coreconf/OS2.mk +++ b/security/coreconf/OS2.mk @@ -143,7 +143,7 @@ SHLIB_LDENDFILE = endif #NO_SHARED_LIB OS_CFLAGS = /Q /qlibansi /Gd /Gm /Su4 /Mp /Tl- -INCLUDES += -I$(CORE_DEPTH)/../dist/include +INCLUDES += -I$(MOD_DEPTH)/../../dist/include DEFINES += -DXP_OS2_VACPP -DTCPV40HDRS # Where the libraries are @@ -173,12 +173,12 @@ endif # XP_OS2_VACPP # OS/2 use nsinstall that is included in the toolkit. # since we do not wish to support and maintain 3 version of nsinstall in mozilla, nspr and nss -NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall +NSINSTALL_DIR = $(CORECONF_SOURCE)/nsinstall # NSINSTALL = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall NSINSTALL = nsinstall # HCT4OS2 INSTALL = $(NSINSTALL) -MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend +MKDEPEND_DIR = $(CORECONF_SOURCE)/mkdepend MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend MKDEPENDENCIES = $(OBJDIR_NAME)/depend.mk diff --git a/security/coreconf/OSF1.mk b/security/coreconf/OSF1.mk index 0db32e30c..e2973260a 100644 --- a/security/coreconf/OSF1.mk +++ b/security/coreconf/OSF1.mk @@ -40,7 +40,7 @@ # SHELL = /usr/bin/ksh -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = cc diff --git a/security/coreconf/OSF1V2.0.mk b/security/coreconf/OSF1V2.0.mk index de7dab643..093e61b1a 100644 --- a/security/coreconf/OSF1V2.0.mk +++ b/security/coreconf/OSF1V2.0.mk @@ -32,4 +32,4 @@ # # Config stuff for DEC OSF/1 V2.0 # -include $(CORE_DEPTH)/coreconf/OSF1.mk +include $(CORECONF_SOURCE)/OSF1.mk diff --git a/security/coreconf/OSF1V3.0.mk b/security/coreconf/OSF1V3.0.mk index 623b2f971..22ff08d52 100644 --- a/security/coreconf/OSF1V3.0.mk +++ b/security/coreconf/OSF1V3.0.mk @@ -32,4 +32,4 @@ # # Config stuff for DEC OSF/1 V3.0 # -include $(CORE_DEPTH)/coreconf/OSF1.mk +include $(CORECONF_SOURCE)/OSF1.mk diff --git a/security/coreconf/OSF1V3.2.mk b/security/coreconf/OSF1V3.2.mk index 9d584b37b..fec928412 100644 --- a/security/coreconf/OSF1V3.2.mk +++ b/security/coreconf/OSF1V3.2.mk @@ -37,7 +37,7 @@ # # Config stuff for DEC OSF/1 V3.2 # -include $(CORE_DEPTH)/coreconf/OSF1.mk +include $(CORECONF_SOURCE)/OSF1.mk ifeq ($(OS_RELEASE),V3.2) OS_CFLAGS += -DOSF1V3 diff --git a/security/coreconf/OSF1V4.0.mk b/security/coreconf/OSF1V4.0.mk index 164a6613a..191c9504a 100644 --- a/security/coreconf/OSF1V4.0.mk +++ b/security/coreconf/OSF1V4.0.mk @@ -44,7 +44,7 @@ endif # # Config stuff for DEC OSF/1 V4.0 # -include $(CORE_DEPTH)/coreconf/OSF1.mk +include $(CORECONF_SOURCE)/OSF1.mk ifeq ($(OS_RELEASE),V4.0) OS_CFLAGS += -DOSF1V4 diff --git a/security/coreconf/OSF1V4.0B.mk b/security/coreconf/OSF1V4.0B.mk index 73f357d17..6aa110ad0 100644 --- a/security/coreconf/OSF1V4.0B.mk +++ b/security/coreconf/OSF1V4.0B.mk @@ -32,4 +32,4 @@ # # Config stuff for DEC OSF/1 V4.0B # -include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk +include $(CORECONF_SOURCE)/OSF1V4.0.mk diff --git a/security/coreconf/OSF1V4.0D.mk b/security/coreconf/OSF1V4.0D.mk index 515c76d5f..3d1bea96e 100644 --- a/security/coreconf/OSF1V4.0D.mk +++ b/security/coreconf/OSF1V4.0D.mk @@ -32,7 +32,7 @@ # # Config stuff for DEC OSF/1 V4.0D # -include $(CORE_DEPTH)/coreconf/OSF1V4.0.mk +include $(CORECONF_SOURCE)/OSF1V4.0.mk DEFINES += -DOSF1V4D OS_LIBS += -lpthread -lrt diff --git a/security/coreconf/OSF1V5.0.mk b/security/coreconf/OSF1V5.0.mk index 176ca0845..df02e4213 100644 --- a/security/coreconf/OSF1V5.0.mk +++ b/security/coreconf/OSF1V5.0.mk @@ -44,4 +44,4 @@ endif # # Config stuff for DEC OSF/1 V5.0 # -include $(CORE_DEPTH)/coreconf/OSF1.mk +include $(CORECONF_SOURCE)/OSF1.mk diff --git a/security/coreconf/OpenVMS.mk b/security/coreconf/OpenVMS.mk index f387eeaa9..b597893ea 100755 --- a/security/coreconf/OpenVMS.mk +++ b/security/coreconf/OpenVMS.mk @@ -19,7 +19,7 @@ # Config stuff for Compaq OpenVMS # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk ifdef INTERNAL_TOOLS CC = c89 diff --git a/security/coreconf/OpenVMSV7.1-2.mk b/security/coreconf/OpenVMSV7.1-2.mk index eb7d67a3f..9153a4a38 100755 --- a/security/coreconf/OpenVMSV7.1-2.mk +++ b/security/coreconf/OpenVMSV7.1-2.mk @@ -19,4 +19,4 @@ # Config stuff for Compaq OpenVMS # -include $(CORE_DEPTH)/coreconf/OpenVMS.mk +include $(CORECONF_SOURCE)/OpenVMS.mk diff --git a/security/coreconf/ReliantUNIX.mk b/security/coreconf/ReliantUNIX.mk index 8167394cb..1e2211d6c 100644 --- a/security/coreconf/ReliantUNIX.mk +++ b/security/coreconf/ReliantUNIX.mk @@ -33,7 +33,7 @@ # Config stuff for ReliantUNIX # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = cc diff --git a/security/coreconf/ReliantUNIX5.4.mk b/security/coreconf/ReliantUNIX5.4.mk index a5bca60a3..64abbca0c 100644 --- a/security/coreconf/ReliantUNIX5.4.mk +++ b/security/coreconf/ReliantUNIX5.4.mk @@ -32,4 +32,4 @@ # # Config stuff for ReliantUNIX5.4 # -include $(CORE_DEPTH)/coreconf/ReliantUNIX.mk +include $(CORECONF_SOURCE)/ReliantUNIX.mk diff --git a/security/coreconf/SCOOS5.0.mk b/security/coreconf/SCOOS5.0.mk index b3370a1fd..1e380c445 100644 --- a/security/coreconf/SCOOS5.0.mk +++ b/security/coreconf/SCOOS5.0.mk @@ -33,4 +33,4 @@ # Config stuff for SCO OpenServer 5.0 for x86. # -include $(CORE_DEPTH)/coreconf/SCO_SV3.2.mk +include $(CORECONF_SOURCE)/SCO_SV3.2.mk diff --git a/security/coreconf/SCO_SV3.2.mk b/security/coreconf/SCO_SV3.2.mk index e9d13b30c..b313aa137 100644 --- a/security/coreconf/SCO_SV3.2.mk +++ b/security/coreconf/SCO_SV3.2.mk @@ -33,7 +33,7 @@ # Config stuff for SCO Unix for x86. # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = cc diff --git a/security/coreconf/SunOS4.1.3_U1.mk b/security/coreconf/SunOS4.1.3_U1.mk index 1bea16fc3..92c4841da 100644 --- a/security/coreconf/SunOS4.1.3_U1.mk +++ b/security/coreconf/SunOS4.1.3_U1.mk @@ -33,7 +33,7 @@ # Config stuff for SunOS4.1 # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = cc diff --git a/security/coreconf/SunOS5.3.mk b/security/coreconf/SunOS5.3.mk index e103d9f57..ac5970452 100644 --- a/security/coreconf/SunOS5.3.mk +++ b/security/coreconf/SunOS5.3.mk @@ -35,4 +35,4 @@ SOL_CFLAGS = -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk diff --git a/security/coreconf/SunOS5.4.mk b/security/coreconf/SunOS5.4.mk index fe24c33e0..695556d16 100644 --- a/security/coreconf/SunOS5.4.mk +++ b/security/coreconf/SunOS5.4.mk @@ -35,4 +35,4 @@ SOL_CFLAGS = -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk diff --git a/security/coreconf/SunOS5.4_i86pc.mk b/security/coreconf/SunOS5.4_i86pc.mk index bed9893ed..99e374efd 100644 --- a/security/coreconf/SunOS5.4_i86pc.mk +++ b/security/coreconf/SunOS5.4_i86pc.mk @@ -33,7 +33,7 @@ # Config stuff for Solaris 2.4 on x86 # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = cc diff --git a/security/coreconf/SunOS5.5.1.mk b/security/coreconf/SunOS5.5.1.mk index f85932b59..9a700dd53 100644 --- a/security/coreconf/SunOS5.5.1.mk +++ b/security/coreconf/SunOS5.5.1.mk @@ -35,7 +35,7 @@ SOL_CFLAGS += -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk ifeq ($(OS_RELEASE),5.5.1) OS_DEFINES += -DSOLARIS2_5 diff --git a/security/coreconf/SunOS5.5.1_i86pc.mk b/security/coreconf/SunOS5.5.1_i86pc.mk index 978286856..1592173df 100644 --- a/security/coreconf/SunOS5.5.1_i86pc.mk +++ b/security/coreconf/SunOS5.5.1_i86pc.mk @@ -35,7 +35,7 @@ SOL_CFLAGS = -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk CPU_ARCH = x86 OS_DEFINES += -Di386 diff --git a/security/coreconf/SunOS5.5.mk b/security/coreconf/SunOS5.5.mk index e83356f15..efa32cc45 100644 --- a/security/coreconf/SunOS5.5.mk +++ b/security/coreconf/SunOS5.5.mk @@ -35,7 +35,7 @@ SOL_CFLAGS += -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk ifeq ($(OS_RELEASE),5.5) OS_DEFINES += -DSOLARIS2_5 diff --git a/security/coreconf/SunOS5.6.mk b/security/coreconf/SunOS5.6.mk index 774d2b7a6..88b0d1dd8 100644 --- a/security/coreconf/SunOS5.6.mk +++ b/security/coreconf/SunOS5.6.mk @@ -35,7 +35,7 @@ SOL_CFLAGS += -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk ifeq ($(OS_RELEASE),5.6) OS_DEFINES += -DSOLARIS2_6 diff --git a/security/coreconf/SunOS5.6_i86pc.mk b/security/coreconf/SunOS5.6_i86pc.mk index 286ff3505..d011dd294 100644 --- a/security/coreconf/SunOS5.6_i86pc.mk +++ b/security/coreconf/SunOS5.6_i86pc.mk @@ -35,7 +35,7 @@ SOL_CFLAGS = -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk CPU_ARCH = x86 OS_DEFINES += -Di386 diff --git a/security/coreconf/SunOS5.7.mk b/security/coreconf/SunOS5.7.mk index dd676e2a9..37c8a5a88 100644 --- a/security/coreconf/SunOS5.7.mk +++ b/security/coreconf/SunOS5.7.mk @@ -35,7 +35,7 @@ SOL_CFLAGS += -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk ifeq ($(OS_RELEASE),5.7) OS_DEFINES += -DSOLARIS2_7 diff --git a/security/coreconf/SunOS5.7_i86pc.mk b/security/coreconf/SunOS5.7_i86pc.mk index ab8c66f84..4f7e245fa 100644 --- a/security/coreconf/SunOS5.7_i86pc.mk +++ b/security/coreconf/SunOS5.7_i86pc.mk @@ -35,7 +35,7 @@ SOL_CFLAGS = -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk CPU_ARCH = x86 OS_DEFINES += -Di386 diff --git a/security/coreconf/SunOS5.8.mk b/security/coreconf/SunOS5.8.mk index 95fc01090..6dcfad733 100644 --- a/security/coreconf/SunOS5.8.mk +++ b/security/coreconf/SunOS5.8.mk @@ -35,7 +35,7 @@ SOL_CFLAGS += -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk ifeq ($(OS_RELEASE),5.8) OS_DEFINES += -DSOLARIS2_8 diff --git a/security/coreconf/SunOS5.8_i86pc.mk b/security/coreconf/SunOS5.8_i86pc.mk index 7b2c71a64..eb46416b9 100644 --- a/security/coreconf/SunOS5.8_i86pc.mk +++ b/security/coreconf/SunOS5.8_i86pc.mk @@ -35,7 +35,7 @@ SOL_CFLAGS = -D_SVID_GETTOD -include $(CORE_DEPTH)/coreconf/SunOS5.mk +include $(CORECONF_SOURCE)/SunOS5.mk CPU_ARCH = x86 OS_DEFINES += -Di386 diff --git a/security/dbm/manifest.mn b/security/coreconf/SunOS5.9.mk index 4cfffae43..6d939af00 100644..100755 --- a/security/dbm/manifest.mn +++ b/security/coreconf/SunOS5.9.mk @@ -1,4 +1,3 @@ -#! gmake # # The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file @@ -31,16 +30,15 @@ # may use your version of this file under either the MPL or the # GPL. # +# Config stuff for SunOS5.9 +# -CORE_DEPTH = .. - -MODULE = dbm +SOL_CFLAGS += -D_SVID_GETTOD -#IMPORTS = nspr20/v3.5 -IMPORTS = nspr20/v4.0 +include $(CORECONF_SOURCE)/SunOS5.mk -RELEASE = dbm +ifeq ($(OS_RELEASE),5.9) + OS_DEFINES += -DSOLARIS2_9 +endif -DIRS = include \ - src \ - $(NULL) +OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc diff --git a/security/nss/lib/jar/Makefile b/security/coreconf/SunOS5.9_i86pc.mk index 063e5daf7..c0215a8b0 100644..100755 --- a/security/nss/lib/jar/Makefile +++ b/security/coreconf/SunOS5.9_i86pc.mk @@ -1,5 +1,4 @@ -#! gmake -# +# # The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -14,7 +13,7 @@ # # The Initial Developer of the Original Code is Netscape # Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Copyright (C) 2000 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): @@ -31,9 +30,18 @@ # may use your version of this file under either the MPL or the # GPL. # +# Config stuff for Solaris 9 on x86 +# + +SOL_CFLAGS = -D_SVID_GETTOD + +include $(CORECONF_SOURCE)/SunOS5.mk + +CPU_ARCH = x86 +OS_DEFINES += -Di386 -include manifest.mn -include $(CORE_DEPTH)/coreconf/config.mk -include config.mk -include $(CORE_DEPTH)/coreconf/rules.mk +ifeq ($(OS_RELEASE),5.9_i86pc) + OS_DEFINES += -DSOLARIS2_9 +endif +OS_LIBS += -lthread -lnsl -lsocket -lposix4 -ldl -lc diff --git a/security/coreconf/SunOS5.mk b/security/coreconf/SunOS5.mk index 1e1b1db99..3babad0cc 100644 --- a/security/coreconf/SunOS5.mk +++ b/security/coreconf/SunOS5.mk @@ -33,18 +33,7 @@ # Config stuff for SunOS5.x # -include $(CORE_DEPTH)/coreconf/UNIX.mk - -ifeq ($(USE_64), 1) - ARCHFLAG=-xarch=v9 - LD=/usr/ccs/bin/ld -else - ifdef USE_HYBRID - ARCHFLAG=-xarch=v8plus - else - ARCHFLAG=-xarch=v8 - endif -endif +include $(CORECONF_SOURCE)/UNIX.mk # # Temporary define for the Client; to be removed when binary release is used @@ -56,6 +45,35 @@ ifdef MOZILLA_CLIENT endif endif +# Sun's WorkShop defines v8, v8plus and v9 architectures. +# gcc on Solaris defines v8 and v9 "cpus". +# gcc's v9 is equivalent to Workshop's v8plus. +# gcc apparently has no equivalent to Workshop's v9 +# We always use Sun's assembler and linker, which use Sun's naming convention. + +ifeq ($(USE_64), 1) + ifdef NS_USE_GCC + ARCHFLAG= UNKNOWN + else + ARCHFLAG=-xarch=v9 + endif + LD=/usr/ccs/bin/ld +else + ifdef NS_USE_GCC + ifdef USE_HYBRID + ARCHFLAG=-mcpu=v9 -Wa,-xarch=v8plus + else + ARCHFLAG=-mcpu=v8 + endif + else + ifdef USE_HYBRID + ARCHFLAG=-xarch=v8plus + else + ARCHFLAG=-xarch=v8 + endif + endif +endif + # # The default implementation strategy for Solaris is classic nspr. # @@ -87,6 +105,7 @@ ifdef NS_USE_GCC else OS_CFLAGS += $(NOMD_OS_CFLAGS) -MDupdate $(DEPENDENCIES) endif + OS_CFLAGS += $(ARCHFLAG) else CC = cc CCC = CC diff --git a/security/coreconf/UNIX.mk b/security/coreconf/UNIX.mk index cbeac85fd..25165c3a5 100644 --- a/security/coreconf/UNIX.mk +++ b/security/coreconf/UNIX.mk @@ -46,10 +46,10 @@ else DEFINES += -DDEBUG -UNDEBUG -DDEBUG_$(shell whoami) endif -NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall +NSINSTALL_DIR = $(MOD_DEPTH)/coreconf/nsinstall NSINSTALL = $(NSINSTALL_DIR)/$(OBJDIR_NAME)/nsinstall -MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend +MKDEPEND_DIR = $(MOD_DEPTH)/coreconf/mkdepend MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend MKDEPENDENCIES = $(OBJDIR_NAME)/depend.mk diff --git a/security/coreconf/UNIXWARE2.1.mk b/security/coreconf/UNIXWARE2.1.mk index b9bd69900..581016ad6 100644 --- a/security/coreconf/UNIXWARE2.1.mk +++ b/security/coreconf/UNIXWARE2.1.mk @@ -35,7 +35,7 @@ # Config stuff for SCO Unixware 2.1 # -include $(CORE_DEPTH)/coreconf/UNIX.mk +include $(CORECONF_SOURCE)/UNIX.mk DEFAULT_COMPILER = $(CORE_DEPTH)/build/hcc diff --git a/security/coreconf/WIN16.mk b/security/coreconf/WIN16.mk index 68832d21c..0143c194b 100644 --- a/security/coreconf/WIN16.mk +++ b/security/coreconf/WIN16.mk @@ -73,7 +73,7 @@ RC = wrc.exe RC += /r /dWIN16=1 /bt=windows RANLIB = echo BSDECHO = echo -NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall +NSINSTALL_DIR = $(CORECONF_SOURCE)/nsinstall NSINSTALL = nsinstall INSTALL = $(NSINSTALL) MAKE_OBJDIR = mkdir diff --git a/security/coreconf/WIN32.mk b/security/coreconf/WIN32.mk index 7bc23a334..e8c7306a1 100644 --- a/security/coreconf/WIN32.mk +++ b/security/coreconf/WIN32.mk @@ -46,10 +46,10 @@ AR += -NOLOGO -OUT:"$@" RANLIB = echo BSDECHO = echo -NSINSTALL_DIR = $(CORE_DEPTH)/coreconf/nsinstall +NSINSTALL_DIR = $(MOD_DEPTH)/coreconf/nsinstall NSINSTALL = nsinstall -MKDEPEND_DIR = $(CORE_DEPTH)/coreconf/mkdepend +MKDEPEND_DIR = $(MOD_DEPTH)/coreconf/mkdepend MKDEPEND = $(MKDEPEND_DIR)/$(OBJDIR_NAME)/mkdepend.exe # Note: MKDEPENDENCIES __MUST__ be a relative pathname, not absolute. # If it is absolute, gmake will crash unless the named file exists. diff --git a/security/coreconf/WIN954.0.mk b/security/coreconf/WIN954.0.mk index 8b99703fe..f109ab796 100644 --- a/security/coreconf/WIN954.0.mk +++ b/security/coreconf/WIN954.0.mk @@ -38,7 +38,7 @@ # CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS. # PROCESSOR is an internal variable. -include $(CORE_DEPTH)/coreconf/WIN32.mk +include $(CORECONF_SOURCE)/WIN32.mk PROCESSOR := $(shell uname -p) ifeq ($(PROCESSOR), I386) diff --git a/security/coreconf/WINNT3.51.mk b/security/coreconf/WINNT3.51.mk index 606e7a3b1..f33128db7 100644 --- a/security/coreconf/WINNT3.51.mk +++ b/security/coreconf/WINNT3.51.mk @@ -39,7 +39,7 @@ # It has the following internal variables: # OS_PROC_CFLAGS and OS_WIN_CFLAGS. -include $(CORE_DEPTH)/coreconf/WIN32.mk +include $(CORECONF_SOURCE)/WIN32.mk PROCESSOR := $(shell uname -p) ifeq ($(PROCESSOR), I386) diff --git a/security/coreconf/WINNT4.0.mk b/security/coreconf/WINNT4.0.mk index c760bb4fb..5f3edbba5 100644 --- a/security/coreconf/WINNT4.0.mk +++ b/security/coreconf/WINNT4.0.mk @@ -38,7 +38,7 @@ # CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS. # PROCESSOR is an internal variable. -include $(CORE_DEPTH)/coreconf/WIN32.mk +include $(CORECONF_SOURCE)/WIN32.mk PROCESSOR := $(shell uname -p) ifeq ($(PROCESSOR), I386) diff --git a/security/coreconf/WINNT5.0.mk b/security/coreconf/WINNT5.0.mk index 844e7c048..d53c143d7 100644 --- a/security/coreconf/WINNT5.0.mk +++ b/security/coreconf/WINNT5.0.mk @@ -38,7 +38,7 @@ # CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS. # PROCESSOR is an internal variable. -include $(CORE_DEPTH)/coreconf/WIN32.mk +include $(CORECONF_SOURCE)/WIN32.mk PROCESSOR := $(shell uname -p) ifeq ($(PROCESSOR), I386) diff --git a/security/coreconf/autoconf.mk.in b/security/coreconf/autoconf.mk.in new file mode 100644 index 000000000..39bd91d04 --- /dev/null +++ b/security/coreconf/autoconf.mk.in @@ -0,0 +1,71 @@ +USE_AUTOCONF = 1 +NO_MDUPDATE = 1 +OBJDIR_NAME = . + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +includedir = @includedir@ +libdir = @libdir@ +datadir = @datadir@ + +dist_prefix = @dist_prefix@ +dist_bindir = @dist_bindir@ +dist_includedir = @dist_includedir@ +dist_libdir = @dist_libdir@ + +DIST = $(dist_prefix) + +CORECONF_SOURCE = @CORECONF_SOURCE@ + +MOZILLA_CLIENT = @MOZILLA_CLIENT@ +ENABLE_CMD = @ENABLE_CMD@ + +GNU_CC = @GNU_CC@ +GNU_CXX = @GNU_CXX@ +CC = @CC@ +CCC = @CXX@ +OS_CFLAGS = @CFLAGS@ @DSO_CFLAGS@ +CXXFLAGS = @CXXFLAGS@ @DSO_CFLAGS@ +HOST_CC = @HOST_CC@ +HOST_CFLAGS = @HOST_CFLAGS@ +LDFLAGS = @LDFLAGS@ + +COMPILER_DEPEND = @COMPILER_DEPEND@ +MDDEPDIR := @MDDEPDIR@ + +USE_PTHREADS = @USE_PTHREADS@ + +LIB_SUFFIX = @LIB_SUFFIX@ +DLL_SUFFIX = @DLL_SUFFIX@ +MKSHLIB = @MKSHLIB@ +DSO_CFLAGS = @DSO_CFLAGS@ +DSO_LDOPTS = @DSO_LDOPTS@ + +CPU_ARCH = @CPU_ARCH@ + +OS_TARGET = @OS_TARGET@ +OS_ARCH = @OS_ARCH@ +OS_RELEASE = @OS_RELEASE@ +OS_TEST = @OS_TEST@ + +DEFINES = @DEFINES@ @DEFS@ +AR = @AR@ +AR_FLAGS = @AR_FLAGS@ +AS = @AS@ +ASFLAGS = @ASFLAGS@ +LD = @LD@ +RANLIB = @RANLIB@ +PERL = @PERL@ +XARGS = @XARGS@ + +OS_LIBS = @OS_LIBS@ + +RC = @RC@ +DLLFLAGS = @DLLFLAGS@ + +NSPR_CFLAGS = @NSPR_CFLAGS@ +NSPR_LIBS = @NSPR_LIBS@ + +DBM_CFLAGS = @DBM_CFLAGS@ +DBM_LIBS = @DBM_LIBS@ diff --git a/security/coreconf/command.mk b/security/coreconf/command.mk index 7789b3f7d..593cbc97e 100644 --- a/security/coreconf/command.mk +++ b/security/coreconf/command.mk @@ -36,16 +36,32 @@ # can be overridden in <arch>.mk # ####################################################################### -AS = $(CC) -ASFLAGS += $(CFLAGS) CCF = $(CC) $(CFLAGS) LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) LINK_EXE = $(LINK) $(OS_LFLAGS) $(LFLAGS) NFSPWD = $(NSINSTALL_DIR)/nfspwd CFLAGS += $(OPTIMIZER) $(OS_CFLAGS) $(XP_DEFINE) $(DEFINES) $(INCLUDES) \ $(XCFLAGS) -RANLIB = echo +CXXFLAGS += $(DEFINES) $(INCLUDES) $(XCFLAGS) TAR = /bin/tar + +NSINSTALL = $(NSINSTALL_DIR)/nsinstall +ifeq ($(NSDISTMODE),copy) + # copy files, but preserve source mtime + INSTALL = $(NSINSTALL) + INSTALL += -t +else + ifeq ($(NSDISTMODE),absolute_symlink) + # install using absolute symbolic links + INSTALL = $(NSINSTALL) + INSTALL += -L `$(NFSPWD)` + else + # install using relative symbolic links + INSTALL = $(NSINSTALL) + INSTALL += -R + endif +endif + # # For purify # diff --git a/security/coreconf/config.mk b/security/coreconf/config.mk index 0eb5fc93f..10b33fc87 100644 --- a/security/coreconf/config.mk +++ b/security/coreconf/config.mk @@ -34,117 +34,94 @@ # ####################################################################### -# [1.0] Master "Core Components" source and release <architecture> # -# tags # -####################################################################### - -include $(CORE_DEPTH)/coreconf/arch.mk - -####################################################################### -# [2.0] Master "Core Components" default command macros # +# [1.0] Master "Core Components" default command macros # # (NOTE: may be overridden in $(OS_CONFIG).mk) # ####################################################################### -include $(CORE_DEPTH)/coreconf/command.mk - -####################################################################### -# [3.0] Master "Core Components" <architecture>-specific macros # -# (dependent upon <architecture> tags) # -# # -# We are moving towards just having a $(OS_TARGET).mk file # -# as opposed to multiple $(OS_CONFIG).mk files, one for # -# each OS release. # -####################################################################### - -ifeq (,$(filter-out BSD_OS NetBSD OS2,$(OS_TARGET))) -include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk -else -include $(CORE_DEPTH)/coreconf/$(OS_CONFIG).mk -endif +include $(CORECONF_SOURCE)/command.mk ####################################################################### -# [4.0] Master "Core Components" source and release <platform> tags # +# [2.0] Master "Core Components" source and release <platform> tags # # (dependent upon <architecture> tags) # ####################################################################### -include $(CORE_DEPTH)/coreconf/platform.mk +include $(CORECONF_SOURCE)/platform.mk ####################################################################### -# [5.0] Master "Core Components" release <tree> tags # +# [3.0] Master "Core Components" release <tree> tags # # (dependent upon <architecture> tags) # ####################################################################### -include $(CORE_DEPTH)/coreconf/tree.mk +include $(CORECONF_SOURCE)/tree.mk ####################################################################### -# [6.0] Master "Core Components" source and release <component> tags # +# [4.0] Master "Core Components" source and release <component> tags # # NOTE: A component is also called a module or a subsystem. # # (dependent upon $(MODULE) being defined on the # # command line, as an environment variable, or in individual # # makefiles, or more appropriately, manifest.mn) # ####################################################################### -include $(CORE_DEPTH)/coreconf/module.mk +include $(CORECONF_SOURCE)/module.mk ####################################################################### -# [7.0] Master "Core Components" release <version> tags # +# [5.0] Master "Core Components" release <version> tags # # (dependent upon $(MODULE) being defined on the # # command line, as an environment variable, or in individual # # makefiles, or more appropriately, manifest.mn) # ####################################################################### -include $(CORE_DEPTH)/coreconf/version.mk +include $(CORECONF_SOURCE)/version.mk ####################################################################### -# [8.0] Master "Core Components" macros to figure out # +# [6.0] Master "Core Components" macros to figure out # # binary code location # # (dependent upon <platform> tags) # ####################################################################### -include $(CORE_DEPTH)/coreconf/location.mk +include $(CORECONF_SOURCE)/location.mk ####################################################################### -# [9.0] Master "Core Components" <component>-specific source path # +# [7.0] Master "Core Components" <component>-specific source path # # (dependent upon <user_source_tree>, <source_component>, # # <version>, and <platform> tags) # ####################################################################### -include $(CORE_DEPTH)/coreconf/source.mk +include $(CORECONF_SOURCE)/source.mk ####################################################################### -# [10.0] Master "Core Components" include switch for support header # +# [8.0] Master "Core Components" include switch for support header # # files # # (dependent upon <tree>, <component>, <version>, # # and <platform> tags) # ####################################################################### -include $(CORE_DEPTH)/coreconf/headers.mk +include $(CORECONF_SOURCE)/headers.mk ####################################################################### -# [11.0] Master "Core Components" for computing program prefixes # +# [9.0] Master "Core Components" for computing program prefixes # ####################################################################### -include $(CORE_DEPTH)/coreconf/prefix.mk +include $(CORECONF_SOURCE)/prefix.mk ####################################################################### -# [12.0] Master "Core Components" for computing program suffixes # +# [10.0] Master "Core Components" for computing program suffixes # # (dependent upon <architecture> tags) # ####################################################################### -include $(CORE_DEPTH)/coreconf/suffix.mk +include $(CORECONF_SOURCE)/suffix.mk ####################################################################### -# [13.0] Master "Core Components" for defining JDK # +# [11.0] Master "Core Components" for defining JDK # # (dependent upon <architecture>, <source>, and <suffix> tags)# ####################################################################### -include $(CORE_DEPTH)/coreconf/jdk.mk +include $(CORECONF_SOURCE)/jdk.mk ####################################################################### -# [14.0] Master "Core Components" rule set # +# [12.0] Master "Core Components" rule set # # (should always be the last file included by config.mk) # ####################################################################### -include $(CORE_DEPTH)/coreconf/ruleset.mk --include $(MKDEPENDENCIES) +include $(CORECONF_SOURCE)/ruleset.mk diff --git a/security/coreconf/location.mk b/security/coreconf/location.mk index 7bb967d42..2b1c14e1a 100644 --- a/security/coreconf/location.mk +++ b/security/coreconf/location.mk @@ -42,13 +42,22 @@ BUILD = $(PLATFORM) OBJDIR = $(PLATFORM) -DIST = $(CORE_DEPTH)/../dist/$(PLATFORM) - -VPATH = $(NSINSTALL_DIR)/$(PLATFORM) DEPENDENCIES = $(PLATFORM)/.md +MKDEPEND_DIR = $(MOD_DEPTH)/coreconf/mkdepend +MKDEPEND_SRCDIR = $(CORECONF_SOURCE)/mkdepend +MKDEPEND = $(MKDEPEND_DIR)/mkdepend +MKDEPENDENCIES = depend.mk +NSINSTALL_DIR = $(MOD_DEPTH)/coreconf/nsinstall + +ifeq ($(OS_ARCH),WINNT) +NSINSTALL = nsinstall +MKDEPEND = $(MKDEPEND_DIR)/mkdepend.exe +endif ifdef BUILD_DEBUG_GC DEFINES += -DDEBUG_GC endif -GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*) +GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*) vc20.pdb vc40.pdb +BUILD_TOOLS = $(topsrcdir)/build/unix +AUTOCONF_TOOLS = $(topsrcdir)/build/autoconf diff --git a/security/coreconf/mkdepend/.cvsignore b/security/coreconf/mkdepend/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/coreconf/mkdepend/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/dbm/include/manifest.mn b/security/coreconf/mkdepend/Makefile.in index e0f50f6f1..848ceb2df 100644 --- a/security/dbm/include/manifest.mn +++ b/security/coreconf/mkdepend/Makefile.in @@ -1,4 +1,3 @@ -#! gmake # # The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file @@ -32,24 +31,28 @@ # GPL. # -CORE_DEPTH = ../.. +CORE_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@:$(CORECONF_SOURCE)/mkdepend -MODULE = dbm +MODULE = coreconf -EXPORTS = nsres.h \ - cdefs.h \ - mcom_db.h \ - ncompat.h \ - winfile.h \ +CSRCS = \ + cppsetup.c \ + ifparser.c \ + include.c \ + main.c \ + parse.c \ + pr.c \ $(NULL) -PRIVATE_EXPORTS = hsearch.h \ - page.h \ - extern.h \ - ndbm.h \ - queue.h \ - hash.h \ - mpool.h \ - search.h \ - $(NULL) +PROGRAM = mkdepend + +include ../autoconf.mk +include $(CORECONF_SOURCE)/config.mk + +include $(CORECONF_SOURCE)/rules.mk + +DEFINES += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".o\" diff --git a/security/coreconf/mkdepend/cppsetup.c b/security/coreconf/mkdepend/cppsetup.c new file mode 100644 index 000000000..0f9b8180a --- /dev/null +++ b/security/coreconf/mkdepend/cppsetup.c @@ -0,0 +1,244 @@ +/* $XConsortium: cppsetup.c,v 1.13 94/04/17 20:10:32 gildea Exp $ */ +/* + +Copyright (c) 1993, 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + +*/ + +#include "def.h" + +#ifdef CPP +/* + * This file is strictly for the sake of cpy.y and yylex.c (if + * you indeed have the source for cpp). + */ +#define IB 1 +#define SB 2 +#define NB 4 +#define CB 8 +#define QB 16 +#define WB 32 +#define SALT '#' +#if pdp11 | vax | ns16000 | mc68000 | ibm032 +#define COFF 128 +#else +#define COFF 0 +#endif +/* + * These variables used by cpy.y and yylex.c + */ +extern char *outp, *inp, *newp, *pend; +extern char *ptrtab; +extern char fastab[]; +extern char slotab[]; + +/* + * cppsetup + */ +struct filepointer *currentfile; +struct inclist *currentinc; + +cppsetup(line, filep, inc) + register char *line; + register struct filepointer *filep; + register struct inclist *inc; +{ + register char *p, savec; + static boolean setupdone = FALSE; + boolean value; + + if (!setupdone) { + cpp_varsetup(); + setupdone = TRUE; + } + + currentfile = filep; + currentinc = inc; + inp = newp = line; + for (p=newp; *p; p++) + ; + + /* + * put a newline back on the end, and set up pend, etc. + */ + *p++ = '\n'; + savec = *p; + *p = '\0'; + pend = p; + + ptrtab = slotab+COFF; + *--inp = SALT; + outp=inp; + value = yyparse(); + *p = savec; + return(value); +} + +struct symtab *lookup(symbol) + char *symbol; +{ + static struct symtab undefined; + struct symtab *sp; + + sp = isdefined(symbol, currentinc, NULL); + if (sp == NULL) { + sp = &undefined; + sp->s_value = NULL; + } + return (sp); +} + +pperror(tag, x0,x1,x2,x3,x4) + int tag,x0,x1,x2,x3,x4; +{ + warning("\"%s\", line %d: ", currentinc->i_file, currentfile->f_line); + warning(x0,x1,x2,x3,x4); +} + + +yyerror(s) + register char *s; +{ + fatalerr("Fatal error: %s\n", s); +} +#else /* not CPP */ + +#include "ifparser.h" +struct _parse_data { + struct filepointer *filep; + struct inclist *inc; + const char *line; +}; + +static const char * +_my_if_errors (ip, cp, expecting) + IfParser *ip; + const char *cp; + const char *expecting; +{ +#ifdef DEBUG_MKDEPEND + struct _parse_data *pd = (struct _parse_data *) ip->data; + int lineno = pd->filep->f_line; + char *filename = pd->inc->i_file; + char prefix[300]; + int prefixlen; + int i; + + sprintf (prefix, "\"%s\":%d", filename, lineno); + prefixlen = strlen(prefix); + fprintf (stderr, "%s: %s", prefix, pd->line); + i = cp - pd->line; + if (i > 0 && pd->line[i-1] != '\n') { + putc ('\n', stderr); + } + for (i += prefixlen + 3; i > 0; i--) { + putc (' ', stderr); + } + fprintf (stderr, "^--- expecting %s\n", expecting); +#endif /* DEBUG_MKDEPEND */ + return NULL; +} + + +#define MAXNAMELEN 256 + +static struct symtab * +_lookup_variable (ip, var, len) + IfParser *ip; + const char *var; + int len; +{ + char tmpbuf[MAXNAMELEN + 1]; + struct _parse_data *pd = (struct _parse_data *) ip->data; + + if (len > MAXNAMELEN) + return 0; + + strncpy (tmpbuf, var, len); + tmpbuf[len] = '\0'; + return isdefined (tmpbuf, pd->inc, NULL); +} + + +static int +_my_eval_defined (ip, var, len) + IfParser *ip; + const char *var; + int len; +{ + if (_lookup_variable (ip, var, len)) + return 1; + else + return 0; +} + +#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_') + +static int +_my_eval_variable (ip, var, len) + IfParser *ip; + const char *var; + int len; +{ + struct symtab *s; + + s = _lookup_variable (ip, var, len); + if (!s) + return 0; + do { + var = s->s_value; + if (!isvarfirstletter(*var)) + break; + s = _lookup_variable (ip, var, strlen(var)); + } while (s); + + return atoi(var); +} + + +cppsetup(line, filep, inc) + register char *line; + register struct filepointer *filep; + register struct inclist *inc; +{ + IfParser ip; + struct _parse_data pd; + int val = 0; + + pd.filep = filep; + pd.inc = inc; + pd.line = line; + ip.funcs.handle_error = _my_if_errors; + ip.funcs.eval_defined = _my_eval_defined; + ip.funcs.eval_variable = _my_eval_variable; + ip.data = (char *) &pd; + + (void) ParseIfExpression (&ip, line, &val); + if (val) + return IF; + else + return IFFALSE; +} +#endif /* CPP */ + diff --git a/security/coreconf/mkdepend/def.h b/security/coreconf/mkdepend/def.h new file mode 100644 index 000000000..5952474d2 --- /dev/null +++ b/security/coreconf/mkdepend/def.h @@ -0,0 +1,150 @@ +/* $XConsortium: def.h,v 1.25 94/04/17 20:10:33 gildea Exp $ */ +/* + +Copyright (c) 1993, 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + +*/ + +#ifndef NO_X11 +#include <X11/Xosdefs.h> +#ifdef WIN32 +#include <X11/Xw32defs.h> +#endif +#ifndef SUNOS4 +#include <X11/Xfuncproto.h> +#endif /* SUNOS4 */ +#endif /* NO_X11 */ + +#include <stdio.h> +#include <ctype.h> +#ifndef X_NOT_POSIX +#ifndef _POSIX_SOURCE +#define _POSIX_SOURCE +#endif +#endif +#include <sys/types.h> +#include <fcntl.h> +#include <sys/stat.h> + +#define MAXDEFINES 512 +#define MAXFILES 1024 /* Increased from 512. -mcafee */ +#define MAXDIRS 64 +#define SYMTABINC 10 /* must be > 1 for define() to work right */ +#define TRUE 1 +#define FALSE 0 + +/* the following must match the directives table in main.c */ +#define IF 0 +#define IFDEF 1 +#define IFNDEF 2 +#define ELSE 3 +#define ENDIF 4 +#define DEFINE 5 +#define UNDEF 6 +#define INCLUDE 7 +#define LINE 8 +#define PRAGMA 9 +#define ERROR 10 +#define IDENT 11 +#define SCCS 12 +#define ELIF 13 +#define EJECT 14 +#define IFFALSE 15 /* pseudo value --- never matched */ +#define ELIFFALSE 16 /* pseudo value --- never matched */ +#define INCLUDEDOT 17 /* pseudo value --- never matched */ +#define IFGUESSFALSE 18 /* pseudo value --- never matched */ +#define ELIFGUESSFALSE 19 /* pseudo value --- never matched */ + +#ifdef DEBUG +extern int _debugmask; +/* + * debug levels are: + * + * 0 show ifn*(def)*,endif + * 1 trace defined/!defined + * 2 show #include + * 3 show #include SYMBOL + * 4-6 unused + */ +#define debug(level,arg) { if (_debugmask & (1 << level)) warning arg; } +#else +#define debug(level,arg) /**/ +#endif /* DEBUG */ + +typedef unsigned char boolean; + +struct symtab { + char *s_name; + char *s_value; +}; + +struct inclist { + char *i_incstring; /* string from #include line */ + char *i_file; /* path name of the include file */ + struct inclist **i_list; /* list of files it itself includes */ + int i_listlen; /* length of i_list */ + struct symtab *i_defs; /* symbol table for this file */ + int i_ndefs; /* current # defines */ + int i_deflen; /* amount of space in table */ + boolean i_defchecked; /* whether defines have been checked */ + boolean i_notified; /* whether we have revealed includes */ + boolean i_marked; /* whether it's in the makefile */ + boolean i_searched; /* whether we have read this */ + boolean i_included_sym; /* whether #include SYMBOL was found */ + /* Can't use i_list if TRUE */ +}; + +struct filepointer { + char *f_p; + char *f_base; + char *f_end; + long f_len; + long f_line; +}; + +#ifndef X_NOT_STDC_ENV +#include <stdlib.h> +#if defined(macII) && !defined(__STDC__) /* stdlib.h fails to define these */ +char *malloc(), *realloc(); +#endif /* macII */ +#else +char *malloc(); +char *realloc(); +#endif + +char *copy(); +char *base_name(); +char *getline(); +struct symtab *slookup(); +struct symtab *isdefined(); +struct symtab *fdefined(); +struct filepointer *getfile(); +struct inclist *newinclude(); +struct inclist *inc_path(); + +#if NeedVarargsPrototypes +extern fatalerr(char *, ...); +extern warning(char *, ...); +extern warning1(char *, ...); +#endif diff --git a/security/coreconf/mkdepend/ifparser.c b/security/coreconf/mkdepend/ifparser.c new file mode 100644 index 000000000..bd8e7c6a8 --- /dev/null +++ b/security/coreconf/mkdepend/ifparser.c @@ -0,0 +1,458 @@ +/* + * $XConsortium: ifparser.c,v 1.8 95/06/03 00:01:41 gildea Exp $ + * + * Copyright 1992 Network Computing Devices, Inc. + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Network Computing Devices may not be + * used in advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. Network Computing Devices makes + * no representations about the suitability of this software for any purpose. + * It is provided ``as is'' without express or implied warranty. + * + * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, + * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + * + * Author: Jim Fulton + * Network Computing Devices, Inc. + * + * Simple if statement processor + * + * This module can be used to evaluate string representations of C language + * if constructs. It accepts the following grammar: + * + * EXPRESSION := VALUE + * | VALUE BINOP EXPRESSION + * + * VALUE := '(' EXPRESSION ')' + * | '!' VALUE + * | '-' VALUE + * | 'defined' '(' variable ')' + * | 'defined' variable + * | # variable '(' variable-list ')' + * | variable + * | number + * + * BINOP := '*' | '/' | '%' + * | '+' | '-' + * | '<<' | '>>' + * | '<' | '>' | '<=' | '>=' + * | '==' | '!=' + * | '&' | '|' + * | '&&' | '||' + * + * The normal C order of precidence is supported. + * + * + * External Entry Points: + * + * ParseIfExpression parse a string for #if + */ + +#include "ifparser.h" +#include <ctype.h> + +/**************************************************************************** + Internal Macros and Utilities for Parser + ****************************************************************************/ + +#define DO(val) if (!(val)) return NULL +#define CALLFUNC(ggg,fff) (*((ggg)->funcs.fff)) +#define SKIPSPACE(ccc) while (isspace(*ccc)) ccc++ +#define isvarfirstletter(ccc) (isalpha(ccc) || (ccc) == '_') + + +static const char * +parse_variable (g, cp, varp) + IfParser *g; + const char *cp; + const char **varp; +{ + SKIPSPACE (cp); + + if (!isvarfirstletter (*cp)) + return CALLFUNC(g, handle_error) (g, cp, "variable name"); + + *varp = cp; + /* EMPTY */ + for (cp++; isalnum(*cp) || *cp == '_'; cp++) ; + return cp; +} + + +static const char * +parse_number (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + SKIPSPACE (cp); + + if (!isdigit(*cp)) + return CALLFUNC(g, handle_error) (g, cp, "number"); + +#ifdef WIN32 + *valp = strtol(cp, &cp, 0); +#else + *valp = atoi (cp); + /* EMPTY */ + for (cp++; isdigit(*cp); cp++) ; +#endif + return cp; +} + + +static const char * +parse_value (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + const char *var; + + *valp = 0; + + SKIPSPACE (cp); + if (!*cp) + return cp; + + switch (*cp) { + case '(': + DO (cp = ParseIfExpression (g, cp + 1, valp)); + SKIPSPACE (cp); + if (*cp != ')') + return CALLFUNC(g, handle_error) (g, cp, ")"); + + return cp + 1; /* skip the right paren */ + + case '!': + DO (cp = parse_value (g, cp + 1, valp)); + *valp = !(*valp); + return cp; + + case '-': + DO (cp = parse_value (g, cp + 1, valp)); + *valp = -(*valp); + return cp; + + case '#': + DO (cp = parse_variable (g, cp + 1, &var)); + SKIPSPACE (cp); + if (*cp != '(') + return CALLFUNC(g, handle_error) (g, cp, "("); + do { + DO (cp = parse_variable (g, cp + 1, &var)); + SKIPSPACE (cp); + } while (*cp && *cp != ')'); + if (*cp != ')') + return CALLFUNC(g, handle_error) (g, cp, ")"); + *valp = 1; /* XXX */ + return cp + 1; + + case 'd': + if (strncmp (cp, "defined", 7) == 0 && !isalnum(cp[7])) { + int paren = 0; + int len; + + cp += 7; + SKIPSPACE (cp); + if (*cp == '(') { + paren = 1; + cp++; + } + DO (cp = parse_variable (g, cp, &var)); + len = cp - var; + SKIPSPACE (cp); + if (paren && *cp != ')') + return CALLFUNC(g, handle_error) (g, cp, ")"); + *valp = (*(g->funcs.eval_defined)) (g, var, len); + return cp + paren; /* skip the right paren */ + } + /* fall out */ + } + + if (isdigit(*cp)) { + DO (cp = parse_number (g, cp, valp)); + } else if (!isvarfirstletter(*cp)) + return CALLFUNC(g, handle_error) (g, cp, "variable or number"); + else { + DO (cp = parse_variable (g, cp, &var)); + *valp = (*(g->funcs.eval_variable)) (g, var, cp - var); + } + + return cp; +} + + + +static const char * +parse_product (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_value (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '*': + DO (cp = parse_product (g, cp + 1, &rightval)); + *valp = (*valp * rightval); + break; + + case '/': + DO (cp = parse_product (g, cp + 1, &rightval)); + + /* Do nothing in the divide-by-zero case. */ + if (rightval) { + *valp = (*valp / rightval); + } + break; + + case '%': + DO (cp = parse_product (g, cp + 1, &rightval)); + *valp = (*valp % rightval); + break; + } + return cp; +} + + +static const char * +parse_sum (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_product (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '+': + DO (cp = parse_sum (g, cp + 1, &rightval)); + *valp = (*valp + rightval); + break; + + case '-': + DO (cp = parse_sum (g, cp + 1, &rightval)); + *valp = (*valp - rightval); + break; + } + return cp; +} + + +static const char * +parse_shift (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_sum (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '<': + if (cp[1] == '<') { + DO (cp = parse_shift (g, cp + 2, &rightval)); + *valp = (*valp << rightval); + } + break; + + case '>': + if (cp[1] == '>') { + DO (cp = parse_shift (g, cp + 2, &rightval)); + *valp = (*valp >> rightval); + } + break; + } + return cp; +} + + +static const char * +parse_inequality (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_shift (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '<': + if (cp[1] == '=') { + DO (cp = parse_inequality (g, cp + 2, &rightval)); + *valp = (*valp <= rightval); + } else { + DO (cp = parse_inequality (g, cp + 1, &rightval)); + *valp = (*valp < rightval); + } + break; + + case '>': + if (cp[1] == '=') { + DO (cp = parse_inequality (g, cp + 2, &rightval)); + *valp = (*valp >= rightval); + } else { + DO (cp = parse_inequality (g, cp + 1, &rightval)); + *valp = (*valp > rightval); + } + break; + } + return cp; +} + + +static const char * +parse_equality (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_inequality (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '=': + if (cp[1] == '=') + cp++; + DO (cp = parse_equality (g, cp + 1, &rightval)); + *valp = (*valp == rightval); + break; + + case '!': + if (cp[1] != '=') + break; + DO (cp = parse_equality (g, cp + 2, &rightval)); + *valp = (*valp != rightval); + break; + } + return cp; +} + + +static const char * +parse_band (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_equality (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '&': + if (cp[1] != '&') { + DO (cp = parse_band (g, cp + 1, &rightval)); + *valp = (*valp & rightval); + } + break; + } + return cp; +} + + +static const char * +parse_bor (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_band (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '|': + if (cp[1] != '|') { + DO (cp = parse_bor (g, cp + 1, &rightval)); + *valp = (*valp | rightval); + } + break; + } + return cp; +} + + +static const char * +parse_land (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_bor (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '&': + if (cp[1] != '&') + return CALLFUNC(g, handle_error) (g, cp, "&&"); + DO (cp = parse_land (g, cp + 2, &rightval)); + *valp = (*valp && rightval); + break; + } + return cp; +} + + +static const char * +parse_lor (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + int rightval; + + DO (cp = parse_land (g, cp, valp)); + SKIPSPACE (cp); + + switch (*cp) { + case '|': + if (cp[1] != '|') + return CALLFUNC(g, handle_error) (g, cp, "||"); + DO (cp = parse_lor (g, cp + 2, &rightval)); + *valp = (*valp || rightval); + break; + } + return cp; +} + + +/**************************************************************************** + External Entry Points + ****************************************************************************/ + +const char * +ParseIfExpression (g, cp, valp) + IfParser *g; + const char *cp; + int *valp; +{ + return parse_lor (g, cp, valp); +} + + diff --git a/security/coreconf/mkdepend/ifparser.h b/security/coreconf/mkdepend/ifparser.h new file mode 100644 index 000000000..c33379822 --- /dev/null +++ b/security/coreconf/mkdepend/ifparser.h @@ -0,0 +1,76 @@ +/* + * $XConsortium: ifparser.h,v 1.1 92/08/22 13:05:39 rws Exp $ + * + * Copyright 1992 Network Computing Devices, Inc. + * + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose and without fee is hereby granted, provided + * that the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Network Computing Devices may not be + * used in advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. Network Computing Devices makes + * no representations about the suitability of this software for any purpose. + * It is provided ``as is'' without express or implied warranty. + * + * NETWORK COMPUTING DEVICES DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS + * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, + * IN NO EVENT SHALL NETWORK COMPUTING DEVICES BE LIABLE FOR ANY SPECIAL, + * INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + * + * Author: Jim Fulton + * Network Computing Devices, Inc. + * + * Simple if statement processor + * + * This module can be used to evaluate string representations of C language + * if constructs. It accepts the following grammar: + * + * EXPRESSION := VALUE + * | VALUE BINOP EXPRESSION + * + * VALUE := '(' EXPRESSION ')' + * | '!' VALUE + * | '-' VALUE + * | 'defined' '(' variable ')' + * | variable + * | number + * + * BINOP := '*' | '/' | '%' + * | '+' | '-' + * | '<<' | '>>' + * | '<' | '>' | '<=' | '>=' + * | '==' | '!=' + * | '&' | '|' + * | '&&' | '||' + * + * The normal C order of precidence is supported. + * + * + * External Entry Points: + * + * ParseIfExpression parse a string for #if + */ + +#include <stdio.h> + +#define const /**/ +typedef int Bool; +#define False 0 +#define True 1 + +typedef struct _if_parser { + struct { /* functions */ + char *(*handle_error) (/* struct _if_parser *, const char *, + const char * */); + int (*eval_variable) (/* struct _if_parser *, const char *, int */); + int (*eval_defined) (/* struct _if_parser *, const char *, int */); + } funcs; + char *data; +} IfParser; + +char *ParseIfExpression (/* IfParser *, const char *, int * */); + diff --git a/security/coreconf/mkdepend/imakemdep.h b/security/coreconf/mkdepend/imakemdep.h new file mode 100644 index 000000000..9358f8405 --- /dev/null +++ b/security/coreconf/mkdepend/imakemdep.h @@ -0,0 +1,730 @@ + +/* $XConsortium: imakemdep.h,v 1.83 95/04/07 19:47:46 kaleb Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.12 1995/07/08 10:22:17 dawes Exp $ */ +/* + +Copyright (c) 1993, 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + +*/ + + +/* + * This file contains machine-dependent constants for the imake utility. + * When porting imake, read each of the steps below and add in any necessary + * definitions. In general you should *not* edit ccimake.c or imake.c! + */ + +#ifdef CCIMAKE +/* + * Step 1: imake_ccflags + * Define any special flags that will be needed to get imake.c to compile. + * These will be passed to the compile along with the contents of the + * make variable BOOTSTRAPCFLAGS. + */ +#ifdef hpux +#ifdef hp9000s800 +#define imake_ccflags "-DSYSV" +#else +#define imake_ccflags "-Wc,-Nd4000,-Ns3000 -DSYSV" +#endif +#endif + +#if defined(macII) || defined(_AUX_SOURCE) +#define imake_ccflags "-DmacII -DSYSV" +#endif + +#ifdef stellar +#define imake_ccflags "-DSYSV" +#endif + +#if defined(USL) || defined(Oki) || defined(NCR) +#define imake_ccflags "-Xc -DSVR4" +#endif + +#ifdef sony +#if defined(SYSTYPE_SYSV) || defined(_SYSTYPE_SYSV) +#define imake_ccflags "-DSVR4" +#else +#include <sys/param.h> +#if NEWSOS < 41 +#define imake_ccflags "-Dbsd43 -DNOSTDHDRS" +#else +#if NEWSOS < 42 +#define imake_ccflags "-Dbsd43" +#endif +#endif +#endif +#endif + +#ifdef _CRAY +#define imake_ccflags "-DSYSV -DUSG" +#endif + +#if defined(_IBMR2) || defined(aix) +#define imake_ccflags "-Daix -DSYSV" +#endif + +#ifdef Mips +# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43) +# define imake_ccflags "-DBSD43" +# else +# define imake_ccflags "-DSYSV" +# endif +#endif + +#ifdef is68k +#define imake_ccflags "-Dluna -Duniosb" +#endif + +#ifdef SYSV386 +# ifdef SVR4 +# define imake_ccflags "-Xc -DSVR4" +# else +# define imake_ccflags "-DSYSV" +# endif +#endif + +#ifdef SVR4 +# ifdef i386 +# define imake_ccflags "-Xc -DSVR4" +# endif +#endif + +#ifdef SYSV +# ifdef i386 +# define imake_ccflags "-DSYSV" +# endif +#endif + +#ifdef __convex__ +#define imake_ccflags "-fn -tm c1" +#endif + +#ifdef apollo +#define imake_ccflags "-DX_NOT_POSIX" +#endif + +#ifdef WIN32 +#define imake_ccflags "-nologo -batch -D__STDC__" +#endif + +#ifdef __uxp__ +#define imake_ccflags "-DSVR4 -DANSICPP" +#endif + +#ifdef __sxg__ +#define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS" +#endif + +#ifdef sequent +#define imake_ccflags "-DX_NOT_STDC_ENV -DX_NOT_POSIX" +#endif + +#ifdef _SEQUENT_ +#define imake_ccflags "-DSYSV -DUSG" +#endif + +#if defined(SX) || defined(PC_UX) +#define imake_ccflags "-DSYSV" +#endif + +#ifdef nec_ews_svr2 +#define imake_ccflags "-DUSG" +#endif + +#if defined(nec_ews_svr4) || defined(_nec_ews_svr4) || defined(_nec_up) || defined(_nec_ft) +#define imake_ccflags "-DSVR4" +#endif + +#ifdef MACH +#define imake_ccflags "-DNOSTDHDRS" +#endif + +/* this is for OS/2 under EMX. This won't work with DOS */ +#if defined(__EMX__) +#define imake_ccflags "-DBSD43" +#endif + +#else /* not CCIMAKE */ +#ifndef MAKEDEPEND +/* + * Step 2: dup2 + * If your OS doesn't have a dup2() system call to duplicate one file + * descriptor onto another, define such a mechanism here (if you don't + * already fall under the existing category(ies). + */ +#if defined(SYSV) && !defined(_CRAY) && !defined(Mips) && !defined(_SEQUENT_) +#define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : (close(fd2), \ + fcntl(fd1, F_DUPFD, fd2))) +#endif + + +/* + * Step 3: FIXUP_CPP_WHITESPACE + * If your cpp collapses tabs macro expansions into a single space and + * replaces escaped newlines with a space, define this symbol. This will + * cause imake to attempt to patch up the generated Makefile by looking + * for lines that have colons in them (this is why the rules file escapes + * all colons). One way to tell if you need this is to see whether or not + * your Makefiles have no tabs in them and lots of @@ strings. + */ +#if defined(sun) || defined(SYSV) || defined(SVR4) || defined(hcx) || defined(WIN32) || (defined(AMOEBA) && defined(CROSS_COMPILE)) +#define FIXUP_CPP_WHITESPACE +#endif +#ifdef WIN32 +#define REMOVE_CPP_LEADSPACE +#define INLINE_SYNTAX +#define MAGIC_MAKE_VARS +#endif +#ifdef __minix_vmd +#define FIXUP_CPP_WHITESPACE +#endif + +/* + * Step 4: USE_CC_E, DEFAULT_CC, DEFAULT_CPP + * If you want to use cc -E instead of cpp, define USE_CC_E. + * If use cc -E but want a different compiler, define DEFAULT_CC. + * If the cpp you need is not in /lib/cpp, define DEFAULT_CPP. + */ +#ifdef hpux +#define USE_CC_E +#endif +#ifdef WIN32 +#define USE_CC_E +#define DEFAULT_CC "cl" +#endif +#ifdef apollo +#define DEFAULT_CPP "/usr/lib/cpp" +#endif +#if defined(_IBMR2) && !defined(DEFAULT_CPP) +#define DEFAULT_CPP "/usr/lpp/X11/Xamples/util/cpp/cpp" +#endif +#if defined(sun) && defined(SVR4) +#define DEFAULT_CPP "/usr/ccs/lib/cpp" +#endif +#ifdef __bsdi__ +#define DEFAULT_CPP "/usr/bin/cpp" +#endif +#ifdef __uxp__ +#define DEFAULT_CPP "/usr/ccs/lib/cpp" +#endif +#ifdef __sxg__ +#define DEFAULT_CPP "/usr/lib/cpp" +#endif +#ifdef _CRAY +#define DEFAULT_CPP "/lib/pcpp" +#endif +#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#define DEFAULT_CPP "/usr/libexec/cpp" +#endif +#ifdef MACH +#define USE_CC_E +#endif +#ifdef __minix_vmd +#define DEFAULT_CPP "/usr/lib/cpp" +#endif +#if defined(__EMX__) +/* expects cpp in PATH */ +#define DEFAULT_CPP "cpp" +#endif + +/* + * Step 5: cpp_argv + * The following table contains the flags that should be passed + * whenever a Makefile is being generated. If your preprocessor + * doesn't predefine any unique symbols, choose one and add it to the + * end of this table. Then, do the following: + * + * a. Use this symbol in Imake.tmpl when setting MacroFile. + * b. Put this symbol in the definition of BootstrapCFlags in your + * <platform>.cf file. + * c. When doing a make World, always add "BOOTSTRAPCFLAGS=-Dsymbol" + * to the end of the command line. + * + * Note that you may define more than one symbol (useful for platforms + * that support multiple operating systems). + */ + +#define ARGUMENTS 50 /* number of arguments in various arrays */ +char *cpp_argv[ARGUMENTS] = { + "cc", /* replaced by the actual program to exec */ + "-I.", /* add current directory to include path */ +#ifdef unix + "-Uunix", /* remove unix symbol so that filename unix.c okay */ +#endif +#if defined(__386BSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(MACH) +# ifdef __i386__ + "-D__i386__", +# endif +# ifdef __GNUC__ + "-traditional", +# endif +#endif +#ifdef M4330 + "-DM4330", /* Tektronix */ +#endif +#ifdef M4310 + "-DM4310", /* Tektronix */ +#endif +#if defined(macII) || defined(_AUX_SOURCE) + "-DmacII", /* Apple A/UX */ +#endif +#ifdef USL + "-DUSL", /* USL */ +#endif +#ifdef sony + "-Dsony", /* Sony */ +#if !defined(SYSTYPE_SYSV) && !defined(_SYSTYPE_SYSV) && NEWSOS < 42 + "-Dbsd43", +#endif +#endif +#ifdef _IBMR2 + "-D_IBMR2", /* IBM RS-6000 (we ensured that aix is defined above */ +#ifndef aix +#define aix /* allow BOOTSTRAPCFLAGS="-D_IBMR2" */ +#endif +#endif /* _IBMR2 */ +#ifdef aix + "-Daix", /* AIX instead of AOS */ +#ifndef ibm +#define ibm /* allow BOOTSTRAPCFLAGS="-Daix" */ +#endif +#endif /* aix */ +#ifdef ibm + "-Dibm", /* IBM PS/2 and RT under both AOS and AIX */ +#endif +#ifdef luna + "-Dluna", /* OMRON luna 68K and 88K */ +#ifdef luna1 + "-Dluna1", +#endif +#ifdef luna88k /* need not on UniOS-Mach Vers. 1.13 */ + "-traditional", /* for some older version */ +#endif /* instead of "-DXCOMM=\\#" */ +#ifdef uniosb + "-Duniosb", +#endif +#ifdef uniosu + "-Duniosu", +#endif +#endif /* luna */ +#ifdef _CRAY /* Cray */ + "-Ucray", +#endif +#ifdef Mips + "-DMips", /* Define and use Mips for Mips Co. OS/mach. */ +# if defined(SYSTYPE_BSD) || defined(BSD) || defined(BSD43) + "-DBSD43", /* Mips RISCOS supports two environments */ +# else + "-DSYSV", /* System V environment is the default */ +# endif +#endif /* Mips */ +#ifdef MOTOROLA + "-DMOTOROLA", /* Motorola Delta Systems */ +# ifdef SYSV + "-DSYSV", +# endif +# ifdef SVR4 + "-DSVR4", +# endif +#endif /* MOTOROLA */ +#ifdef i386 + "-Di386", +# ifdef SVR4 + "-DSVR4", +# endif +# ifdef SYSV + "-DSYSV", +# ifdef ISC + "-DISC", +# ifdef ISC40 + "-DISC40", /* ISC 4.0 */ +# else +# ifdef ISC202 + "-DISC202", /* ISC 2.0.2 */ +# else +# ifdef ISC30 + "-DISC30", /* ISC 3.0 */ +# else + "-DISC22", /* ISC 2.2.1 */ +# endif +# endif +# endif +# endif +# ifdef SCO + "-DSCO", +# ifdef SCO324 + "-DSCO324", +# endif +# endif +# endif +# ifdef ESIX + "-DESIX", +# endif +# ifdef ATT + "-DATT", +# endif +# ifdef DELL + "-DDELL", +# endif +#endif +#ifdef SYSV386 /* System V/386 folks, obsolete */ + "-Di386", +# ifdef SVR4 + "-DSVR4", +# endif +# ifdef ISC + "-DISC", +# ifdef ISC40 + "-DISC40", /* ISC 4.0 */ +# else +# ifdef ISC202 + "-DISC202", /* ISC 2.0.2 */ +# else +# ifdef ISC30 + "-DISC30", /* ISC 3.0 */ +# else + "-DISC22", /* ISC 2.2.1 */ +# endif +# endif +# endif +# endif +# ifdef SCO + "-DSCO", +# ifdef SCO324 + "-DSCO324", +# endif +# endif +# ifdef ESIX + "-DESIX", +# endif +# ifdef ATT + "-DATT", +# endif +# ifdef DELL + "-DDELL", +# endif +#endif +#ifdef __osf__ + "-D__osf__", +# ifdef __mips__ + "-D__mips__", +# endif +# ifdef __alpha + "-D__alpha", +# endif +# ifdef __i386__ + "-D__i386__", +# endif +# ifdef __GNUC__ + "-traditional", +# endif +#endif +#ifdef Oki + "-DOki", +#endif +#ifdef sun +#ifdef SVR4 + "-DSVR4", +#endif +#endif +#ifdef WIN32 + "-DWIN32", + "-nologo", + "-batch", + "-D__STDC__", +#endif +#ifdef NCR + "-DNCR", /* NCR */ +#endif +#ifdef linux + "-traditional", + "-Dlinux", +#endif +#ifdef __uxp__ + "-D__uxp__", +#endif +#ifdef __sxg__ + "-D__sxg__", +#endif +#ifdef nec_ews_svr2 + "-Dnec_ews_svr2", +#endif +#ifdef AMOEBA + "-DAMOEBA", +# ifdef CROSS_COMPILE + "-DCROSS_COMPILE", +# ifdef CROSS_i80386 + "-Di80386", +# endif +# ifdef CROSS_sparc + "-Dsparc", +# endif +# ifdef CROSS_mc68000 + "-Dmc68000", +# endif +# else +# ifdef i80386 + "-Di80386", +# endif +# ifdef sparc + "-Dsparc", +# endif +# ifdef mc68000 + "-Dmc68000", +# endif +# endif +#endif +#ifdef __minix_vmd + "-Dminix", +#endif + +#if defined(__EMX__) + "-traditional", + "-Demxos2", +#endif + +}; +#else /* else MAKEDEPEND */ +/* + * Step 6: predefs + * If your compiler and/or preprocessor define any specific symbols, add + * them to the the following table. The definition of struct symtab is + * in util/makedepend/def.h. + */ +struct symtab predefs[] = { +#ifdef apollo + {"apollo", "1"}, +#endif +#ifdef ibm032 + {"ibm032", "1"}, +#endif +#ifdef ibm + {"ibm", "1"}, +#endif +#ifdef aix + {"aix", "1"}, +#endif +#ifdef sun + {"sun", "1"}, +#endif +#ifdef sun2 + {"sun2", "1"}, +#endif +#ifdef sun3 + {"sun3", "1"}, +#endif +#ifdef sun4 + {"sun4", "1"}, +#endif +#ifdef sparc + {"sparc", "1"}, +#endif +#ifdef __sparc__ + {"__sparc__", "1"}, +#endif +#ifdef hpux + {"hpux", "1"}, +#endif +#ifdef __hpux + {"__hpux", "1"}, +#endif +#ifdef __hp9000s800 + {"__hp9000s800", "1"}, +#endif +#ifdef __hp9000s700 + {"__hp9000s700", "1"}, +#endif +#ifdef vax + {"vax", "1"}, +#endif +#ifdef VMS + {"VMS", "1"}, +#endif +#ifdef cray + {"cray", "1"}, +#endif +#ifdef CRAY + {"CRAY", "1"}, +#endif +#ifdef _CRAY + {"_CRAY", "1"}, +#endif +#ifdef att + {"att", "1"}, +#endif +#ifdef mips + {"mips", "1"}, +#endif +#ifdef __mips__ + {"__mips__", "1"}, +#endif +#ifdef ultrix + {"ultrix", "1"}, +#endif +#ifdef stellar + {"stellar", "1"}, +#endif +#ifdef mc68000 + {"mc68000", "1"}, +#endif +#ifdef mc68020 + {"mc68020", "1"}, +#endif +#ifdef __GNUC__ + {"__GNUC__", "1"}, +#endif +#if __STDC__ + {"__STDC__", "1"}, +#endif +#ifdef __HIGHC__ + {"__HIGHC__", "1"}, +#endif +#ifdef CMU + {"CMU", "1"}, +#endif +#ifdef luna + {"luna", "1"}, +#ifdef luna1 + {"luna1", "1"}, +#endif +#ifdef luna2 + {"luna2", "1"}, +#endif +#ifdef luna88k + {"luna88k", "1"}, +#endif +#ifdef uniosb + {"uniosb", "1"}, +#endif +#ifdef uniosu + {"uniosu", "1"}, +#endif +#endif +#ifdef ieeep754 + {"ieeep754", "1"}, +#endif +#ifdef is68k + {"is68k", "1"}, +#endif +#ifdef m68k + {"m68k", "1"}, +#endif +#ifdef m88k + {"m88k", "1"}, +#endif +#ifdef __m88k__ + {"__m88k__", "1"}, +#endif +#ifdef bsd43 + {"bsd43", "1"}, +#endif +#ifdef hcx + {"hcx", "1"}, +#endif +#ifdef sony + {"sony", "1"}, +#ifdef SYSTYPE_SYSV + {"SYSTYPE_SYSV", "1"}, +#endif +#ifdef _SYSTYPE_SYSV + {"_SYSTYPE_SYSV", "1"}, +#endif +#endif +#ifdef __OSF__ + {"__OSF__", "1"}, +#endif +#ifdef __osf__ + {"__osf__", "1"}, +#endif +#ifdef __alpha + {"__alpha", "1"}, +#endif +#ifdef __DECC + {"__DECC", "1"}, +#endif +#ifdef __decc + {"__decc", "1"}, +#endif +#ifdef __uxp__ + {"__uxp__", "1"}, +#endif +#ifdef __sxg__ + {"__sxg__", "1"}, +#endif +#ifdef _SEQUENT_ + {"_SEQUENT_", "1"}, + {"__STDC__", "1"}, +#endif +#ifdef __bsdi__ + {"__bsdi__", "1"}, +#endif +#ifdef nec_ews_svr2 + {"nec_ews_svr2", "1"}, +#endif +#ifdef nec_ews_svr4 + {"nec_ews_svr4", "1"}, +#endif +#ifdef _nec_ews_svr4 + {"_nec_ews_svr4", "1"}, +#endif +#ifdef _nec_up + {"_nec_up", "1"}, +#endif +#ifdef SX + {"SX", "1"}, +#endif +#ifdef nec + {"nec", "1"}, +#endif +#ifdef _nec_ft + {"_nec_ft", "1"}, +#endif +#ifdef PC_UX + {"PC_UX", "1"}, +#endif +#ifdef sgi + {"sgi", "1"}, +#endif +#ifdef __sgi + {"__sgi", "1"}, +#endif +#ifdef __FreeBSD__ + {"__FreeBSD__", "1"}, +#endif +#ifdef __NetBSD__ + {"__NetBSD__", "1"}, +#endif +#ifdef __OpenBSD__ + {"__OpenBSD__", "1"}, +#endif +#ifdef __EMX__ + {"__EMX__", "1"}, +#endif + /* add any additional symbols before this line */ + {NULL, NULL} +}; + +#endif /* MAKEDEPEND */ +#endif /* CCIMAKE */ diff --git a/security/coreconf/mkdepend/include.c b/security/coreconf/mkdepend/include.c new file mode 100644 index 000000000..b2f179bca --- /dev/null +++ b/security/coreconf/mkdepend/include.c @@ -0,0 +1,308 @@ +/* $XConsortium: include.c,v 1.17 94/12/05 19:33:08 gildea Exp $ */ +/* + +Copyright (c) 1993, 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + +*/ + + +#include "def.h" + +extern struct inclist inclist[ MAXFILES ], + *inclistp; +extern char *includedirs[ ]; +extern char *notdotdot[ ]; +extern boolean show_where_not; +extern boolean warn_multiple; + +struct inclist *inc_path(file, include, dot) + register char *file, + *include; + boolean dot; +{ + static char path[ BUFSIZ ]; + register char **pp, *p; + register struct inclist *ip; + struct stat st; + boolean found = FALSE; + + /* + * Check all previously found include files for a path that + * has already been expanded. + */ + for (ip = inclist; ip->i_file; ip++) + if ((strcmp(ip->i_incstring, include) == 0) && !ip->i_included_sym) + { + found = TRUE; + break; + } + + /* + * If the path was surrounded by "" or is an absolute path, + * then check the exact path provided. + */ + if (!found && (dot || *include == '/')) { + if (stat(include, &st) == 0) { + ip = newinclude(include, include); + found = TRUE; + } + else if (show_where_not) + warning1("\tnot in %s\n", include); + } + + /* + * See if this include file is in the directory of the + * file being compiled. + */ + if (!found) { + for (p=file+strlen(file); p>file; p--) + if (*p == '/') + break; + if (p == file) + strcpy(path, include); + else { + strncpy(path, file, (p-file) + 1); + path[ (p-file) + 1 ] = '\0'; + strcpy(path + (p-file) + 1, include); + } + remove_dotdot(path); + if (stat(path, &st) == 0) { + ip = newinclude(path, include); + found = TRUE; + } + else if (show_where_not) + warning1("\tnot in %s\n", path); + } + + /* + * Check the include directories specified. (standard include dir + * should be at the end.) + */ + if (!found) + for (pp = includedirs; *pp; pp++) { + sprintf(path, "%s/%s", *pp, include); + remove_dotdot(path); + if (stat(path, &st) == 0) { + ip = newinclude(path, include); + found = TRUE; + break; + } + else if (show_where_not) + warning1("\tnot in %s\n", path); + } + + if (!found) + ip = NULL; + return(ip); +} + +/* + * Occasionally, pathnames are created that look like .../x/../y + * Any of the 'x/..' sequences within the name can be eliminated. + * (but only if 'x' is not a symbolic link!!) + */ +remove_dotdot(path) + char *path; +{ + register char *end, *from, *to, **cp; + char *components[ MAXFILES ], + newpath[ BUFSIZ ]; + boolean component_copied; + + /* + * slice path up into components. + */ + to = newpath; + if (*path == '/') + *to++ = '/'; + *to = '\0'; + cp = components; + for (from=end=path; *end; end++) + if (*end == '/') { + while (*end == '/') + *end++ = '\0'; + if (*from) + *cp++ = from; + from = end; + } + *cp++ = from; + *cp = NULL; + + /* + * Recursively remove all 'x/..' component pairs. + */ + cp = components; + while(*cp) { + if (!isdot(*cp) && !isdotdot(*cp) && isdotdot(*(cp+1)) + && !issymbolic(newpath, *cp)) + { + char **fp = cp + 2; + char **tp = cp; + + do + *tp++ = *fp; /* move all the pointers down */ + while (*fp++); + if (cp != components) + cp--; /* go back and check for nested ".." */ + } else { + cp++; + } + } + /* + * Concatenate the remaining path elements. + */ + cp = components; + component_copied = FALSE; + while(*cp) { + if (component_copied) + *to++ = '/'; + component_copied = TRUE; + for (from = *cp; *from; ) + *to++ = *from++; + *to = '\0'; + cp++; + } + *to++ = '\0'; + + /* + * copy the reconstituted path back to our pointer. + */ + strcpy(path, newpath); +} + +isdot(p) + register char *p; +{ + if(p && *p++ == '.' && *p++ == '\0') + return(TRUE); + return(FALSE); +} + +isdotdot(p) + register char *p; +{ + if(p && *p++ == '.' && *p++ == '.' && *p++ == '\0') + return(TRUE); + return(FALSE); +} + +issymbolic(dir, component) + register char *dir, *component; +{ +#ifdef S_IFLNK + struct stat st; + char buf[ BUFSIZ ], **pp; + + sprintf(buf, "%s%s%s", dir, *dir ? "/" : "", component); + for (pp=notdotdot; *pp; pp++) + if (strcmp(*pp, buf) == 0) + return (TRUE); + if (lstat(buf, &st) == 0 + && (st.st_mode & S_IFMT) == S_IFLNK) { + *pp++ = copy(buf); + if (pp >= ¬dotdot[ MAXDIRS ]) + fatalerr("out of .. dirs, increase MAXDIRS\n"); + return(TRUE); + } +#endif + return(FALSE); +} + +/* + * Add an include file to the list of those included by 'file'. + */ +struct inclist *newinclude(newfile, incstring) + register char *newfile, *incstring; +{ + register struct inclist *ip; + + /* + * First, put this file on the global list of include files. + */ + ip = inclistp++; + if (inclistp == inclist + MAXFILES - 1) + fatalerr("out of space: increase MAXFILES\n"); + ip->i_file = copy(newfile); + ip->i_included_sym = FALSE; + if (incstring == NULL) + ip->i_incstring = ip->i_file; + else + ip->i_incstring = copy(incstring); + + return(ip); +} + +included_by(ip, newfile) + register struct inclist *ip, *newfile; +{ + register i; + + if (ip == NULL) + return; + /* + * Put this include file (newfile) on the list of files included + * by 'file'. If 'file' is NULL, then it is not an include + * file itself (i.e. was probably mentioned on the command line). + * If it is already on the list, don't stick it on again. + */ + if (ip->i_list == NULL) + ip->i_list = (struct inclist **) + malloc(sizeof(struct inclist *) * ++ip->i_listlen); + else { + for (i=0; i<ip->i_listlen; i++) + if (ip->i_list[ i ] == newfile) { + i = strlen(newfile->i_file); + if (!ip->i_included_sym && + !(i > 2 && + newfile->i_file[i-1] == 'c' && + newfile->i_file[i-2] == '.')) + { + /* only complain if ip has */ + /* no #include SYMBOL lines */ + /* and is not a .c file */ + if (warn_multiple) + { + warning("%s includes %s more than once!\n", + ip->i_file, newfile->i_file); + warning1("Already have\n"); + for (i=0; i<ip->i_listlen; i++) + warning1("\t%s\n", ip->i_list[i]->i_file); + } + } + return; + } + ip->i_list = (struct inclist **) realloc(ip->i_list, + sizeof(struct inclist *) * ++ip->i_listlen); + } + ip->i_list[ ip->i_listlen-1 ] = newfile; +} + +inc_clean () +{ + register struct inclist *ip; + + for (ip = inclist; ip < inclistp; ip++) { + ip->i_marked = FALSE; + } +} diff --git a/security/coreconf/mkdepend/main.c b/security/coreconf/mkdepend/main.c new file mode 100644 index 000000000..5aa3c7677 --- /dev/null +++ b/security/coreconf/mkdepend/main.c @@ -0,0 +1,710 @@ +/* $XConsortium: main.c,v 1.84 94/11/30 16:10:44 kaleb Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.4 1995/07/15 14:53:49 dawes Exp $ */ +/* + +Copyright (c) 1993, 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + +*/ + +#include "def.h" +#ifdef hpux +#define sigvec sigvector +#endif /* hpux */ + +#ifdef X_POSIX_C_SOURCE +#define _POSIX_C_SOURCE X_POSIX_C_SOURCE +#include <signal.h> +#undef _POSIX_C_SOURCE +#else +#if defined(X_NOT_POSIX) || defined(_POSIX_SOURCE) +#include <signal.h> +#else +#define _POSIX_SOURCE +#include <signal.h> +#undef _POSIX_SOURCE +#endif +#endif + +#if NeedVarargsPrototypes +#include <stdarg.h> +#endif + +#ifdef MINIX +#define USE_CHMOD 1 +#endif + +#ifdef DEBUG +int _debugmask; +#endif + +char *ProgramName; + +char *directives[] = { + "if", + "ifdef", + "ifndef", + "else", + "endif", + "define", + "undef", + "include", + "line", + "pragma", + "error", + "ident", + "sccs", + "elif", + "eject", + NULL +}; + +#define MAKEDEPEND +#include "imakemdep.h" /* from config sources */ +#undef MAKEDEPEND + +struct inclist inclist[ MAXFILES ], + *inclistp = inclist, + maininclist; + +char *filelist[ MAXFILES ]; +char *includedirs[ MAXDIRS + 1 ]; +char *notdotdot[ MAXDIRS ]; +char *objprefix = ""; +char *objsuffix = OBJSUFFIX; +char *startat = "# DO NOT DELETE"; +int width = 78; +boolean append = FALSE; +boolean printed = FALSE; +boolean verbose = FALSE; +boolean show_where_not = FALSE; +boolean warn_multiple = FALSE; /* Warn on multiple includes of same file */ + +static +#ifdef SIGNALRETURNSINT +int +#else +void +#endif +catch (sig) + int sig; +{ + fflush (stdout); + fatalerr ("got signal %d\n", sig); +} + +#if defined(USG) || (defined(i386) && defined(SYSV)) || defined(WIN32) || defined(__EMX__) || defined(Lynx_22) +#define USGISH +#endif + +#ifndef USGISH +#ifndef _POSIX_SOURCE +#define sigaction sigvec +#define sa_handler sv_handler +#define sa_mask sv_mask +#define sa_flags sv_flags +#endif +struct sigaction sig_act; +#endif /* USGISH */ + +main(argc, argv) + int argc; + char **argv; +{ + register char **fp = filelist; + register char **incp = includedirs; + register char *p; + register struct inclist *ip; + char *makefile = NULL; + struct filepointer *filecontent; + struct symtab *psymp = predefs; + char *endmarker = NULL; + char *defincdir = NULL; + + ProgramName = argv[0]; + + while (psymp->s_name) + { + define2(psymp->s_name, psymp->s_value, &maininclist); + psymp++; + } + if (argc == 2 && argv[1][0] == '@') { + struct stat ast; + int afd; + char *args; + char **nargv; + int nargc; + char quotechar = '\0'; + + nargc = 1; + if ((afd = open(argv[1]+1, O_RDONLY)) < 0) + fatalerr("cannot open \"%s\"\n", argv[1]+1); + fstat(afd, &ast); + args = (char *)malloc(ast.st_size + 1); + if ((ast.st_size = read(afd, args, ast.st_size)) < 0) + fatalerr("failed to read %s\n", argv[1]+1); + args[ast.st_size] = '\0'; + close(afd); + for (p = args; *p; p++) { + if (quotechar) { + if (quotechar == '\\' || + (*p == quotechar && p[-1] != '\\')) + quotechar = '\0'; + continue; + } + switch (*p) { + case '\\': + case '"': + case '\'': + quotechar = *p; + break; + case ' ': + case '\n': + *p = '\0'; + if (p > args && p[-1]) + nargc++; + break; + } + } + if (p[-1]) + nargc++; + nargv = (char **)malloc(nargc * sizeof(char *)); + nargv[0] = argv[0]; + argc = 1; + for (p = args; argc < nargc; p += strlen(p) + 1) + if (*p) nargv[argc++] = p; + argv = nargv; + } + for(argc--, argv++; argc; argc--, argv++) { + /* if looking for endmarker then check before parsing */ + if (endmarker && strcmp (endmarker, *argv) == 0) { + endmarker = NULL; + continue; + } + if (**argv != '-') { + /* treat +thing as an option for C++ */ + if (endmarker && **argv == '+') + continue; + *fp++ = argv[0]; + continue; + } + switch(argv[0][1]) { + case '-': + endmarker = &argv[0][2]; + if (endmarker[0] == '\0') endmarker = "--"; + break; + case 'D': + if (argv[0][2] == '\0') { + argv++; + argc--; + } + for (p=argv[0] + 2; *p ; p++) + if (*p == '=') { + *p = ' '; + break; + } + define(argv[0] + 2, &maininclist); + break; + case 'I': + if (incp >= includedirs + MAXDIRS) + fatalerr("Too many -I flags.\n"); + *incp++ = argv[0]+2; + if (**(incp-1) == '\0') { + *(incp-1) = *(++argv); + argc--; + } + break; + case 'Y': + defincdir = argv[0]+2; + break; + /* do not use if endmarker processing */ + case 'a': + if (endmarker) break; + append = TRUE; + break; + case 'w': + if (endmarker) break; + if (argv[0][2] == '\0') { + argv++; + argc--; + width = atoi(argv[0]); + } else + width = atoi(argv[0]+2); + break; + case 'o': + if (endmarker) break; + if (argv[0][2] == '\0') { + argv++; + argc--; + objsuffix = argv[0]; + } else + objsuffix = argv[0]+2; + break; + case 'p': + if (endmarker) break; + if (argv[0][2] == '\0') { + argv++; + argc--; + objprefix = argv[0]; + } else + objprefix = argv[0]+2; + break; + case 'v': + if (endmarker) break; + verbose = TRUE; +#ifdef DEBUG + if (argv[0][2]) + _debugmask = atoi(argv[0]+2); +#endif + break; + case 's': + if (endmarker) break; + startat = argv[0]+2; + if (*startat == '\0') { + startat = *(++argv); + argc--; + } + if (*startat != '#') + fatalerr("-s flag's value should start %s\n", + "with '#'."); + break; + case 'f': + if (endmarker) break; + makefile = argv[0]+2; + if (*makefile == '\0') { + makefile = *(++argv); + argc--; + } + break; + + case 'm': + warn_multiple = TRUE; + break; + + /* Ignore -O, -g so we can just pass ${CFLAGS} to + makedepend + */ + case 'O': + case 'g': + break; + default: + if (endmarker) break; + /* fatalerr("unknown opt = %s\n", argv[0]); */ + warning("ignoring option %s\n", argv[0]); + } + } + if (!defincdir) { +#ifdef PREINCDIR + if (incp >= includedirs + MAXDIRS) + fatalerr("Too many -I flags.\n"); + *incp++ = PREINCDIR; +#endif + if (incp >= includedirs + MAXDIRS) + fatalerr("Too many -I flags.\n"); + *incp++ = INCLUDEDIR; +#ifdef POSTINCDIR + if (incp >= includedirs + MAXDIRS) + fatalerr("Too many -I flags.\n"); + *incp++ = POSTINCDIR; +#endif + } else if (*defincdir) { + if (incp >= includedirs + MAXDIRS) + fatalerr("Too many -I flags.\n"); + *incp++ = defincdir; + } + + redirect(startat, makefile); + + /* + * catch signals. + */ +#ifdef USGISH +/* should really reset SIGINT to SIG_IGN if it was. */ +#ifdef SIGHUP + signal (SIGHUP, catch); +#endif + signal (SIGINT, catch); +#ifdef SIGQUIT + signal (SIGQUIT, catch); +#endif + signal (SIGILL, catch); +#ifdef SIGBUS + signal (SIGBUS, catch); +#endif + signal (SIGSEGV, catch); +#ifdef SIGSYS + signal (SIGSYS, catch); +#endif + signal (SIGFPE, catch); +#else + sig_act.sa_handler = catch; +#ifdef _POSIX_SOURCE + sigemptyset(&sig_act.sa_mask); + sigaddset(&sig_act.sa_mask, SIGINT); + sigaddset(&sig_act.sa_mask, SIGQUIT); +#ifdef SIGBUS + sigaddset(&sig_act.sa_mask, SIGBUS); +#endif + sigaddset(&sig_act.sa_mask, SIGILL); + sigaddset(&sig_act.sa_mask, SIGSEGV); + sigaddset(&sig_act.sa_mask, SIGHUP); + sigaddset(&sig_act.sa_mask, SIGPIPE); +#ifdef SIGSYS + sigaddset(&sig_act.sa_mask, SIGSYS); +#endif +#else + sig_act.sa_mask = ((1<<(SIGINT -1)) + |(1<<(SIGQUIT-1)) +#ifdef SIGBUS + |(1<<(SIGBUS-1)) +#endif + |(1<<(SIGILL-1)) + |(1<<(SIGSEGV-1)) + |(1<<(SIGHUP-1)) + |(1<<(SIGPIPE-1)) +#ifdef SIGSYS + |(1<<(SIGSYS-1)) +#endif + ); +#endif /* _POSIX_SOURCE */ + sig_act.sa_flags = 0; + sigaction(SIGHUP, &sig_act, (struct sigaction *)0); + sigaction(SIGINT, &sig_act, (struct sigaction *)0); + sigaction(SIGQUIT, &sig_act, (struct sigaction *)0); + sigaction(SIGILL, &sig_act, (struct sigaction *)0); +#ifdef SIGBUS + sigaction(SIGBUS, &sig_act, (struct sigaction *)0); +#endif + sigaction(SIGSEGV, &sig_act, (struct sigaction *)0); +#ifdef SIGSYS + sigaction(SIGSYS, &sig_act, (struct sigaction *)0); +#endif +#endif /* USGISH */ + + /* + * now peruse through the list of files. + */ + for(fp=filelist; *fp; fp++) { + filecontent = getfile(*fp); + ip = newinclude(*fp, (char *)NULL); + + find_includes(filecontent, ip, ip, 0, FALSE); + freefile(filecontent); + recursive_pr_include(ip, ip->i_file, base_name(*fp)); + inc_clean(); + } + if (printed) + printf("\n"); + exit(0); +} + +struct filepointer *getfile(file) + char *file; +{ + register int fd; + struct filepointer *content; + struct stat st; + + content = (struct filepointer *)malloc(sizeof(struct filepointer)); + if ((fd = open(file, O_RDONLY)) < 0) { + warning("cannot open \"%s\"\n", file); + content->f_p = content->f_base = content->f_end = (char *)malloc(1); + *content->f_p = '\0'; + return(content); + } + fstat(fd, &st); + content->f_base = (char *)malloc(st.st_size+1); + if (content->f_base == NULL) + fatalerr("cannot allocate mem\n"); + if ((st.st_size = read(fd, content->f_base, st.st_size)) < 0) + fatalerr("failed to read %s\n", file); + close(fd); + content->f_len = st.st_size+1; + content->f_p = content->f_base; + content->f_end = content->f_base + st.st_size; + *content->f_end = '\0'; + content->f_line = 0; + return(content); +} + +freefile(fp) + struct filepointer *fp; +{ + free(fp->f_base); + free(fp); +} + +char *copy(str) + register char *str; +{ + register char *p = (char *)malloc(strlen(str) + 1); + + strcpy(p, str); + return(p); +} + +match(str, list) + register char *str, **list; +{ + register int i; + + for (i=0; *list; i++, list++) + if (strcmp(str, *list) == 0) + return(i); + return(-1); +} + +/* + * Get the next line. We only return lines beginning with '#' since that + * is all this program is ever interested in. + */ +char *getline(filep) + register struct filepointer *filep; +{ + register char *p, /* walking pointer */ + *eof, /* end of file pointer */ + *bol; /* beginning of line pointer */ + register lineno; /* line number */ + + p = filep->f_p; + eof = filep->f_end; + if (p >= eof) + return((char *)NULL); + lineno = filep->f_line; + + for(bol = p--; ++p < eof; ) { + if (*p == '/' && *(p+1) == '*') { /* consume comments */ + *p++ = ' ', *p++ = ' '; + while (*p) { + if (*p == '*' && *(p+1) == '/') { + *p++ = ' ', *p = ' '; + break; + } + else if (*p == '\n') + lineno++; + *p++ = ' '; + } + continue; + } +#ifdef WIN32 + else if (*p == '/' && *(p+1) == '/') { /* consume comments */ + *p++ = ' ', *p++ = ' '; + while (*p && *p != '\n') + *p++ = ' '; + lineno++; + continue; + } +#endif + else if (*p == '\\') { + if (*(p+1) == '\n') { + *p = ' '; + *(p+1) = ' '; + lineno++; + } + } + else if (*p == '\n') { + lineno++; + if (*bol == '#') { + register char *cp; + + *p++ = '\0'; + /* punt lines with just # (yacc generated) */ + for (cp = bol+1; + *cp && (*cp == ' ' || *cp == '\t'); cp++); + if (*cp) goto done; + } + bol = p+1; + } + } + if (*bol != '#') + bol = NULL; +done: + filep->f_p = p; + filep->f_line = lineno; + return(bol); +} + +/* + * Strip the file name down to what we want to see in the Makefile. + * It will have objprefix and objsuffix around it. + */ +char *base_name(file) + register char *file; +{ + register char *p; + + file = copy(file); + for(p=file+strlen(file); p>file && *p != '.'; p--) ; + + if (*p == '.') + *p = '\0'; + return(file); +} + +#if defined(USG) && !defined(CRAY) && !defined(SVR4) && !defined(__EMX__) +int rename (from, to) + char *from, *to; +{ + (void) unlink (to); + if (link (from, to) == 0) { + unlink (from); + return 0; + } else { + return -1; + } +} +#endif /* USGISH */ + +redirect(line, makefile) + char *line, + *makefile; +{ + struct stat st; + FILE *fdin, *fdout; + char backup[ BUFSIZ ], + buf[ BUFSIZ ]; + boolean found = FALSE; + int len; + + /* + * if makefile is "-" then let it pour onto stdout. + */ + if (makefile && *makefile == '-' && *(makefile+1) == '\0') + return; + + /* + * use a default makefile is not specified. + */ + if (!makefile) { + if (stat("Makefile", &st) == 0) + makefile = "Makefile"; + else if (stat("makefile", &st) == 0) + makefile = "makefile"; + else + fatalerr("[mM]akefile is not present\n"); + } + else + stat(makefile, &st); + if ((fdin = fopen(makefile, "r")) == NULL) + fatalerr("cannot open \"%s\"\n", makefile); + sprintf(backup, "%s.bak", makefile); + unlink(backup); +#if defined(WIN32) || defined(__EMX__) + fclose(fdin); +#endif + if (rename(makefile, backup) < 0) + fatalerr("cannot rename %s to %s\n", makefile, backup); +#if defined(WIN32) || defined(__EMX__) + if ((fdin = fopen(backup, "r")) == NULL) + fatalerr("cannot open \"%s\"\n", backup); +#endif + if ((fdout = freopen(makefile, "w", stdout)) == NULL) + fatalerr("cannot open \"%s\"\n", backup); + len = strlen(line); + while (!found && fgets(buf, BUFSIZ, fdin)) { + if (*buf == '#' && strncmp(line, buf, len) == 0) + found = TRUE; + fputs(buf, fdout); + } + if (!found) { + if (verbose) + warning("Adding new delimiting line \"%s\" and dependencies...\n", + line); + puts(line); /* same as fputs(fdout); but with newline */ + } else if (append) { + while (fgets(buf, BUFSIZ, fdin)) { + fputs(buf, fdout); + } + } + fflush(fdout); +#if defined(USGISH) || defined(_SEQUENT_) || defined(USE_CHMOD) + chmod(makefile, st.st_mode); +#else + fchmod(fileno(fdout), st.st_mode); +#endif /* USGISH */ +} + +#if NeedVarargsPrototypes +fatalerr(char *msg, ...) +#else +/*VARARGS*/ +fatalerr(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) + char *msg; +#endif +{ +#if NeedVarargsPrototypes + va_list args; +#endif + fprintf(stderr, "%s: error: ", ProgramName); +#if NeedVarargsPrototypes + va_start(args, msg); + vfprintf(stderr, msg, args); + va_end(args); +#else + fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); +#endif + exit (1); +} + +#if NeedVarargsPrototypes +warning(char *msg, ...) +#else +/*VARARGS0*/ +warning(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) + char *msg; +#endif +{ +#ifdef DEBUG_MKDEPEND +#if NeedVarargsPrototypes + va_list args; +#endif + fprintf(stderr, "%s: warning: ", ProgramName); +#if NeedVarargsPrototypes + va_start(args, msg); + vfprintf(stderr, msg, args); + va_end(args); +#else + fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); +#endif +#endif /* DEBUG_MKDEPEND */ +} + +#if NeedVarargsPrototypes +warning1(char *msg, ...) +#else +/*VARARGS0*/ +warning1(msg,x1,x2,x3,x4,x5,x6,x7,x8,x9) + char *msg; +#endif +{ +#ifdef DEBUG_MKDEPEND +#if NeedVarargsPrototypes + va_list args; + va_start(args, msg); + vfprintf(stderr, msg, args); + va_end(args); +#else + fprintf(stderr, msg,x1,x2,x3,x4,x5,x6,x7,x8,x9); +#endif +#endif /* DEBUG_MKDEPEND */ +} diff --git a/security/coreconf/mkdepend/mkdepend.man b/security/coreconf/mkdepend/mkdepend.man new file mode 100644 index 000000000..9c3cdccd9 --- /dev/null +++ b/security/coreconf/mkdepend/mkdepend.man @@ -0,0 +1,368 @@ +.\" $XConsortium: mkdepend.man,v 1.15 94/04/17 20:10:37 gildea Exp $ +.\" Copyright (c) 1993, 1994 X Consortium +.\" +.\" Permission is hereby granted, free of charge, to any person obtaining a +.\" copy of this software and associated documentation files (the "Software"), +.\" to deal in the Software without restriction, including without limitation +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software furnished to do so, subject to the following conditions: +.\" +.\" The above copyright notice and this permission notice shall be included in +.\" all copies or substantial portions of the Software. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF +.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +.\" SOFTWARE. +.\" +.\" Except as contained in this notice, the name of the X Consortium shall not +.\" be used in advertising or otherwise to promote the sale, use or other +.\" dealing in this Software without prior written authorization from the +.\" X Consortium. +.TH MAKEDEPEND 1 "Release 6" "X Version 11" +.UC 4 +.SH NAME +makedepend \- create dependencies in makefiles +.SH SYNOPSIS +.B makedepend +[ +.B \-Dname=def +] [ +.B \-Dname +] [ +.B \-Iincludedir +] [ +.B \-Yincludedir +] [ +.B \-a +] [ +.B \-fmakefile +] [ +.B \-oobjsuffix +] [ +.B \-pobjprefix +] [ +.B \-sstring +] [ +.B \-wwidth +] [ +.B \-v +] [ +.B \-m +] [ +\-\^\- +.B otheroptions +\-\^\- +] +sourcefile .\|.\|. +.br +.SH DESCRIPTION +.B Makedepend +reads each +.I sourcefile +in sequence and parses it like a C-preprocessor, +processing all +.I #include, +.I #define, +.I #undef, +.I #ifdef, +.I #ifndef, +.I #endif, +.I #if +and +.I #else +directives so that it can correctly tell which +.I #include, +directives would be used in a compilation. +Any +.I #include, +directives can reference files having other +.I #include +directives, and parsing will occur in these files as well. +.PP +Every file that a +.I sourcefile +includes, +directly or indirectly, +is what +.B makedepend +calls a "dependency". +These dependencies are then written to a +.I makefile +in such a way that +.B make(1) +will know which object files must be recompiled when a dependency has changed. +.PP +By default, +.B makedepend +places its output in the file named +.I makefile +if it exists, otherwise +.I Makefile. +An alternate makefile may be specified with the +.B \-f +option. +It first searches the makefile for +the line +.sp + # DO NOT DELETE THIS LINE \-\^\- make depend depends on it. +.sp +or one provided with the +.B \-s +option, +as a delimiter for the dependency output. +If it finds it, it will delete everything +following this to the end of the makefile +and put the output after this line. +If it doesn't find it, the program +will append the string to the end of the makefile +and place the output following that. +For each +.I sourcefile +appearing on the command line, +.B makedepend +puts lines in the makefile of the form +.sp + sourcefile.o:\0dfile .\|.\|. +.sp +Where "sourcefile.o" is the name from the command +line with its suffix replaced with ".o", +and "dfile" is a dependency discovered in a +.I #include +directive while parsing +.I sourcefile +or one of the files it included. +.SH EXAMPLE +Normally, +.B makedepend +will be used in a makefile target so that typing "make depend" will +bring the dependencies up to date for the makefile. +For example, +.nf + SRCS\0=\0file1.c\0file2.c\0.\|.\|. + CFLAGS\0=\0\-O\0\-DHACK\0\-I\^.\^.\^/foobar\0\-xyz + depend: + makedepend\0\-\^\-\0$(CFLAGS)\0\-\^\-\0$(SRCS) +.fi +.SH OPTIONS +.B Makedepend +will ignore any option that it does not understand so that you may use +the same arguments that you would for +.B cc(1). +.TP 5 +.B \-Dname=def or \-Dname +Define. +This places a definition for +.I name +in +.B makedepend's +symbol table. +Without +.I =def +the symbol becomes defined as "1". +.TP 5 +.B \-Iincludedir +Include directory. +This option tells +.B makedepend +to prepend +.I includedir +to its list of directories to search when it encounters +a +.I #include +directive. +By default, +.B makedepend +only searches the standard include directories (usually /usr/include +and possibly a compiler-dependent directory). +.TP 5 +.B \-Yincludedir +Replace all of the standard include directories with the single specified +include directory; you can omit the +.I includedir +to simply prevent searching the standard include directories. +.TP 5 +.B \-a +Append the dependencies to the end of the file instead of replacing them. +.TP 5 +.B \-fmakefile +Filename. +This allows you to specify an alternate makefile in which +.B makedepend +can place its output. +.TP 5 +.B \-oobjsuffix +Object file suffix. +Some systems may have object files whose suffix is something other +than ".o". +This option allows you to specify another suffix, such as +".b" with +.I -o.b +or ":obj" +with +.I -o:obj +and so forth. +.TP 5 +.B \-pobjprefix +Object file prefix. +The prefix is prepended to the name of the object file. This is +usually used to designate a different directory for the object file. +The default is the empty string. +.TP 5 +.B \-sstring +Starting string delimiter. +This option permits you to specify +a different string for +.B makedepend +to look for in the makefile. +.TP 5 +.B \-wwidth +Line width. +Normally, +.B makedepend +will ensure that every output line that it writes will be no wider than +78 characters for the sake of readability. +This option enables you to change this width. +.TP 5 +.B \-v +Verbose operation. +This option causes +.B makedepend +to emit the list of files included by each input file on standard output. +.TP 5 +.B \-m +Warn about multiple inclusion. +This option causes +.B makedepend +to produce a warning if any input file includes another file more than +once. In previous versions of +.B makedepend +this was the default behavior; the default has been changed to better +match the behavior of the C compiler, which does not consider multiple +inclusion to be an error. This option is provided for backward +compatibility, and to aid in debugging problems related to multiple +inclusion. +.TP 5 +.B "\-\^\- options \-\^\-" +If +.B makedepend +encounters a double hyphen (\-\^\-) in the argument list, +then any unrecognized argument following it +will be silently ignored; a second double hyphen terminates this +special treatment. +In this way, +.B makedepend +can be made to safely ignore esoteric compiler arguments that might +normally be found in a CFLAGS +.B make +macro (see the +.B EXAMPLE +section above). +All options that +.B makedepend +recognizes and appear between the pair of double hyphens +are processed normally. +.SH ALGORITHM +The approach used in this program enables it to run an order of magnitude +faster than any other "dependency generator" I have ever seen. +Central to this performance are two assumptions: +that all files compiled by a single +makefile will be compiled with roughly the same +.I -I +and +.I -D +options; +and that most files in a single directory will include largely the +same files. +.PP +Given these assumptions, +.B makedepend +expects to be called once for each makefile, with +all source files that are maintained by the +makefile appearing on the command line. +It parses each source and include +file exactly once, maintaining an internal symbol table +for each. +Thus, the first file on the command line will take an amount of time +proportional to the amount of time that a normal C preprocessor takes. +But on subsequent files, if it encounter's an include file +that it has already parsed, it does not parse it again. +.PP +For example, +imagine you are compiling two files, +.I file1.c +and +.I file2.c, +they each include the header file +.I header.h, +and the file +.I header.h +in turn includes the files +.I def1.h +and +.I def2.h. +When you run the command +.sp + makedepend\0file1.c\0file2.c +.sp +.B makedepend +will parse +.I file1.c +and consequently, +.I header.h +and then +.I def1.h +and +.I def2.h. +It then decides that the dependencies for this file are +.sp + file1.o:\0header.h\0def1.h\0def2.h +.sp +But when the program parses +.I file2.c +and discovers that it, too, includes +.I header.h, +it does not parse the file, +but simply adds +.I header.h, +.I def1.h +and +.I def2.h +to the list of dependencies for +.I file2.o. +.SH "SEE ALSO" +cc(1), make(1) +.SH BUGS +.B makedepend +parses, but does not currently evaluate, the SVR4 +#predicate(token-list) preprocessor expression; +such expressions are simply assumed to be true. +This may cause the wrong +.I #include +directives to be evaluated. +.PP +Imagine you are parsing two files, +say +.I file1.c +and +.I file2.c, +each includes the file +.I def.h. +The list of files that +.I def.h +includes might truly be different when +.I def.h +is included by +.I file1.c +than when it is included by +.I file2.c. +But once +.B makedepend +arrives at a list of dependencies for a file, +it is cast in concrete. +.SH AUTHOR +Todd Brunhoff, Tektronix, Inc. and MIT Project Athena diff --git a/security/coreconf/mkdepend/parse.c b/security/coreconf/mkdepend/parse.c new file mode 100644 index 000000000..cf557c0ba --- /dev/null +++ b/security/coreconf/mkdepend/parse.c @@ -0,0 +1,567 @@ +/* $XConsortium: parse.c,v 1.30 94/04/17 20:10:38 gildea Exp $ */ +/* + +Copyright (c) 1993, 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + +*/ + +#include "def.h" + +extern char *directives[]; +extern struct inclist maininclist; + +find_includes(filep, file, file_red, recursion, failOK) + struct filepointer *filep; + struct inclist *file, *file_red; + int recursion; + boolean failOK; +{ + register char *line; + register int type; + boolean recfailOK; + + while (line = getline(filep)) { + switch(type = deftype(line, filep, file_red, file, TRUE)) { + case IF: + doif: + type = find_includes(filep, file, + file_red, recursion+1, failOK); + while ((type == ELIF) || (type == ELIFFALSE) || + (type == ELIFGUESSFALSE)) + type = gobble(filep, file, file_red); + if (type == ELSE) + gobble(filep, file, file_red); + break; + case IFFALSE: + case IFGUESSFALSE: + doiffalse: + if (type == IFGUESSFALSE || type == ELIFGUESSFALSE) + recfailOK = TRUE; + else + recfailOK = failOK; + type = gobble(filep, file, file_red); + if (type == ELSE) + find_includes(filep, file, + file_red, recursion+1, recfailOK); + else + if (type == ELIF) + goto doif; + else + if ((type == ELIFFALSE) || (type == ELIFGUESSFALSE)) + goto doiffalse; + break; + case IFDEF: + case IFNDEF: + if ((type == IFDEF && isdefined(line, file_red, NULL)) + || (type == IFNDEF && !isdefined(line, file_red, NULL))) { + debug(1,(type == IFNDEF ? + "line %d: %s !def'd in %s via %s%s\n" : "", + filep->f_line, line, + file->i_file, file_red->i_file, ": doit")); + type = find_includes(filep, file, + file_red, recursion+1, failOK); + while (type == ELIF || type == ELIFFALSE || type == ELIFGUESSFALSE) + type = gobble(filep, file, file_red); + if (type == ELSE) + gobble(filep, file, file_red); + } + else { + debug(1,(type == IFDEF ? + "line %d: %s !def'd in %s via %s%s\n" : "", + filep->f_line, line, + file->i_file, file_red->i_file, ": gobble")); + type = gobble(filep, file, file_red); + if (type == ELSE) + find_includes(filep, file, + file_red, recursion+1, failOK); + else if (type == ELIF) + goto doif; + else if (type == ELIFFALSE || type == ELIFGUESSFALSE) + goto doiffalse; + } + break; + case ELSE: + case ELIFFALSE: + case ELIFGUESSFALSE: + case ELIF: + if (!recursion) + gobble(filep, file, file_red); + case ENDIF: + if (recursion) + return(type); + case DEFINE: + define(line, file); + break; + case UNDEF: + if (!*line) { + warning("%s, line %d: incomplete undef == \"%s\"\n", + file_red->i_file, filep->f_line, line); + break; + } + undefine(line, file_red); + break; + case INCLUDE: + add_include(filep, file, file_red, line, FALSE, failOK); + break; + case INCLUDEDOT: + add_include(filep, file, file_red, line, TRUE, failOK); + break; + case ERROR: + warning("%s: %d: %s\n", file_red->i_file, + filep->f_line, line); + break; + + case PRAGMA: + case IDENT: + case SCCS: + case EJECT: + break; + case -1: + warning("%s", file_red->i_file); + if (file_red != file) + warning1(" (reading %s)", file->i_file); + warning1(", line %d: unknown directive == \"%s\"\n", + filep->f_line, line); + break; + case -2: + warning("%s", file_red->i_file); + if (file_red != file) + warning1(" (reading %s)", file->i_file); + warning1(", line %d: incomplete include == \"%s\"\n", + filep->f_line, line); + break; + } + } + return(-1); +} + +gobble(filep, file, file_red) + register struct filepointer *filep; + struct inclist *file, *file_red; +{ + register char *line; + register int type; + + while (line = getline(filep)) { + switch(type = deftype(line, filep, file_red, file, FALSE)) { + case IF: + case IFFALSE: + case IFGUESSFALSE: + case IFDEF: + case IFNDEF: + type = gobble(filep, file, file_red); + while ((type == ELIF) || (type == ELIFFALSE) || + (type == ELIFGUESSFALSE)) + type = gobble(filep, file, file_red); + if (type == ELSE) + (void)gobble(filep, file, file_red); + break; + case ELSE: + case ENDIF: + debug(0,("%s, line %d: #%s\n", + file->i_file, filep->f_line, + directives[type])); + return(type); + case DEFINE: + case UNDEF: + case INCLUDE: + case INCLUDEDOT: + case PRAGMA: + case ERROR: + case IDENT: + case SCCS: + case EJECT: + break; + case ELIF: + case ELIFFALSE: + case ELIFGUESSFALSE: + return(type); + case -1: + warning("%s, line %d: unknown directive == \"%s\"\n", + file_red->i_file, filep->f_line, line); + break; + } + } + return(-1); +} + +/* + * Decide what type of # directive this line is. + */ +int deftype (line, filep, file_red, file, parse_it) + register char *line; + register struct filepointer *filep; + register struct inclist *file_red, *file; + int parse_it; +{ + register char *p; + char *directive, savechar; + register int ret; + + /* + * Parse the directive... + */ + directive=line+1; + while (*directive == ' ' || *directive == '\t') + directive++; + + p = directive; + while (*p >= 'a' && *p <= 'z') + p++; + savechar = *p; + *p = '\0'; + ret = match(directive, directives); + *p = savechar; + + /* If we don't recognize this compiler directive or we happen to just + * be gobbling up text while waiting for an #endif or #elif or #else + * in the case of an #elif we must check the zero_value and return an + * ELIF or an ELIFFALSE. + */ + + if (ret == ELIF && !parse_it) + { + while (*p == ' ' || *p == '\t') + p++; + /* + * parse an expression. + */ + debug(0,("%s, line %d: #elif %s ", + file->i_file, filep->f_line, p)); + ret = zero_value(p, filep, file_red); + if (ret != IF) + { + debug(0,("false...\n")); + if (ret == IFFALSE) + return(ELIFFALSE); + else + return(ELIFGUESSFALSE); + } + else + { + debug(0,("true...\n")); + return(ELIF); + } + } + + if (ret < 0 || ! parse_it) + return(ret); + + /* + * now decide how to parse the directive, and do it. + */ + while (*p == ' ' || *p == '\t') + p++; + switch (ret) { + case IF: + /* + * parse an expression. + */ + ret = zero_value(p, filep, file_red); + debug(0,("%s, line %d: %s #if %s\n", + file->i_file, filep->f_line, ret?"false":"true", p)); + break; + case IFDEF: + case IFNDEF: + debug(0,("%s, line %d: #%s %s\n", + file->i_file, filep->f_line, directives[ret], p)); + case UNDEF: + /* + * separate the name of a single symbol. + */ + while (isalnum(*p) || *p == '_') + *line++ = *p++; + *line = '\0'; + break; + case INCLUDE: + debug(2,("%s, line %d: #include %s\n", + file->i_file, filep->f_line, p)); + + /* Support ANSI macro substitution */ + { + struct symtab *sym = isdefined(p, file_red, NULL); + while (sym) { + p = sym->s_value; + debug(3,("%s : #includes SYMBOL %s = %s\n", + file->i_incstring, + sym -> s_name, + sym -> s_value)); + /* mark file as having included a 'soft include' */ + file->i_included_sym = TRUE; + sym = isdefined(p, file_red, NULL); + } + } + + /* + * Separate the name of the include file. + */ + while (*p && *p != '"' && *p != '<') + p++; + if (! *p) + return(-2); + if (*p++ == '"') { + ret = INCLUDEDOT; + while (*p && *p != '"') + *line++ = *p++; + } else + while (*p && *p != '>') + *line++ = *p++; + *line = '\0'; + break; + case DEFINE: + /* + * copy the definition back to the beginning of the line. + */ + strcpy (line, p); + break; + case ELSE: + case ENDIF: + case ELIF: + case PRAGMA: + case ERROR: + case IDENT: + case SCCS: + case EJECT: + debug(0,("%s, line %d: #%s\n", + file->i_file, filep->f_line, directives[ret])); + /* + * nothing to do. + */ + break; + } + return(ret); +} + +struct symtab *isdefined(symbol, file, srcfile) + register char *symbol; + struct inclist *file; + struct inclist **srcfile; +{ + register struct symtab *val; + + if (val = slookup(symbol, &maininclist)) { + debug(1,("%s defined on command line\n", symbol)); + if (srcfile != NULL) *srcfile = &maininclist; + return(val); + } + if (val = fdefined(symbol, file, srcfile)) + return(val); + debug(1,("%s not defined in %s\n", symbol, file->i_file)); + return(NULL); +} + +struct symtab *fdefined(symbol, file, srcfile) + register char *symbol; + struct inclist *file; + struct inclist **srcfile; +{ + register struct inclist **ip; + register struct symtab *val; + register int i; + static int recurse_lvl = 0; + + if (file->i_defchecked) + return(NULL); + file->i_defchecked = TRUE; + if (val = slookup(symbol, file)) + debug(1,("%s defined in %s as %s\n", symbol, file->i_file, val->s_value)); + if (val == NULL && file->i_list) + { + for (ip = file->i_list, i=0; i < file->i_listlen; i++, ip++) + if (val = fdefined(symbol, *ip, srcfile)) { + break; + } + } + else if (val != NULL && srcfile != NULL) *srcfile = file; + recurse_lvl--; + file->i_defchecked = FALSE; + + return(val); +} + +/* + * Return type based on if the #if expression evaluates to 0 + */ +zero_value(exp, filep, file_red) + register char *exp; + register struct filepointer *filep; + register struct inclist *file_red; +{ + if (cppsetup(exp, filep, file_red)) + return(IFFALSE); + else + return(IF); +} + +define(def, file) + char *def; + struct inclist *file; +{ + char *val; + + /* Separate symbol name and its value */ + val = def; + while (isalnum(*val) || *val == '_') + val++; + if (*val) + *val++ = '\0'; + while (*val == ' ' || *val == '\t') + val++; + + if (!*val) + val = "1"; + define2(def, val, file); +} + +define2(name, val, file) + char *name, *val; + struct inclist *file; +{ + int first, last, below; + register struct symtab *sp = NULL, *dest; + + /* Make space if it's needed */ + if (file->i_defs == NULL) + { + file->i_defs = (struct symtab *) + malloc(sizeof (struct symtab) * SYMTABINC); + file->i_deflen = SYMTABINC; + file->i_ndefs = 0; + } + else if (file->i_ndefs == file->i_deflen) + file->i_defs = (struct symtab *) + realloc(file->i_defs, + sizeof(struct symtab)*(file->i_deflen+=SYMTABINC)); + + if (file->i_defs == NULL) + fatalerr("malloc()/realloc() failure in insert_defn()\n"); + + below = first = 0; + last = file->i_ndefs - 1; + while (last >= first) + { + /* Fast inline binary search */ + register char *s1; + register char *s2; + register int middle = (first + last) / 2; + + /* Fast inline strchr() */ + s1 = name; + s2 = file->i_defs[middle].s_name; + while (*s1++ == *s2++) + if (s2[-1] == '\0') break; + + /* If exact match, set sp and break */ + if (*--s1 == *--s2) + { + sp = file->i_defs + middle; + break; + } + + /* If name > i_defs[middle] ... */ + if (*s1 > *s2) + { + below = first; + first = middle + 1; + } + /* else ... */ + else + { + below = last = middle - 1; + } + } + + /* Search is done. If we found an exact match to the symbol name, + just replace its s_value */ + if (sp != NULL) + { + free(sp->s_value); + sp->s_value = copy(val); + return; + } + + sp = file->i_defs + file->i_ndefs++; + dest = file->i_defs + below + 1; + while (sp > dest) + { + *sp = sp[-1]; + sp--; + } + sp->s_name = copy(name); + sp->s_value = copy(val); +} + +struct symtab *slookup(symbol, file) + register char *symbol; + register struct inclist *file; +{ + register int first = 0; + register int last = file->i_ndefs - 1; + + if (file) while (last >= first) + { + /* Fast inline binary search */ + register char *s1; + register char *s2; + register int middle = (first + last) / 2; + + /* Fast inline strchr() */ + s1 = symbol; + s2 = file->i_defs[middle].s_name; + while (*s1++ == *s2++) + if (s2[-1] == '\0') break; + + /* If exact match, we're done */ + if (*--s1 == *--s2) + { + return file->i_defs + middle; + } + + /* If symbol > i_defs[middle] ... */ + if (*s1 > *s2) + { + first = middle + 1; + } + /* else ... */ + else + { + last = middle - 1; + } + } + return(NULL); +} + +undefine(symbol, file) + char *symbol; + register struct inclist *file; +{ + register struct symtab *ptr; + struct inclist *srcfile; + while ((ptr = isdefined(symbol, file, &srcfile)) != NULL) + { + srcfile->i_ndefs--; + for (; ptr < srcfile->i_defs + srcfile->i_ndefs; ptr++) + *ptr = ptr[1]; + } +} diff --git a/security/coreconf/mkdepend/pr.c b/security/coreconf/mkdepend/pr.c new file mode 100644 index 000000000..20970f774 --- /dev/null +++ b/security/coreconf/mkdepend/pr.c @@ -0,0 +1,132 @@ +/* $XConsortium: pr.c,v 1.17 94/04/17 20:10:38 gildea Exp $ */ +/* + +Copyright (c) 1993, 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not be +used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization from the X Consortium. + +*/ + +#include "def.h" + +extern struct inclist inclist[ MAXFILES ], + *inclistp; +extern char *objprefix; +extern char *objsuffix; +extern int width; +extern boolean printed; +extern boolean verbose; +extern boolean show_where_not; + +add_include(filep, file, file_red, include, dot, failOK) + struct filepointer *filep; + struct inclist *file, *file_red; + char *include; + boolean dot; +{ + register struct inclist *newfile; + register struct filepointer *content; + + /* + * First decide what the pathname of this include file really is. + */ + newfile = inc_path(file->i_file, include, dot); + if (newfile == NULL) { + if (failOK) + return; + if (file != file_red) + warning("%s (reading %s, line %d): ", + file_red->i_file, file->i_file, filep->f_line); + else + warning("%s, line %d: ", file->i_file, filep->f_line); + warning1("cannot find include file \"%s\"\n", include); + show_where_not = TRUE; + newfile = inc_path(file->i_file, include, dot); + show_where_not = FALSE; + } + + if (newfile) { + + /* Only add new dependency files if they don't have "/usr/include" in them. */ + if (!(newfile && newfile->i_file && strstr(newfile->i_file, "/usr/"))) { + included_by(file, newfile); + } + + if (!newfile->i_searched) { + newfile->i_searched = TRUE; + content = getfile(newfile->i_file); + find_includes(content, newfile, file_red, 0, failOK); + freefile(content); + } + } +} + +recursive_pr_include(head, file, base) + register struct inclist *head; + register char *file, *base; +{ + register int i; + + if (head->i_marked) + return; + head->i_marked = TRUE; + if (head->i_file != file) + pr(head, file, base); + for (i=0; i<head->i_listlen; i++) + recursive_pr_include(head->i_list[ i ], file, base); +} + +pr(ip, file, base) + register struct inclist *ip; + char *file, *base; +{ + static char *lastfile; + static int current_len; + register int len, i; + char buf[ BUFSIZ ]; + + printed = TRUE; + len = strlen(ip->i_file)+1; + if (current_len + len > width || file != lastfile) { + lastfile = file; + sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix, + ip->i_file); + len = current_len = strlen(buf); + } + else { + buf[0] = ' '; + strcpy(buf+1, ip->i_file); + current_len += len; + } + fwrite(buf, len, 1, stdout); + + /* + * If verbose is set, then print out what this file includes. + */ + if (! verbose || ip->i_list == NULL || ip->i_notified) + return; + ip->i_notified = TRUE; + lastfile = NULL; + printf("\n# %s includes:", ip->i_file); + for (i=0; i<ip->i_listlen; i++) + printf("\n#\t%s", ip->i_list[ i ]->i_incstring); +} diff --git a/security/coreconf/nsinstall/.cvsignore b/security/coreconf/nsinstall/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/coreconf/nsinstall/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/coreconf/nsinstall/Makefile b/security/coreconf/nsinstall/Makefile.in index 77fd9dacc..a73cd76f6 100644 --- a/security/coreconf/nsinstall/Makefile +++ b/security/coreconf/nsinstall/Makefile.in @@ -31,8 +31,10 @@ # GPL. # -DEPTH = ../.. -CORE_DEPTH = ../.. +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@:$(CORECONF_SOURCE)/nsinstall MODULE = coreconf @@ -42,18 +44,15 @@ PLSRCS = nfspwd.pl PROGRAM = nsinstall -include $(DEPTH)/coreconf/config.mk +include ../autoconf.mk +include $(CORECONF_SOURCE)/config.mk -ifeq (,$(filter-out OS2 WINNT,$(OS_ARCH))) +ifeq ($(OS_ARCH),WINNT) PROGRAM = else TARGETS = $(PROGRAM) $(PLSRCS:.pl=) endif -include $(DEPTH)/coreconf/rules.mk - -# Redefine MAKE_OBJDIR for just this directory -define MAKE_OBJDIR -if test ! -d $(@D); then rm -rf $(@D); mkdir $(@D); fi -endef +include $(CORECONF_SOURCE)/rules.mk +export:: libs diff --git a/security/coreconf/rules.mk b/security/coreconf/rules.mk index 8d27188ed..033e3d28a 100644 --- a/security/coreconf/rules.mk +++ b/security/coreconf/rules.mk @@ -64,7 +64,7 @@ platform:: import:: @echo "== import.pl ==" - @perl -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/import.pl \ + @perl -I$(CORECONF_SOURCE) $(CORECONF_SOURCE)/import.pl \ "RELEASE_TREE=$(RELEASE_TREE)" \ "IMPORTS=$(IMPORTS)" \ "VERSION=$(VERSION)" \ @@ -81,19 +81,26 @@ import:: "$(MDHEADER_JAR)=$(IMPORT_MD_DIR)|$(SOURCE_MD_DIR)/include|" \ "$(MDBINARY_JAR)=$(IMPORT_MD_DIR)|$(SOURCE_MD_DIR)|" -export:: +makefiles: $(SUBMAKEFILES) +ifdef DIRS + @for d in $(filter-out $(STATIC_MAKEFILES), $(DIRS)); do\ + $(MAKE) -C $$d $@ \ + done +endif + +export:: $(SUBMAKEFILES) $(MAKE_DIRS) +$(LOOP_OVER_DIRS) -private_export:: +private_export:: $(SUBMAKEFILES) +$(LOOP_OVER_DIRS) -release_export:: +release_export:: $(SUBMAKEFILES) +$(LOOP_OVER_DIRS) -release_classes:: +release_classes:: $(SUBMAKEFILES) +$(LOOP_OVER_DIRS) -libs program install:: $(TARGETS) +libs program install:: $(SUBMAKEFILES) $(TARGETS) $(MAKE_DIRS) ifdef LIBRARY $(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR) endif @@ -114,17 +121,25 @@ ifdef PROGRAMS endif +$(LOOP_OVER_DIRS) -tests:: +tests:: $(SUBMAKEFILES) +$(LOOP_OVER_DIRS) -clean clobber:: +clean clobber:: $(SUBMAKEFILES) rm -rf $(ALL_TRASH) +$(LOOP_OVER_DIRS) -realclean clobber_all:: +realclean clobber_all:: $(SUBMAKEFILES) rm -rf $(wildcard *.OBJ) dist $(ALL_TRASH) +$(LOOP_OVER_DIRS) +distclean:: $(SUBMAKEFILES) + +$(LOOP_OVER_DIRS) + rm -rf $(ALL_TRASH) ; \ + rm -rf $(wildcard *.map) \ + Makefile .HSancillary \ + $(wildcard *.$(OBJ_SUFFIX)) $(wildcard *.ho) \ + $(wildcard *.$(LIB_SUFFIX)) $(wildcard *.$(DLL_SUFFIX)) + #ifdef ALL_PLATFORMS #all_platforms:: $(NFSPWD) # @d=`$(NFSPWD)`; \ @@ -146,14 +161,14 @@ realclean clobber_all:: ####################################################################### -release_clean:: +release_clean:: $(SUBMAKEFILES) rm -rf $(SOURCE_XP_DIR)/release/$(RELEASE_MD_DIR) -release:: release_clean release_export release_classes release_policy release_md release_jars release_cpdistdir +release:: release_clean release_export release_classes release_md release_jars release_cpdistdir -release_cpdistdir:: +release_cpdistdir:: $(SUBMAKEFILES) @echo "== cpdist.pl ==" - @perl -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/cpdist.pl \ + @perl -I$(CORECONF_SOURCE) $(CORECONF_SOURCE)/cpdist.pl \ "RELEASE_TREE=$(RELEASE_TREE)" \ "CORE_DEPTH=$(CORE_DEPTH)" \ "MODULE=${MODULE}" \ @@ -177,9 +192,9 @@ release_cpdistdir:: # $(SOURCE_RELEASE_xxx_JAR) is a name like yyy.jar # $(SOURCE_RELEASE_xx_DIR) is a name like -release_jars:: +release_jars:: $(SUBMAKEFILES) @echo "== release.pl ==" - @perl -I$(CORE_DEPTH)/coreconf $(CORE_DEPTH)/coreconf/release.pl \ + @perl -I$(CORECONF_SOURCE) $(CORECONF_SOURCE)/release.pl \ "RELEASE_TREE=$(RELEASE_TREE)" \ "PLATFORM=$(PLATFORM)" \ "OS_ARCH=$(OS_ARCH)" \ @@ -232,29 +247,6 @@ endif endif -ifneq ($(POLICY),) -release_policy:: -ifdef LIBRARY - -$(PLCYPATCH) $(PLCYPATCH_ARGS) $(LIBRARY) -endif -ifdef SHARED_LIBRARY - -$(PLCYPATCH) $(PLCYPATCH_ARGS) $(SHARED_LIBRARY) -endif -ifdef IMPORT_LIBRARY - -$(PLCYPATCH) $(PLCYPATCH_ARGS) $(IMPORT_LIBRARY) -endif -ifdef PROGRAM - -$(PLCYPATCH) $(PLCYPATCH_ARGS) $(PROGRAM) -endif -ifdef PROGRAMS - -$(PLCYPATCH) $(PLCYPATCH_ARGS) $(PROGRAMS) -endif - +$(LOOP_OVER_DIRS) -else -release_policy:: - +$(LOOP_OVER_DIRS) -endif - release_md:: ifdef LIBRARY $(INSTALL) -m 444 $(LIBRARY) $(SOURCE_RELEASE_PREFIX)/$(SOURCE_RELEASE_LIB_DIR) @@ -280,7 +272,6 @@ alltags: find . -name dist -prune -o \( -name '*.[hc]' -o -name '*.cp' -o -name '*.cpp' \) -print | xargs ctags -a $(PROGRAM): $(OBJS) $(EXTRA_LIBS) - @$(MAKE_OBJDIR) ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_TARGET),WIN16) echo system windows >w16link @@ -306,17 +297,13 @@ else $(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) endif endif -ifneq ($(POLICY),) - -$(PLCYPATCH) $(PLCYPATCH_ARGS) $@ -endif get_objs: @echo $(OBJS) -$(LIBRARY): $(OBJS) - @$(MAKE_OBJDIR) +$(LIBRARY): $(OBJS) Makefile Makefile.in rm -f $@ - $(AR) $(OBJS) + $(AR) $(AR_FLAGS) $(OBJS) $(RANLIB) $@ ifeq ($(OS_TARGET), WIN16) @@ -332,11 +319,10 @@ $(IMPORT_LIBRARY): $(OBJS) endif ifdef SHARED_LIBRARY_LIBS -SUB_SHLOBJS = $(foreach dir,$(SHARED_LIBRARY_DIRS),$(addprefix $(dir)/,$(shell $(MAKE) -C $(dir) --no-print-directory get_objs))) +SUB_SHLOBJS = $(foreach dir,$(SHARED_LIBRARY_DIRS),$(addprefix $(dir)/,$(shell $(MAKE) -C $(dir) --no-print-directory get_objs MDDEPEND_FILES=))) endif -$(SHARED_LIBRARY): $(OBJS) $(MAPFILE) - @$(MAKE_OBJDIR) +$(SHARED_LIBRARY): $(OBJS) $(MAPFILE) Makefile Makefile.in rm -f $@ ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) echo "#!" > $(OBJDIR)/lib$(LIBRARY_NAME)_syms @@ -384,45 +370,39 @@ ifeq ($(OS_ARCH),OpenVMS) endif endif endif -ifneq ($(POLICY),) - -$(PLCYPATCH) $(PLCYPATCH_ARGS) $@ -endif ifeq ($(OS_ARCH), WINNT) $(RES): $(RESNAME) - @$(MAKE_OBJDIR) # The resource compiler does not understand the -U option. $(RC) $(filter-out -U%,$(DEFINES)) $(INCLUDES) -Fo$@ $< @echo $(RES) finished endif $(MAPFILE): $(LIBRARY_NAME).def - @$(MAKE_OBJDIR) ifeq ($(OS_ARCH),SunOS) - grep -v ';-' $(LIBRARY_NAME).def | \ + grep -v ';-' $(srcdir)/$(LIBRARY_NAME).def | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ endif ifeq ($(OS_ARCH),Linux) - grep -v ';-' $(LIBRARY_NAME).def | \ + grep -v ';-' $(srcdir)/$(LIBRARY_NAME).def | \ sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@ endif ifeq ($(OS_ARCH),AIX) - grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ + grep -v ';+' $(srcdir)/$(LIBRARY_NAME).def | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' > $@ endif ifeq ($(OS_ARCH), HP-UX) - grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ + grep -v ';+' $(srcdir)/$(LIBRARY_NAME).def | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,+e ,' > $@ endif ifeq ($(OS_ARCH), OSF1) - grep -v ';+' $(LIBRARY_NAME).def | grep -v ';-' | \ + grep -v ';+' $(srcdir)/$(LIBRARY_NAME).def | grep -v ';-' | \ sed -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,,' -e 's,^,-exported_symbol ,' > $@ endif $(OBJDIR)/$(PROG_PREFIX)%$(PROG_SUFFIX): $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX) - @$(MAKE_OBJDIR) ifeq ($(OS_ARCH),WINNT) $(MKPROG) $(OBJDIR)/$(PROG_PREFIX)$*$(OBJ_SUFFIX) -Fe$@ -link \ $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS) @@ -436,66 +416,59 @@ WCCFLAGS2 := $(subst -I,-i=,$(WCCFLAGS1)) WCCFLAGS3 := $(subst -D,-d,$(WCCFLAGS2)) $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.c - @$(MAKE_OBJDIR) ifeq ($(OS_ARCH), WINNT) ifeq ($(OS_TARGET), WIN16) echo $(WCCFLAGS3) >w16wccf $(CC) -zq -fo$(OBJDIR)\\$(PROG_PREFIX)$*$(OBJ_SUFFIX) @w16wccf $*.c rm w16wccf else - $(CC) -Fo$@ -c $(CFLAGS) $*.c + $(CC) -Fo$@ -c $(CFLAGS) $< endif else ifdef XP_OS2_VACPP - $(CC) -Fo$@ -c $(CFLAGS) $*.c + $(CC) -Fo$@ -c $(CFLAGS) $< else - $(CC) -o $@ -c $(CFLAGS) $*.c + $(CC) -o $@ -c $(CFLAGS) $< endif endif ifneq ($(OS_ARCH), WINNT) $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.s - @$(MAKE_OBJDIR) - $(AS) -o $@ $(ASFLAGS) -c $*.s + $(AS) -o $@ $(ASFLAGS) -c $< endif $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.asm - @$(MAKE_OBJDIR) - $(AS) -Fo$@ $(ASFLAGS) -c $*.asm + $(AS) -Fo$@ $(ASFLAGS) -c $< $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.S - @$(MAKE_OBJDIR) - $(AS) -o $@ $(ASFLAGS) -c $*.S + $(AS) -o $@ $(ASFLAGS) -c $< $(OBJDIR)/$(PROG_PREFIX)%: %.cpp - @$(MAKE_OBJDIR) ifeq ($(OS_ARCH), WINNT) - $(CCC) -Fo$@ -c $(CFLAGS) $< + $(CCC) -Fo$@ -c $(CXXFLAGS) $< else - $(CCC) -o $@ -c $(CFLAGS) $< + $(CCC) -o $@ -c $(CXXFLAGS) $< endif # # Please keep the next two rules in sync. # $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.cc - @$(MAKE_OBJDIR) $(CCC) -o $@ -c $(CFLAGS) $*.cc $(OBJDIR)/$(PROG_PREFIX)%$(OBJ_SUFFIX): %.cpp - @$(MAKE_OBJDIR) ifdef STRICT_CPLUSPLUS_SUFFIX echo "#line 1 \"$*.cpp\"" | cat - $*.cpp > $(OBJDIR)/t_$*.cc - $(CCC) -o $@ -c $(CFLAGS) $(OBJDIR)/t_$*.cc + $(CCC) -o $@ -c $(CXXFLAGS) $(OBJDIR)/t_$*.cc rm -f $(OBJDIR)/t_$*.cc else ifeq ($(OS_ARCH),WINNT) - $(CCC) -Fo$@ -c $(CFLAGS) $*.cpp + $(CCC) -Fo$@ -c $(CXXFLAGS) $< else ifdef XP_OS2_VACPP - $(CCC) -Fo$@ -c $(CFLAGS) $*.cpp + $(CCC) -Fo$@ -c $(CXXFLAGS) $< else - $(CCC) -o $@ -c $(CFLAGS) $*.cpp + $(CCC) -o $@ -c $(CXXFLAGS) $< endif endif endif #STRICT_CPLUSPLUS_SUFFIX @@ -503,16 +476,16 @@ endif #STRICT_CPLUSPLUS_SUFFIX %.i: %.cpp ifeq ($(OS_TARGET), WIN16) echo $(WCCFLAGS3) >w16wccf - $(CCC) -pl -fo=$* @w16wccf $*.cpp + $(CCC) -pl -fo=$* @w16wccf $< rm w16wccf else - $(CCC) -C -E $(CFLAGS) $< > $*.i + $(CCC) -C -E $(CXXFLAGS) $< > $*.i endif %.i: %.c ifeq ($(OS_TARGET), WIN16) echo $(WCCFLAGS3) >w16wccf - $(CC) -pl -fo=$* @w16wccf $*.c + $(CC) -pl -fo=$* @w16wccf $< rm w16wccf else ifeq ($(OS_ARCH),WINNT) @@ -528,10 +501,20 @@ ifneq ($(OS_ARCH), WINNT) endif %: %.pl - rm -f $@; cp $*.pl $@; chmod +x $@ + rm -f $@; cp $< $@; chmod +x $@ %: %.sh - rm -f $@; cp $*.sh $@; chmod +x $@ + rm -f $@; cp $< $@; chmod +x $@ + +# Cancel these implicit rules +# +%: %,v + +%: RCS/%,v + +%: s.% + +%: SCCS/s.% ifdef DIRS $(DIRS):: @@ -546,6 +529,25 @@ $(DIRS):: $(CLICK_STOPWATCH) endif +############################################################################### +# Update Makefiles +############################################################################### +# Note: Passing depth to make-makefile is optional. +# It saves the script some work, though. +Makefile: Makefile.in $(topsrcdir)/configure + @$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(MOD_DEPTH) + +ifdef SUBMAKEFILES +# VPATH does not work on some machines in this case, so add $(srcdir) +$(SUBMAKEFILES): + @$(PERL) $(AUTOCONF_TOOLS)/make-makefile -t $(topsrcdir) -d $(MOD_DEPTH) $@ +endif + +ifdef AUTOUPDATE_CONFIGURE +$(topsrcdir)/configure: $(topsrcdir)/configure.in + (cd $(topsrcdir) && $(AUTOCONF)) && (cd $(DEPTH) && ./config.status --recheck) +endif + ################################################################################ # Bunch of things that extend the 'export' rule (in order): ################################################################################ @@ -585,7 +587,7 @@ ifdef NETLIBDEPTH CORE_DEPTH := $(NETLIBDEPTH) endif -JAVA_EXPORT_SRCS=$(shell perl $(CORE_DEPTH)/coreconf/outofdate.pl $(PERLARG) -d $(JAVA_DESTPATH)/$(PACKAGE) $(JSRCS) $(PRIVATE_JSRCS)) +JAVA_EXPORT_SRCS=$(shell perl $(CORECONF_SOURCE)/outofdate.pl $(PERLARG) -d $(JAVA_DESTPATH)/$(PACKAGE) $(JSRCS) $(PRIVATE_JSRCS)) export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE) ifneq ($(JAVA_EXPORT_SRCS),) @@ -621,7 +623,7 @@ export:: $(JAVA_DESTPATH) $(JAVA_DESTPATH)/$(PACKAGE) if test -d $$d; then \ set $(EXIT_ON_ERROR); \ files=`echo $$d/*.java`; \ - list=`perl $(CORE_DEPTH)/coreconf/outofdate.pl $(PERLARG) \ + list=`perl $(CORECONF_SOURCE)/outofdate.pl $(PERLARG) \ -d $(JAVA_DESTPATH)/$(PACKAGE) $$files`; \ if test "$${list}x" != "x"; then \ echo Building all java files in $$d; \ @@ -673,15 +675,15 @@ export:: @echo Generating/Updating JDK stubs $(JAVAH) -stubs -d $(JDK_STUB_DIR) $(JDK_PACKAGE_CLASSES) ifndef NO_MAC_JAVA_SHIT - @if test ! -d $(CORE_DEPTH)/lib/mac/Java/; then \ + @if test ! -d $(topsrcdir)/lib/mac/Java/; then \ echo "!!! You need to have a ns/lib/mac/Java directory checked out."; \ echo "!!! This allows us to automatically update generated files for the mac."; \ echo "!!! If you see any modified files there, please check them in."; \ fi @echo Generating/Updating JDK headers for the Mac - $(JAVAH) -mac -d $(CORE_DEPTH)/lib/mac/Java/_gen $(JDK_PACKAGE_CLASSES) + $(JAVAH) -mac -d $(topsrcdir)/lib/mac/Java/_gen $(JDK_PACKAGE_CLASSES) @echo Generating/Updating JDK stubs for the Mac - $(JAVAH) -mac -stubs -d $(CORE_DEPTH)/lib/mac/Java/_stubs $(JDK_PACKAGE_CLASSES) + $(JAVAH) -mac -stubs -d $(topsrcdir)/lib/mac/Java/_stubs $(JDK_PACKAGE_CLASSES) endif endif endif @@ -722,15 +724,15 @@ export:: @echo Generating/Updating JRI stubs $(JAVAH) -jri -stubs -d $(JRI_GEN_DIR) $(JRI_PACKAGE_CLASSES) ifndef NO_MAC_JAVA_SHIT - @if test ! -d $(CORE_DEPTH)/lib/mac/Java/; then \ + @if test ! -d $(topsrcdir)/lib/mac/Java/; then \ echo "!!! You need to have a ns/lib/mac/Java directory checked out."; \ echo "!!! This allows us to automatically update generated files for the mac."; \ echo "!!! If you see any modified files there, please check them in."; \ fi @echo Generating/Updating JRI headers for the Mac - $(JAVAH) -jri -mac -d $(CORE_DEPTH)/lib/mac/Java/_jri $(JRI_PACKAGE_CLASSES) + $(JAVAH) -jri -mac -d $(TOPSRCDIR)/lib/mac/Java/_jri $(JRI_PACKAGE_CLASSES) @echo Generating/Updating JRI stubs for the Mac - $(JAVAH) -jri -mac -stubs -d $(CORE_DEPTH)/lib/mac/Java/_jri $(JRI_PACKAGE_CLASSES) + $(JAVAH) -jri -mac -stubs -d $(TOPSRCDIR)/lib/mac/Java/_jri $(JRI_PACKAGE_CLASSES) endif endif endif @@ -750,7 +752,7 @@ export:: $(JAVAH) -jni -d $(JNI_GEN_DIR) $(JNI_GEN); \ else \ echo "Checking for out of date header files" ; \ - cmd="perl $(CORE_DEPTH)/coreconf/jniregen.pl $(PERLARG) \ + cmd="perl $(CORECONF_SOURCE)/jniregen.pl $(PERLARG) \ -d $(JAVA_DESTPATH) $(JNI_GEN)"; \ echo $$cmd; \ list=`$$cmd`; \ @@ -797,7 +799,6 @@ $(JMC_GEN_DIR)/M%.c: $(JMCSRCDIR)/%.class $(JMC) -d $(JMC_GEN_DIR) -module $(JMC_GEN_FLAGS) $(?F:.class=) $(OBJDIR)/M%$(OBJ_SUFFIX): $(JMC_GEN_DIR)/M%.h $(JMC_GEN_DIR)/M%.c - @$(MAKE_OBJDIR) $(CC) -o $@ -c $(CFLAGS) $(JMC_GEN_DIR)/M$*.c export:: $(JMC_HEADERS) $(JMC_STUBS) @@ -815,6 +816,8 @@ endif endif ifneq ($(EXPORTS),) +EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS)) +EXPORTS += $(GEN_EXPORTS) $(PUBLIC_EXPORT_DIR):: @if test ! -d $@; then \ echo Creating $@; \ @@ -841,6 +844,7 @@ $(PRIVATE_EXPORT_DIR):: $(NSINSTALL) -D $@; \ fi +PRIVATE_EXPORTS := $(addprefix $(srcdir)/, $(PRIVATE_EXPORTS)) private_export:: $(PRIVATE_EXPORTS) $(PRIVATE_EXPORT_DIR) $(INSTALL) -m 444 $(PRIVATE_EXPORTS) $(PRIVATE_EXPORT_DIR) else @@ -894,6 +898,7 @@ endif ################################################################################ +ifndef NO_MDUPDATE -include $(DEPENDENCIES) ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) @@ -928,6 +933,7 @@ ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) exit(1); \ }' endif +endif ############################################################################# # X dependency system @@ -936,21 +942,23 @@ endif ifdef MKDEPENDENCIES # For Windows, $(MKDEPENDENCIES) must be -included before including rules.mk +DEPEND_SOURCES = $(addprefix $(srcdir)/, $(CSRCS) $(CPPSRCS) $(ASFILES)) $(MKDEPENDENCIES):: - @$(MAKE_OBJDIR) touch $(MKDEPENDENCIES) chmod u+w $(MKDEPENDENCIES) #on NT, the preceeding touch command creates a read-only file !?!?! #which is why we have to explicitly chmod it. - $(MKDEPEND) -p$(OBJDIR_NAME)/ -o'$(OBJ_SUFFIX)' -f$(MKDEPENDENCIES) \ -$(NOMD_CFLAGS) $(YOPT) $(CSRCS) $(CPPSRCS) $(ASFILES) + $(MKDEPEND) $(OBJDIR_OPTION) -o'$(OBJ_SUFFIX)' -f$(MKDEPENDENCIES) \ +$(NOMD_CFLAGS) $(YOPT) $(DEPEND_SOURCES) + @mv $(MKDEPENDENCIES) depend.mk.old && cat depend.mk.old | sed "s|^$(srcdir)/||g" > $(MKDEPENDENCIES) && rm -f depend.mk.old -$(MKDEPEND):: $(MKDEPEND_DIR)/*.c $(MKDEPEND_DIR)/*.h +$(MKDEPEND):: $(MKDEPEND_SRCDIR)/*.c $(MKDEPEND_SRCDIR)/*.h + cd $(NSINSTALL_DIR); $(MAKE) nsinstall cd $(MKDEPEND_DIR); $(MAKE) ifdef OBJS -depend:: $(MKDEPEND) $(MKDEPENDENCIES) +depend:: $(SUBMAKEFILES) $(MAKE_DIRS) $(MKDEPEND) $(MKDEPENDENCIES) else depend:: endif @@ -960,12 +968,44 @@ dependclean:: rm -f $(MKDEPENDENCIES) +$(LOOP_OVER_DIRS) -#-include $(NSINSTALL_DIR)/$(OBJDIR)/depend.mk +-include $(MKDEPENDENCIES) else depend:: endif +############################################################################# +# Yet another depend system: -MD (configure switch: --enable-md) +ifdef COMPILER_DEPEND +ifdef OBJS +# MDDEPDIR is the subdirectory where all the dependency files are placed. +# This uses a make rule (instead of a macro) to support parallel +# builds (-jN). If this were done in the LOOP_OVER_DIRS macro, two +# processes could simultaneously try to create the same directory. +# +$(MDDEPDIR): + @if test ! -d $@; then echo Creating $@; rm -rf $@; mkdir $@; else true; fi + +MDDEPEND_FILES := $(wildcard $(MDDEPDIR)/*.pp) + +ifdef MDDEPEND_FILES +ifdef PERL +# The script mddepend.pl checks the dependencies and writes to stdout +# one rule to force out-of-date objects. For example, +# foo.o boo.o: FORCE +# The script has an advantage over including the *.pp files directly +# because it handles the case when header files are removed from the build. +# 'make' would complain that there is no way to build missing headers. +$(MDDEPDIR)/.all.pp: FORCE + @$(PERL) $(BUILD_TOOLS)/mddepend.pl $@ $(MDDEPEND_FILES) +-include $(MDDEPDIR)/.all.pp +else +include $(MDDEPEND_FILES) +endif +endif +endif +endif + ################################################################################ # Special gmake rules. ################################################################################ @@ -975,7 +1015,7 @@ endif # hundreds of built-in suffix rules for stuff we don't need. # .SUFFIXES: -.SUFFIXES: .out .a .ln .o .obj .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html .asm +.SUFFIXES: .out .a .ln .o .obj .c .cc .C .cpp .y .l .s .S .h .sh .i .pl .class .java .html .asm .pp .mk .in .mn # # Don't delete these files if we get killed. @@ -986,5 +1026,8 @@ endif # Fake targets. Always run these rules, even if a file/directory with that # name already exists. # -.PHONY: all all_platforms alltags boot clean clobber clobber_all export install libs realclean release $(OBJDIR) $(DIRS) +.PHONY: all all_platforms alltags boot clean clobber clobber_all export install libs realclean release $(OBJDIR) $(DIRS) FORCE + +# Used as a dependency to force targets to rebuild +FORCE: diff --git a/security/coreconf/ruleset.mk b/security/coreconf/ruleset.mk index 3733c41fd..de9766ae1 100644 --- a/security/coreconf/ruleset.mk +++ b/security/coreconf/ruleset.mk @@ -112,14 +112,7 @@ endif ifndef COMPILER_TAG ifneq ($(DEFAULT_COMPILER), $(CC)) -# -# Temporary define for the Client; to be removed when binary release is used -# - ifdef MOZILLA_CLIENT - COMPILER_TAG = - else - COMPILER_TAG = _$(CC) - endif + COMPILER_TAG = _$(CC) else COMPILER_TAG = endif @@ -215,18 +208,28 @@ ifeq ($(OS_ARCH),WINNT) ifneq ($(OS_TARGET), WIN16) OBJS += $(RES) endif - MAKE_OBJDIR = $(INSTALL) -D $(OBJDIR) -else - define MAKE_OBJDIR - if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi - endef endif ifndef PACKAGE PACKAGE = . endif -ALL_TRASH := $(TARGETS) $(OBJS) $(OBJDIR) LOGS TAGS $(GARBAGE) \ +# SUBMAKEFILES: List of Makefiles for next level down. +# This is used to update or create the Makefiles before invoking them. +ifneq ($(DIRS),) +SUBMAKEFILES := $(addsuffix /Makefile, $(filter-out $(STATIC_MAKEFILES), $(DIRS))) +endif + +ALL_TRASH = $(TARGETS) $(OBJS) + +ifdef COMPILER_DEPEND +ifdef OBJS +MAKE_DIRS += $(MDDEPDIR) +ALL_TRASH += $(MDDEPDIR) +endif +endif + +ALL_TRASH += LOGS TAGS $(GARBAGE) \ $(NOSUCHFILE) $(JDK_HEADER_CFILES) $(JDK_STUB_CFILES) \ $(JRI_HEADER_CFILES) $(JRI_STUB_CFILES) $(JNI_HEADERS) $(JMC_STUBS) \ $(JMC_HEADERS) $(JMC_EXPORT_FILES) so_locations \ @@ -251,16 +254,10 @@ else JDK_STUB_DIR = _stubs endif -# -# If this is an "official" build, try to build everything. -# I.e., don't exit on errors. -# - +EXIT_ON_ERROR = -e ifdef BUILD_OFFICIAL - EXIT_ON_ERROR = +e CLICK_STOPWATCH = date else - EXIT_ON_ERROR = -e CLICK_STOPWATCH = true endif @@ -277,6 +274,16 @@ else endif endif +ifdef NSPR_CFLAGS +INCLUDES += $(NSPR_CFLAGS) +else +INCLUDES += -I$(SYSTEM_XP_DIR)/include/nspr +endif + +ifdef DBM_CFLAGS +INCLUDES += $(DBM_CFLAGS) +endif + ifdef SYSTEM_INCL_DIR YOPT = -Y$(SYSTEM_INCL_DIR) endif @@ -301,32 +308,9 @@ endif # special stuff for tests rule in rules.mk ifneq ($(OS_ARCH),WINNT) - REGDATE = $(subst \ ,, $(shell perl $(CORE_DEPTH)/$(MODULE)/scripts/now)) + REGDATE = $(subst \ ,, $(shell perl $(topsrcdir)/$(MODULE)/scripts/now)) else - REGCOREDEPTH = $(subst \\,/,$(CORE_DEPTH)) - REGDATE = $(subst \ ,, $(shell perl $(CORE_DEPTH)/$(MODULE)/scripts/now)) + REGCOREDEPTH = $(subst \\,/,$(topsrcdir)) + REGDATE = $(subst \ ,, $(shell perl $(topsrcdir)/$(MODULE)/scripts/now)) endif -# -# export control policy patcher program and arguments -# - -PLCYPATCH = $(SOURCE_BIN_DIR)/plcypatch$(PROG_SUFFIX) - -DOMESTIC_POLICY = -us -EXPORT_POLICY = -ex -FRANCE_POLICY = -fr - -ifeq ($(POLICY), domestic) - PLCYPATCH_ARGS = $(DOMESTIC_POLICY) -else - ifeq ($(POLICY), export) - PLCYPATCH_ARGS = $(EXPORT_POLICY) - else - ifeq ($(POLICY), france) - PLCYPATCH_ARGS = $(FRANCE_POLICY) - else - PLCYPATCH_ARGS = - endif - endif -endif diff --git a/security/coreconf/source.mk b/security/coreconf/source.mk index 825ebc5ec..d388847bf 100644 --- a/security/coreconf/source.mk +++ b/security/coreconf/source.mk @@ -39,7 +39,7 @@ # <user_source_tree> master import/export directory prefix # -SOURCE_PREFIX = $(CORE_DEPTH)/../dist +SOURCE_PREFIX = $(DIST) # # <user_source_tree> cross-platform (xp) master import/export directory @@ -81,33 +81,6 @@ SOURCE_MDHEADERS_DIR = $(SOURCE_MD_DIR)/include ####################################################################### # -# <user_source_tree> source-side master release directory prefix -# NOTE: export control policy enforced for XP and MD files released to -# the staging area -# - -ifeq ($(POLICY), domestic) - SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/domestic -else - ifeq ($(POLICY), export) - SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/export - else - ifeq ($(POLICY), france) - SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/france - else -#We shouldn't have to put another directory under here, but without it the perl -#script for releasing doesn't find the directory. It thinks it doesn't exist. -#So we're adding this no-policy directory so that the script for releasing works -#in all casese when policy is not set. This doesn't affect where the final jar -#files land, only where they are placed in the local tree when building the jar -#files. When there is no policy, the jar files will still land in -#<dist>/<module>/<date>/<platform> like they used to. - SOURCE_RELEASE_PREFIX = $(SOURCE_PREFIX)/release/no-policy - endif - endif -endif - -# # <user_source_tree> cross-platform (xp) source-side master release directory # diff --git a/security/coreconf/tree.mk b/security/coreconf/tree.mk index b9c247ee1..7aa8ce2e1 100644 --- a/security/coreconf/tree.mk +++ b/security/coreconf/tree.mk @@ -35,7 +35,7 @@ # Master "Core Components" file system "release" prefixes # ####################################################################### -# RELEASE_TREE = $(CORE_DEPTH)/../coredist +# RELEASE_TREE = $(MOD_DEPTH)/../coredist ifndef RELEASE_TREE @@ -84,30 +84,6 @@ ifndef RELEASE_TREE endif endif -# -# NOTE: export control policy enforced for XP and MD files -# released to the binary release tree -# - -ifeq ($(POLICY), domestic) - RELEASE_XP_DIR = domestic - RELEASE_MD_DIR = domestic/$(PLATFORM) -else - ifeq ($(POLICY), export) - RELEASE_XP_DIR = export - RELEASE_MD_DIR = export/$(PLATFORM) - else - ifeq ($(POLICY), france) - RELEASE_XP_DIR = france - RELEASE_MD_DIR = france/$(PLATFORM) - else - RELEASE_XP_DIR = - RELEASE_MD_DIR = $(PLATFORM) - endif - endif -endif - - REPORTER_TREE = $(subst \,\\,$(RELEASE_TREE)) IMPORT_XP_DIR = diff --git a/security/dbm/src/config.mk b/security/dbm/src/config.mk deleted file mode 100644 index 40d862aab..000000000 --- a/security/dbm/src/config.mk +++ /dev/null @@ -1,65 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -DEFINES += -DMEMMOVE -D__DBINTERFACE_PRIVATE $(SECURITY_FLAG) -DNSPR20=1 - -INCLUDES += -I../include - -# -# Currently, override TARGETS variable so that only static libraries -# are specifed as dependencies within rules.mk. -# - -TARGETS = $(LIBRARY) -SHARED_LIBRARY = -IMPORT_LIBRARY = -PURE_LIBRARY = -PROGRAM = - -ifdef SHARED_LIBRARY - ifeq ($(OS_ARCH),WINNT) - ifneq ($(OS_TARGET),WIN16) - DLLBASE=/BASE:0x30000000 - RES=$(OBJDIR)/dbm.res - RESNAME=../include/dbm.rc - endif - endif - ifeq ($(DLL_SUFFIX),dll) - DEFINES += -D_DLL - endif -endif - -ifeq ($(OS_ARCH),AIX) - OS_LIBS += -lc_r -endif diff --git a/security/dbm/src/manifest.mn b/security/dbm/src/manifest.mn deleted file mode 100644 index 1c2bef2d3..000000000 --- a/security/dbm/src/manifest.mn +++ /dev/null @@ -1,55 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -CORE_DEPTH = ../.. - -MODULE = dbm - -CSRCS = db.c \ - h_bigkey.c \ - h_func.c \ - h_log2.c \ - h_page.c \ - hash.c \ - hash_buf.c \ - hsearch.c \ - memmove.c \ - mktemp.c \ - ndbm.c \ -# snprintf.c \ - strerror.c \ - nsres.c \ - $(NULL) - -LIBRARY_NAME = dbm diff --git a/security/dbm/tests/Makefile b/security/dbm/tests/Makefile deleted file mode 100644 index 3bdb3134b..000000000 --- a/security/dbm/tests/Makefile +++ /dev/null @@ -1,131 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# -DEPTH = ../.. -CORE_DEPTH = ../.. - -MODULE = dbm - -CSRCS = lots.c - -PROGRAM = lots - -include $(DEPTH)/coreconf/config.mk - -ifeq ($(OS_ARCH),WINNT) -DEFINES += -DSTDARG -LIBDBM = ../src/$(PLATFORM)/dbm$(STATIC_LIB_SUFFIX) -else -LIBDBM = ../src/$(PLATFORM)/libdbm$(STATIC_LIB_SUFFIX) -endif - -ifeq ($(OS_ARCH),AIX) -CFLAGS += -DSTDARG -endif - -ifeq ($(OS_ARCH),BSD_386) -CFLAGS += -g -I../../../include -DXP_UNIX -g -DBSDI -DHAVE_STRERROR -D__386BSD__ -DDEBUG -DMEMMOVE -D__DBINTERFACE_PRIVATE -endif - -ifeq ($(OS_ARCH),FreeBSD) -CFLAGS += -DSTDARG -endif - -ifeq ($(OS_ARCH),HP-UX) -CFLAGS += -DSTDARG -endif - -ifeq ($(OS_ARCH),IRIX) -CFLAGS += -g -I../../../include -DDEBUG -DSTDARG -endif - -ifeq ($(OS_ARCH),OSF1) -CFLAGS += -DSTDARG -endif - -ifeq ($(OS_ARCH),Linux) -CFLAGS += -DSTDARG -endif - -ifeq ($(OS_ARCH),NCR) -CFLAGS += -DSTDARG -endif - -ifeq ($(OS_ARCH),SCO_SV) -CFLAGS += -DSTDARG -endif - -ifeq ($(OS_ARCH),SunOS) -CFLAGS += -g -I../../../include -D_sun_ -endif - -ifeq ($(OS_ARCH),UNIXWARE) -CFLAGS += -DSTDARG -endif - -INCLUDES += -I../include - -LDFLAGS = $(LDOPTS) $(LIBDBM) - -include $(DEPTH)/coreconf/rules.mk - -lots.pure: lots - purify $(CC) -o lots.pure $(CFLAGS) $(OBJS) $(MYLIBS) - -crash: crash.o $(MYLIBS) - $(CC) -o crash $(CFLAGS) crash.o $(MYLIBS) - -crash.pure: crash.o $(MYLIBS) - purify $(CC) -o crash.pure $(CFLAGS) crash.o $(MYLIBS) - - -CPORLN = ln -s -ifeq ($(OS_ARCH),WINNT) -CPORLN = cp -endif - -DBM_SRCS = $(CSRCS) - -ALL_TRASH += $(DBM_SRCS) - -$(DBM_SRCS) : % : $(CORE_DEPTH)/../dbm/tests/% - -$(CPORLN) $< . - -export:: $(DBM_SRCS) - -libs:: $(DBM_SRCS) - -program:: $(DBM_SRCS) - -private_export:: $(DBM_SRCS) - diff --git a/security/nss/.cvsignore b/security/nss/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/Makefile b/security/nss/Makefile.in index 7b0466afb..d2d128323 100644 --- a/security/nss/Makefile +++ b/security/nss/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = . +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -54,17 +65,21 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -ifeq ($(OS_TARGET),WINNT) -NSPR_IMPORT_VERSION = v4.0.1 -else -NSPR_IMPORT_VERSION = v4.0 -endif + ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +# Note: this has to run BEFORE recursing over the subdirectories, +# so include it before rules.mk. + +ifdef MOZILLA_CLIENT +dummy_target: all +libs install:: moz_import +endif + +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -76,23 +91,6 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -nss_build_all: - $(MAKE) build_coreconf - $(MAKE) build_nspr - $(MAKE) build_dbm - $(MAKE) - -build_coreconf: - (cd $(CORE_DEPTH)/coreconf ; $(MAKE)) - -build_nspr: - (cd $(CORE_DEPTH)/../nsprpub ; $(MAKE) OBJDIR_NAME=${OBJDIR_NAME} ) - -build_dbm: - (cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs) - - - moz_import:: ifeq ($(OS_ARCH),WINNT) cp $(DIST)/../include/* $(DIST)/include @@ -108,15 +106,18 @@ ifeq ($(OS_ARCH),OS2) cp -rf $(DIST)/../lib $(DIST) cp -f $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX) else - $(NSINSTALL) -L ../../dist include $(DIST) - $(NSINSTALL) -L ../../dist lib $(DIST) - cp $(DIST)/lib/libmozdbm_s.$(LIB_SUFFIX) $(DIST)/lib/libdbm.$(LIB_SUFFIX) + if [ ! -f $(DIST)/lib/libdbm.$(LIB_SUFFIX) ]; then \ + cp -du $(DIST)/lib/libmozdbm_s.a $(DIST)/lib/libdbm.$(LIB_SUFFIX) ; \ + fi + if [ -d $(DIST)/include/dbm ]; then \ + $(INSTALL) $(DIST)/include/dbm $(DIST)/public ; \ + fi endif endif -coreconf_hack: - cd ../coreconf; $(MAKE) - $(MAKE) import +DIST_GARBAGE = config.cache config.log config.status \ + coreconf -nss_RelEng_bld: coreconf_hack - $(MAKE) +distclean:: + cat unallmakefiles | $(XARGS) rm -f + rm -rf unallmakefiles $(DIST_GARBAGE) diff --git a/security/nss/aclocal.m4 b/security/nss/aclocal.m4 new file mode 100644 index 000000000..9a47303f5 --- /dev/null +++ b/security/nss/aclocal.m4 @@ -0,0 +1 @@ +builtin(include, build/autoconf/nspr.m4)dnl diff --git a/security/nss/build/autoconf/acoutput-fast.pl b/security/nss/build/autoconf/acoutput-fast.pl new file mode 100755 index 000000000..33b027a31 --- /dev/null +++ b/security/nss/build/autoconf/acoutput-fast.pl @@ -0,0 +1,180 @@ +#! /usr/bin/env perl +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +# acoutput-fast.pl - Quickly create makefiles that are in a common format. +# +# Most of the makefiles in mozilla only refer to two configure variables: +# @srcdir@ +# @top_srcdir@ +# However, configure does not know any better and it runs sed on each file +# with over 150 replacement rules (slow as molasses). +# +# This script takes a list of makefiles as input. For example, +# +# echo $MAKEFILES | acoutput-fast.pl +# +# The script creates each Makefile that only references @srcdir@ and +# @top_srcdir@. For other files, it lists them in a shell command that is +# printed to stdout: +# +# CONFIG_FILES="unhandled_files..."; export CONFIG_FILES +# +# This command can be used to have config.status create the unhandled +# files. For example, +# +# eval "echo $MAKEFILES | acoutput-fast.pl" +# AC_OUTPUT($MAKEFILES) +# +# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com). + +#use File::Basename; +sub dirname { + my $dir = $_[0]; + return '.' if not $dir =~ m%/%; + $dir =~ s%/[^/][^/]*$%%; + return $dir; +} + +# Create one directory. Assumes it doesn't already exist. +# Will create parent(s) if needed. +sub create_directory { + my $dir = $_[0]; + my $parent = dirname($dir); + create_directory($parent) if not -d $parent; + mkdir "$dir",0777; +} + +# Create all the directories at once. +# This can be much faster than calling mkdir() for each one. +sub create_directories { + my @makefiles = @_; + my @dirs = (); + my $ac_file; + foreach $ac_file (@makefiles) { + $ac_file =~ s/:.*//; + push @dirs, dirname($ac_file); + } + # Call mkdir with the directories sorted by subdir count (how many /'s) + if (@dirs) { + my $mkdir_command = "mkdir -p ". join(' ', @dirs); + if (system($mkdir_command) != 0) { + print STDERR "Creating dirs all at once failed; trying one at atime\n"; + foreach $dir (@dirs) { + if (not -d $dir) { + print STDERR "Creating directory $dir\n"; + create_directory($dir); + } + } + } + } +} + +if ($ARGV[0] =~ /^--srcdir=/) { + $ac_given_srcdir = (split /=/, shift @ARGV)[1]; +} else { + $ac_given_srcdir = $0; + $ac_given_srcdir =~ s|/?build/autoconf/.*$||; + $ac_given_srcdir = '.' if $ac_given_srcdir eq ''; +} + +# Read list of makefiles from the stdin or, +# from files listed on the command-line. +# +@makefiles=(); +push @makefiles, split while (<>); + +# Create all the directories at once. +# This can be much faster than calling mkdir() for each one. +create_directories(@makefiles); + +# Output the makefiles. +# +@unhandled=(); +foreach $ac_file (@makefiles) { + if (not $ac_file =~ /Makefile$/ or $ac_file =~ /:/) { + push @unhandled, $ac_file; + next; + } + $ac_file_in = "$ac_given_srcdir/$ac_file.in"; + $ac_dir = dirname($ac_file); + if ($ac_dir eq '.') { + $ac_dir_suffix = ''; + $ac_dots = ''; + } else { + $ac_dir_suffix = "/$ac_dir"; + $ac_dir_suffix =~ s%^/\./%/%; + $ac_dots = $ac_dir_suffix; + $ac_dots =~ s%/[^/]*%../%g; + } + if ($ac_given_srcdir eq '.') { + $srcdir = '.'; + if ($ac_dots eq '') { + $top_srcdir = '.' + } else { + $top_srcdir = $ac_dots; + $top_srcdir =~ s%/$%%; + } + } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) { + $srcdir = "$ac_given_srcdir$ac_dir_suffix"; + $top_srcdir = "$ac_given_srcdir"; + } else { + $srcdir = "$ac_dots$ac_given_srcdir$ac_dir_suffix"; + $top_srcdir = "$ac_dots$ac_given_srcdir"; + } + + if (-e $ac_file) { + next if -M _ < -M $ac_file_in; + print STDERR "updating $ac_file\n"; + } else { + print STDERR "creating $ac_file\n"; + } + + open (INFILE, "<$ac_file_in") + or ( warn "can't read $ac_file_in: No such file or directory\n" and next); + open (OUTFILE, ">$ac_file") + or ( warn "Unable to create $ac_file\n" and next); + + while (<INFILE>) { + #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) { + # warn "Two defines on a line:$ac_file:$.:$_"; + # push @unhandled, $ac_file; + # last; + #} + + s/\@srcdir\@/$srcdir/g; + s/\@top_srcdir\@/$top_srcdir/g; + + if (/\@[_a-zA-Z]*\@/) { + warn "Unknown variable:$ac_file:$.:$_"; + push @unhandled, $ac_file; + last; + } + print OUTFILE; + } + close INFILE; + close OUTFILE; +} + +# Print the shell command to be evaluated by configure. +# +print "CONFIG_FILES=\"".join(' ', @unhandled)."\"; export CONFIG_FILES\n"; + diff --git a/security/nss/build/autoconf/config.guess b/security/nss/build/autoconf/config.guess new file mode 100755 index 000000000..19c32f35c --- /dev/null +++ b/security/nss/build/autoconf/config.guess @@ -0,0 +1,1195 @@ +#! /bin/sh +# Attempt to guess a canonical system name. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. +# +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Written by Per Bothner <bothner@cygnus.com>. +# Please send patches to <config-patches@gnu.org>. +# +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit system type (host/target name). +# +# Only a few systems have been added to this list; please add others +# (but try to keep the structure clean). +# + +# Use $HOST_CC if defined. $CC may point to a cross-compiler +if test x"$CC_FOR_BUILD" = x; then + if test x"$HOST_CC" != x; then + CC_FOR_BUILD="$HOST_CC" + else + if test x"$CC" != x; then + CC_FOR_BUILD="$CC" + else + CC_FOR_BUILD=cc + fi + fi +fi + + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 8/24/94.) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # Netbsd (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently + # switched to ELF, *-*-netbsd* would select the old + # object file format. This provides both forward + # compatibility and a consistent mechanism for selecting the + # object file format. + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-cbm ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; + esac + # The Operating System including object format. + if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep __ELF__ >/dev/null + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + # The OS release + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: + # contains redundant information, the shorter form: + # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. + echo "${machine}-${os}${release}" + exit 0 ;; + alpha:OSF1:*:*) + if test $UNAME_RELEASE = "V4.0"; then + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + fi + # A Vn.n version is a released version. + # A Tn.n version is a released field test version. + # A Xn.n version is an unreleased experimental baselevel. + # 1.2 uses "1.2" for uname -r. + cat <<EOF >$dummy.s + .data +\$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + + .text + .globl main + .align 4 + .ent main +main: + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit + .end main +EOF + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null + if test "$?" = 0 ; then + case `./$dummy` in + 0-0) + UNAME_MACHINE="alpha" + ;; + 1-0) + UNAME_MACHINE="alphaev5" + ;; + 1-1) + UNAME_MACHINE="alphaev56" + ;; + 1-101) + UNAME_MACHINE="alphapca56" + ;; + 2-303) + UNAME_MACHINE="alphaev6" + ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; + esac + fi + rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit 0 ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit 0 ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-cbm-sysv4 + exit 0;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit 0 ;; + arc64:OpenBSD:*:*) + echo mips64el-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hkmips:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit 0;; + SR2?01:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit 0;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit 0 ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit 0 ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + i86pc:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit 0 ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit 0 ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit 0 ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit 0 ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit 0 ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit 0 ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit 0 ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include <stdio.h> /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD $dummy.c -o $dummy \ + && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + echo mips-mips-riscos${UNAME_RELEASE} + exit 0 ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit 0 ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit 0 ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit 0 ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit 0 ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit 0 ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit 0 ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit 0 ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit 0 ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit 0 ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit 0 ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i?86:AIX:*:*) + echo i386-ibm-aix + exit 0 ;; + *:AIX:2:3) + if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then + sed 's/^ //' << EOF >$dummy.c + #include <sys/systemcfg.h> + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + echo rs6000-ibm-aix3.2.5 + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit 0 ;; + *:AIX:*:4) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=4.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit 0 ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit 0 ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit 0 ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit 0 ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit 0 ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit 0 ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit 0 ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit 0 ;; + 9000/[34678]??:HP-UX:*:*) + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + sed 's/^ //' << EOF >$dummy.c + #include <stdlib.h> + #include <unistd.h> + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + rm -f $dummy.c $dummy + esac + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit 0 ;; + 3050*:HI-UX:*:*) + sed 's/^ //' << EOF >$dummy.c + #include <unistd.h> + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + echo unknown-hitachi-hiuxwe2 + exit 0 ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit 0 ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit 0 ;; + *9??*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit 0 ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit 0 ;; + i?86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit 0 ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit 0 ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit 0 ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit 0 ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} + exit 0 ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + exit 0 ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3E:*:*:*) + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY-2:*:*:*) + echo cray2-cray-unicos + exit 0 ;; + F300:UNIX_System_V:*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; + F301:UNIX_System_V:*:*) + echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit 0 ;; + *:FreeBSD:*:*) + if test -x /usr/bin/objformat; then + if test "elf" = "`/usr/bin/objformat`"; then + echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` + exit 0 + fi + fi + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit 0 ;; + i*:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit 0 ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i386-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit 0 ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; + *:GNU:*:*) + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit 0 ;; + *:Linux:*:*) + + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + ld_help_string=`cd /; ld --help 2>&1` + ld_supported_emulations=`echo $ld_help_string \ + | sed -ne '/supported emulations:/!d + s/[ ][ ]*/ /g + s/.*supported emulations: *// + s/ .*// + p'` + case "$ld_supported_emulations" in + *ia64) + echo "${UNAME_MACHINE}-unknown-linux" + exit 0 + ;; + i?86linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 + ;; + i?86coff) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 + ;; + sparclinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + armlinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32arm*) + echo "${UNAME_MACHINE}-unknown-linux-gnuoldld" + exit 0 + ;; + armelf_linux*) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; + m68klinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32ppc | elf32ppclinux) + # Determine Lib Version + cat >$dummy.c <<EOF +#include <features.h> +#if defined(__GLIBC__) +extern char __libc_version[]; +extern char __libc_release[]; +#endif +main(argc, argv) + int argc; + char *argv[]; +{ +#if defined(__GLIBC__) + printf("%s %s\n", __libc_version, __libc_release); +#else + printf("unkown\n"); +#endif + return 0; +} +EOF + LIBC="" + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null + if test "$?" = 0 ; then + ./$dummy | grep 1\.99 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f $dummy.c $dummy + echo powerpc-unknown-linux-gnu${LIBC} + exit 0 + ;; + esac + + if test "${UNAME_MACHINE}" = "alpha" ; then + cat <<EOF >$dummy.s + .data + \$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + + .text + .globl main + .align 4 + .ent main + main: + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit + .end main +EOF + LIBC="" + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null + if test "$?" = 0 ; then + case `./$dummy` in + 0-0) + UNAME_MACHINE="alpha" + ;; + 1-0) + UNAME_MACHINE="alphaev5" + ;; + 1-1) + UNAME_MACHINE="alphaev56" + ;; + 1-101) + UNAME_MACHINE="alphapca56" + ;; + 2-303) + UNAME_MACHINE="alphaev6" + ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; + esac + + objdump --private-headers $dummy | \ + grep ld.so.1 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 + elif test "${UNAME_MACHINE}" = "mips" ; then + cat >$dummy.c <<EOF +#ifdef __cplusplus +#include <stdio.h> /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif +#ifdef __MIPSEB__ + printf ("%s-unknown-linux-gnu\n", argv[1]); +#endif +#ifdef __MIPSEL__ + printf ("%sel-unknown-linux-gnu\n", argv[1]); +#endif + return 0; +} +EOF + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + elif test "${UNAME_MACHINE}" = "s390"; then + echo s390-ibm-linux && exit 0 + else + # Either a pre-BFD a.out linker (linux-gnuoldld) + # or one that does not give us useful --help. + # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. + # If ld does not provide *any* "supported emulations:" + # that means it is gnuoldld. + echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" + test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 + + case "${UNAME_MACHINE}" in + i?86) + VENDOR=pc; + ;; + *) + VENDOR=unknown; + ;; + esac + # Determine whether the default compiler is a.out or elf + cat >$dummy.c <<EOF +#include <features.h> +#ifdef __cplusplus +#include <stdio.h> /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif +#ifdef __ELF__ +# ifdef __GLIBC__ +# if __GLIBC__ >= 2 + printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); +# else + printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); +# endif +# else + printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); +# endif +#else + printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); +#endif + return 0; +} +EOF + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + fi ;; +# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions +# are messed up and put the nodename in both sysname and nodename. + i?86:DYNIX/ptx:4*:*) + echo i386-sequent-sysv4 + exit 0 ;; + i?86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit 0 ;; + i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit 0 ;; + i?86:*:5:7*) + # Fixed at (any) Pentium or better + UNAME_MACHINE=i586 + if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then + echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + fi + exit 0 ;; + i?86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` + echo ${UNAME_MACHINE}-pc-isc$UNAME_REL + elif /bin/uname -X 2>/dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` + (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + else + echo ${UNAME_MACHINE}-pc-sysv32 + fi + exit 0 ;; + i?86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit 0 ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit 0 ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit 0 ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit 0 ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit 0 ;; + M68*:*:R3V[567]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && echo i486-ncr-sysv4 && exit 0 ;; + m68*:LynxOS:2.*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit 0 ;; + i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit 0 ;; + PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says <Richard.M.Bartel@ccMail.Census.GOV> + echo i586-unisys-sysv4 + exit 0 ;; + *:*OpenVMS*:*:*) + case "${UNAME_SYSTEM}" in + POSIX_for_OpenVMS_AXP) echo alpha-dec-openvmsposix ;; + POSIX_for_OpenVMS_VAX) echo vax-dec-openvmsposix ;; + OpenVMS) echo alpha-dec-openvms ;; + *) echo unknown-dec-openvms ;; + esac + exit 0 ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes <hewes@openmarket.com>. + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit 0 ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit 0 ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit 0 ;; + news*:NEWS-OS:*:6*) + echo mips-sony-newsos6 + exit 0 ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit 0 ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit 0 ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit 0 ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit 0 ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + Power*:Mac*OS:*:*) + echo powerpc-apple-macos${UNAME_RELEASE} + exit 0 ;; + *:Mac*OS:*:*) + echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE} + exit 0 ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_MACHINE=pc + fi + echo `uname -p`-${UNAME_MACHINE}-nto-qnx + exit 0;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSR-W:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:OS/2:*:*) + if test "$VACPP" = "yes"; then + echo "i386-pc-os2_vacpp" + else + echo "i386-pc-os2_emx" + fi + exit 0;; +esac + +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 + +cat >$dummy.c <<EOF +#ifdef _SEQUENT_ +# include <sys/types.h> +# include <sys/utsname.h> +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include <sys/param.h> + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +#if !defined (ultrix) + printf ("vax-dec-bsd\n"); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 +rm -f $dummy.c $dummy + +# Apollos put the system type in the environment. + +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } + +# Convex versions that predate uname can use getsysinfo(1) + +if [ -x /usr/convex/getsysinfo ] +then + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit 0 ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit 0 ;; + c34*) + echo c34-convex-bsd + exit 0 ;; + c38*) + echo c38-convex-bsd + exit 0 ;; + c4*) + echo c4-convex-bsd + exit 0 ;; + esac +fi + +#echo '(Unable to guess system type)' 1>&2 + +exit 1 diff --git a/security/nss/build/autoconf/config.sub b/security/nss/build/autoconf/config.sub new file mode 100755 index 000000000..987ac5ca7 --- /dev/null +++ b/security/nss/build/autoconf/config.sub @@ -0,0 +1,1268 @@ +#! /bin/sh +# Configuration validation subroutine script, version 1.1. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. +# +# This file is (in principle) common to ALL GNU software. +# The presence of a machine in this file suggests that SOME GNU software +# can handle that machine. It does not imply ALL GNU software can. +# +# This file is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# Written by Per Bothner <bothner@cygnus.com>. +# Please send patches to <config-patches@gnu.org>. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +if [ x$1 = x ] +then + echo Configuration name missing. 1>&2 + echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 + echo "or $0 ALIAS" 1>&2 + echo where ALIAS is a recognized configuration type. 1>&2 + exit 1 +fi + +# First pass through any local machine types. +case $1 in + *local*) + echo $1 + exit 0 + ;; + *) + ;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu*) + os=-$maybe_os + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + *) + basic_machine=`echo $1 | sed 's/-[^-]*$//'` + if [ $basic_machine != $1 ] + then os=`echo $1 | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` + ;; + -windowsnt*) + os=`echo $os | sed -e 's/windowsnt/winnt/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ + | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ + | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ + | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ + | alphaev6[78] \ + | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ + | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ + | mips64orion | mips64orionel | mipstx39 | mipstx39el \ + | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ + | mips64vr5000 | miprs64vr5000el | mcore \ + | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ + | thumb | d10v | fr30 | avr) + basic_machine=$basic_machine-unknown + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i[34567]86) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + # FIXME: clean up the formatting here. + vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ + | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ + | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ + | xmp-* | ymp-* \ + | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ + | alphaev6[78]-* \ + | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ + | clipper-* | orion-* \ + | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ + | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ + | f301-* | armv*-* | s390-* | sv1-* | t3e-* \ + | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ + | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* ) + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-unknown + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-cbm + ;; + amigaos | amigados) + basic_machine=m68k-cbm + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-cbm + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | ymp) + basic_machine=ymp-cray + os=-unicos + ;; + cray2) + basic_machine=cray2-cray + os=-unicos + ;; + [ctj]90-cray) + basic_machine=c90-cray + os=-unicos + ;; + crds | unos) + basic_machine=m68k-crds + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2* | dpx2*-bull) + basic_machine=m68k-bull + os=-sysv3 + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppa-next) + os=-nextstep3 + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; +# I'm not sure what "Sysv32" means. Should this be sysv3.2? + i[34567]86v32) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i[34567]86v4*) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i[34567]86v) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i[34567]86sol2) + basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + i386-vsta | vsta) + basic_machine=i386-unknown + os=-vsta + ;; + i386-go32 | go32) + basic_machine=i386-unknown + os=-go32 + ;; + i386-mingw32 | mingw32) + basic_machine=i386-unknown + os=-mingw32 + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + m88k-omron*) + basic_machine=m88k-omron + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; + mips3*-*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + msdos) + basic_machine=i386-unknown + os=-msdos + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next ) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + np1) + basic_machine=np1-gould + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pentium | p5 | k5 | k6 | nexen) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86) + basic_machine=i686-pc + ;; + pentiumii | pentium2) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexen-*) + basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-*) + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=rs6000-ibm + ;; + ppc) basic_machine=powerpc-unknown + ;; + ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle | ppc-le | powerpc-little) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sequent) + basic_machine=i386-sequent + ;; + sh) + basic_machine=sh-hitachi + os=-hms + ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + xmp) + basic_machine=xmp-cray + os=-unicos + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + mips) + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi + ;; + romp) + basic_machine=romp-ibm + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sparc | sparcv9) + basic_machine=sparc-sun + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; + *) + echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases + # that might get confused with valid system types. + # -solaris* is a basic system type, with this one exception. + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -svr4*) + os=-sysv4 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + -os2_emx) + ;; + -os2_vacpp) + ;; + # First accept the basic system types. + # The portable systems comes first. + # Each alternative MUST END IN A *, to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i[34567]86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto*) + os=-nto-qnx + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo $os | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo $os | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; + -osfrose*) + os=-osfrose + ;; + -osf*) + os=-osf + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -ns2 ) + os=-nextstep2 + ;; + -nsk) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; + -xenix) + os=-xenix + ;; + -*mint | -*MiNT) + os=-mint + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + # This also exists in the configure program, but was not the + # default. + # os=-sunos4 + ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + *-be) + os=-beos + ;; + *-ibm) + os=-aix + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next ) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-next) + os=-nextstep3 + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f301-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -vxsim* | -vxworks*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -*MiNT) + vendor=atari + ;; + esac + basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + ;; +esac + +echo $basic_machine$os diff --git a/security/nss/build/autoconf/install-sh b/security/nss/build/autoconf/install-sh new file mode 100755 index 000000000..0ff4b6a08 --- /dev/null +++ b/security/nss/build/autoconf/install-sh @@ -0,0 +1,119 @@ +#!/bin/sh + +# +# install - install a program, script, or datafile +# This comes from X11R5; it is not part of GNU. +# +# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $ +# +# This script is compatible with the BSD install script, but was written +# from scratch. +# + + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" + +instcmd="$mvprog" +chmodcmd="" +chowncmd="" +chgrpcmd="" +stripcmd="" +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src="" +dst="" + +while [ x"$1" != x ]; do + case $1 in + -c) instcmd="$cpprog" + shift + continue;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + -s) stripcmd="$stripprog" + shift + continue;; + + *) if [ x"$src" = x ] + then + src=$1 + else + dst=$1 + fi + shift + continue;; + esac +done + +if [ x"$src" = x ] +then + echo "install: no input file specified" + exit 1 +fi + +if [ x"$dst" = x ] +then + echo "install: no destination specified" + exit 1 +fi + + +# If destination is a directory, append the input filename; if your system +# does not like double slashes in filenames, you may need to add some logic + +if [ -d $dst ] +then + dst="$dst"/`basename $src` +fi + +# Make a temp file name in the proper directory. + +dstdir=`dirname $dst` +dsttmp=$dstdir/#inst.$$# + +# Move or copy the file name to the temp name + +$doit $instcmd $src $dsttmp + +# and set any options; do chmod last to preserve setuid bits + +if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi +if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi +if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi +if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi + +# Now rename the file to the real destination. + +$doit $rmcmd $dst +$doit $mvcmd $dsttmp $dst + + +exit 0 diff --git a/security/nss/build/autoconf/make-makefile b/security/nss/build/autoconf/make-makefile new file mode 100755 index 000000000..03940d892 --- /dev/null +++ b/security/nss/build/autoconf/make-makefile @@ -0,0 +1,280 @@ +#! /usr/bin/env perl +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +# make-makefiles - Quickly create Makefiles for subdirectories. +# Also, creates any needed subdirectories. +# +# usage: make-makefiles [ -t <topsrcdir> -d <depth> ] [ <subdir> | <subdir>/Makefile ] ... + +# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com). + +#$debug = 1; + +# Determine various tree path variables +# +($topsrcdir, $depth, @makefiles) = parse_arguments(@ARGV); + +$object_fullpath = `pwd`; +chdir $depth; +$object_root = `pwd`; +chomp $object_fullpath; +chomp $object_root; + +# $source_subdir is the path from the object root to where +# 'make-makefile' was called. For example, if make-makefile was +# called from "mozilla/gfx/src", then $source_subdir would be +# "gfx/src/". +$source_subdir = "$object_fullpath/"; +my $quoted_object_root = quotemeta($object_root); +$source_subdir =~ s|^$quoted_object_root/||; + +# Prefix makefiles with $source_subdir so that paths +# will be relative to the top of the object tree. +# +for $makefile (@makefiles) { + $makefile = "$source_subdir$makefile"; +} + +create_directories(@makefiles); + +# Find the path to the source directory based on how 'make-makefile' +# was invoked. The path is either relative to the object directory +# or an absolute path. +$given_srcdir = find_srcdir($topsrcdir, $depth); + +if ($debug) { + warn "object_fullpath = $object_fullpath\n"; + warn "object_root = $object_root\n"; + warn "source_subdir = $source_subdir\n"; + warn "makefiles = @makefiles\n"; + warn "given_srcdir = $given_srcdir\n"; +} + +@unhandled = update_makefiles($given_srcdir, @makefiles); + +run_config_status(@unhandled); + +# end of Main +############################################################ + +sub dirname { + return $_[0] =~ /(.*)\/.*/ ? "$1" : '.'; +} + +# find_depth: Pull the value of DEPTH out of a Makefile (or Makefile.in) +sub find_depth { + my $depth = ''; + open(MAKEFILE, "<$_[0]") || die "Unable to open $_[0]: $!\n"; + while (<MAKEFILE>) { + next unless /^DEPTH\s*=\s*(\..*)/; + $depth = $1; + last; + } + close MAKEFILE; + return $depth; +} + +sub parse_arguments { + my @args = @_; + my $depth = ''; + my $topsrcdir = ''; + my @makefiles = (); + + while (1) { + if ($args[0] eq '-d') { + $depth = $args[1]; + shift @args; + shift @args; + } elsif ($args[0] eq '-t') { + $topsrcdir = $args[1]; + shift @args; + shift @args; + } else { + last; + } + } + + if ($topsrcdir eq '') { + $topsrcdir = $0; # Figure out topsrcdir based on program name. + $topsrcdir =~ s|/?build/autoconf/.*$||; + } + if ($depth eq '') { + # Use $(DEPTH) in the Makefile or Makefile.in to determine the depth + if (-e "Makefile.in") { + $depth = find_depth("Makefile.in"); + } elsif (-e "Makefile") { + $depth = find_depth("Makefile"); + } elsif (-e "../Makefile") { + $depth = "../".find_depth("../Makefile"); + $depth =~ s/\/\.$//; + } else { + warn "Unable to determine depth (e.g. ../..) to root of objdir tree.\n"; + die "No Makefile(.in) present. Try running with '-d <depth>'\n"; + } + } + + # Build the list of makefiles to generate + # + @makefiles = (); + my $makefile; + foreach $makefile (@args) { + $makefile =~ s/\.in$//; + $makefile =~ s/\/$//; + $makefile =~ /Makefile$/ or $makefile .= "/Makefile"; + push @makefiles, "$makefile"; + } + @makefiles = "Makefile" unless @args; + + return ($topsrcdir, $depth, @makefiles); +} + + +# Create all the directories at once. +# This can be much faster than calling mkdir() for each one. +sub create_directories { + my @makefiles = @_; + my @dirs = (); + my $ac_file; + foreach $ac_file (@makefiles) { + push @dirs, dirname($ac_file); + } + # Call mkdir with the directories sorted by subdir count (how many /'s) + system "mkdir -p ". join(' ', @dirs) if @dirs; +} + +# Find the top of the source directory +# (Assuming that the executable is in $top_srcdir/build/autoconf) +sub find_srcdir { + my ($ac_given_srcdir, $depth) = @_; + + if ($debug) { + print "ac_given_srcdir = $ac_given_srcdir\n"; + print "depth = $depth\n"; + } + if ($ac_given_srcdir =~ /^\./ and $depth ne '.') { + my $quoted_depth = quotemeta($depth); + $ac_given_srcdir =~ s|^$quoted_depth/?||; + } + if ($debug) { + print "ac_given_srcdir = $ac_given_srcdir\n"; + } + $ac_given_srcdir = '.' if $ac_given_srcdir eq ''; + return $ac_given_srcdir; +} + +# Output the makefiles. +# +sub update_makefiles { + my ($ac_given_srcdir, @makefiles) = @_; + my @unhandled=(); + + my $ac_file; + foreach $ac_file (@makefiles) { + my $ac_file_in = "$ac_given_srcdir/${ac_file}.in"; + my $ac_dir = dirname($ac_file); + my $ac_dots = ''; + my $ac_dir_suffix = ''; + my $srcdir = '.'; + my $top_srcdir = '.'; + + # Determine $srcdir and $top_srcdir + # + if ($ac_dir ne '.') { + $ac_dir_suffix = "/$ac_dir"; + $ac_dir_suffix =~ s%^/\./%/%; + $ac_dots = $ac_dir_suffix; + $ac_dots =~ s%/[^/]*%../%g; + } + if ($ac_given_srcdir eq '.') { + if ($ac_dots ne '') { + $top_srcdir = $ac_dots; + $top_srcdir =~ s%/$%%; + } + } elsif ($ac_given_srcdir =~ m%^/% or $ac_given_srcdir =~ m%^.:/%) { + $srcdir = "$ac_given_srcdir$ac_dir_suffix"; + $top_srcdir = "$ac_given_srcdir"; + } else { + $srcdir = "$ac_dots$ac_given_srcdir$ac_dir_suffix"; + $top_srcdir = "$ac_dots$ac_given_srcdir"; + } + + if ($debug) { + print "ac_dir = $ac_dir\n"; + print "ac_file = $ac_file\n"; + print "ac_file_in = $ac_file_in\n"; + print "srcdir = $srcdir\n"; + print "top_srcdir = $top_srcdir\n"; + print "cwd = " . `pwd` . "\n"; + } + + # Copy the file and make substitutions. + # @srcdir@ -> value of $srcdir + # @top_srcdir@ -> value of $top_srcdir + # + if (-e $ac_file) { + next if -M _ < -M $ac_file_in; # Next if Makefile is up-to-date. + warn "updating $ac_file\n"; + } else { + warn "creating $ac_file\n"; + } + + open INFILE, "<$ac_file_in" or do { + warn "$0: Cannot read $ac_file_in: No such file or directory\n"; + next; + }; + open OUTFILE, ">$ac_file" or do { + warn "$0: Unable to create $ac_file\n"; + next; + }; + + while (<INFILE>) { + #if (/\@[_a-zA-Z]*\@.*\@[_a-zA-Z]*\@/) { + # #warn "Two defines on a line:$ac_file:$.:$_"; + # push @unhandled, $ac_file; + # last; + #} + + s/\@srcdir\@/$srcdir/g; + s/\@top_srcdir\@/$top_srcdir/g; + + if (/\@[_a-zA-Z]*\@/) { + #warn "Unknown variable:$ac_file:$.:$_"; + push @unhandled, $ac_file; + last; + } + print OUTFILE; + } + close INFILE; + close OUTFILE; + } + return @unhandled; +} + +sub run_config_status { + my @unhandled = @_; + + # Run config.status with any unhandled files. + # + if (@unhandled) { + $ENV{CONFIG_FILES}= join ' ', @unhandled; + system "./config.status"; + } +} diff --git a/security/nss/build/autoconf/nspr.m4 b/security/nss/build/autoconf/nspr.m4 new file mode 100644 index 000000000..8174bea9c --- /dev/null +++ b/security/nss/build/autoconf/nspr.m4 @@ -0,0 +1,67 @@ +# -*- tab-width: 4; -*- +# Configure paths for NSPR +# Public domain - Chris Seawood <cls@seawood.org> 2001-04-05 +# Based upon gtk.m4 (also PD) by Owen Taylor + +dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS +AC_DEFUN(AM_PATH_NSPR, +[dnl + +AC_ARG_WITH(nspr-prefix, + [ --with-nspr-prefix=PFX Prefix where NSPR is installed], + nspr_config_prefix="$withval", + nspr_config_prefix="") + +AC_ARG_WITH(nspr-exec-prefix, + [ --with-nspr-exec-prefix=PFX + Exec prefix where NSPR is installed], + nspr_config_exec_prefix="$withval", + nspr_config_exec_prefix="") + + if test -n "$nspr_config_exec_prefix"; then + nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix" + if test -z "$NSPR_CONFIG"; then + NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config + fi + fi + if test -n "$nspr_config_prefix"; then + nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix" + if test -z "$NSPR_CONFIG"; then + NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config + fi + fi + + unset ac_cv_path_NSPR_CONFIG + AC_PATH_PROG(NSPR_CONFIG, nspr-config, no) + min_nspr_version=ifelse([$1], ,4.0.0,$1) + AC_MSG_CHECKING(for NSPR - version >= $min_nspr_version (skipping)) + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then + no_nspr="yes" + else + NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags` + NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs` + + dnl Skip version check for now + nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + fi + + if test -z "$no_nspr"; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + fi + + + AC_SUBST(NSPR_CFLAGS) + AC_SUBST(NSPR_LIBS) + +]) diff --git a/security/nss/build/unix/mddepend.pl b/security/nss/build/unix/mddepend.pl new file mode 100755 index 000000000..64e723104 --- /dev/null +++ b/security/nss/build/unix/mddepend.pl @@ -0,0 +1,115 @@ +#!/usr/bin/env perl + +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is this file as it was released upon March 8, 1999. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): + +# mddepend.pl - Reads in dependencies generated my -MD flag. Prints list +# of objects that need to be rebuilt. These can then be added to the +# PHONY target. Using this script copes with the problem of header +# files that have been removed from the build. +# +# Usage: +# mddepend.pl <output_file> <dependency_files...> +# +# Send comments, improvements, bugs to Steve Lamm (slamm@netscape.com). + +#$debug = 1; + +$outfile = shift @ARGV; + +@alldeps=(); +# Parse dependency files +while ($line = <>) { + chomp $line; + ($obj,$rest) = split /\s*:\s+/, $line, 2; + next if $obj eq ''; + + if ($line =~ /\\$/) { + chop $rest; + $hasSlash = 1; + } else { + $hasSlash = 0; + } + $deps = [ $obj, split /\s+/, $rest ]; + + while ($hasSlash and $line = <>) { + chomp $line; + if ($line =~ /\\$/) { + chop $line; + } else { + $hasSlash = 0; + } + $line =~ s/^\s+//; + push @{$deps}, split /\s+/, $line; + } + warn "add @{$deps}\n" if $debug; + push @alldeps, $deps; +} + +# Test dependencies +foreach $deps (@alldeps) { + $obj = shift @{$deps}; + + $mtime = (stat $obj)[9] or next; + + foreach $dep_file (@{$deps}) { + if (not defined($dep_mtime = $modtimes{$dep_file})) { + $dep_mtime = (stat $dep_file)[9]; + $modtimes{$dep_file} = $dep_mtime; + } + if ($dep_mtime ne '' and $dep_mtime > $mtime) { + print "$obj($mtime) older than $dep_file($dep_mtime)\n" if $debug; + push @objs, $obj; + # Object will be marked for rebuild. No need to check other dependencies. + last; + } + } +} + +# Output objects to rebuild (if needed). +if (@objs) { + $new_output = "@objs: FORCE\n"; + + # Read in the current dependencies file. + open(OLD, "<$outfile") + and $old_output = <OLD>; + close(OLD); + + # Only write out the dependencies if they are different. + if ($new_output ne $old_output) { + open(OUT, ">$outfile") and print OUT "$new_output"; + print "Updating dependencies file, $outfile\n"; + if ($debug) { + print "new: $new_output\n"; + print "was: $old_output\n" if $old_output ne ''; + } + } +} elsif (-s $outfile) { + # Remove the old dependencies because all objects are up to date. + print "Removing old dependencies file, $outfile\n"; + + if ($debug) { + open(OLD, "<$outfile") + and $old_output = <OLD>; + close(OLD); + print "was: $old_output\n"; + } + + unlink $outfile; +} diff --git a/security/nss/cmd/.cvsignore b/security/nss/cmd/.cvsignore index 6329db22e..f3c7a7c5d 100644 --- a/security/nss/cmd/.cvsignore +++ b/security/nss/cmd/.cvsignore @@ -1 +1 @@ -.gdbinit +Makefile diff --git a/security/nss/cmd/Makefile b/security/nss/cmd/Makefile deleted file mode 100644 index dd012940e..000000000 --- a/security/nss/cmd/Makefile +++ /dev/null @@ -1,182 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -CORE_DEPTH = ../.. -DEPTH = ../.. - -include manifest.mn -include $(CORE_DEPTH)/coreconf/config.mk - -# These sources were once in this directory, but now are gone. -MISSING_SOURCES = \ - addcert.c \ - berparse.c \ - cert.c \ - key.c \ - key_rand.c \ - keygen.c \ - sec_fe.c \ - sec_read.c \ - secarb.c \ - secutil.c \ - $(NULL) - -# we don't build these any more, but the sources are still here -OBSOLETE = \ - berdec.c \ - berdump.c \ - cypher.c \ - dumpcert.c \ - listcerts.c \ - mkdongle.c \ - p12exprt.c \ - p12imprt.c \ - rc4.c \ - sign.c \ - unwrap.c \ - vector.c \ - verify.c \ - wrap.c \ - $(NULL) - -# the base files for the executables -# hey -- keep these alphabetical, please -EXEC_SRCS = \ - $(NULL) - -# files that generate two separate objects and executables -# BI_SRCS = \ -# keyutil.c \ -# p7env.c \ -# tstclnt.c \ -# $(NULL) - -# -I$(CORE_DEPTH)/security/lib/cert \ -# -I$(CORE_DEPTH)/security/lib/key \ -# -I$(CORE_DEPTH)/security/lib/util \ - -INCLUDES += \ - -I$(DIST)/../public/security \ - -I./include \ - $(NULL) - -TBD_DIRS = rsh rshd rdist ssld - -# For the time being, sec stuff is export only -# US_FLAGS = -DEXPORT_VERSION -DUS_VERSION - -US_FLAGS = -DEXPORT_VERSION -EXPORT_FLAGS = -DEXPORT_VERSION - -BASE_LIBS = \ - $(DIST)/lib/libdbm.$(LIB_SUFFIX) \ - $(DIST)/lib/libxp.$(LIB_SUFFIX) \ - $(DIST)/lib/libnspr.$(LIB_SUFFIX) \ - $(NULL) - -# $(DIST)/lib/libpurenspr.$(LIB_SUFFIX) \ - -#There is a circular dependancy in security/lib, and here is a gross fix -SEC_LIBS = \ - $(DIST)/lib/libsecnav.$(LIB_SUFFIX) \ - $(DIST)/lib/libssl.$(LIB_SUFFIX) \ - $(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \ - $(DIST)/lib/libcert.$(LIB_SUFFIX) \ - $(DIST)/lib/libkey.$(LIB_SUFFIX) \ - $(DIST)/lib/libsecmod.$(LIB_SUFFIX) \ - $(DIST)/lib/libcrypto.$(LIB_SUFFIX) \ - $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ - $(DIST)/lib/libssl.$(LIB_SUFFIX) \ - $(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \ - $(DIST)/lib/libcert.$(LIB_SUFFIX) \ - $(DIST)/lib/libkey.$(LIB_SUFFIX) \ - $(DIST)/lib/libsecmod.$(LIB_SUFFIX) \ - $(DIST)/lib/libcrypto.$(LIB_SUFFIX) \ - $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ - $(DIST)/lib/libhash.$(LIB_SUFFIX) \ - $(NULL) - -MYLIB = lib/$(OBJDIR)/libsectool.$(LIB_SUFFIX) - -US_LIBS = $(MYLIB) $(SEC_LIBS) $(BASE_LIBS) $(MYLIB) $(BASE_LIBS) -EX_LIBS = $(MYLIB) $(SEC_LIBS) $(BASE_LIBS) $(MYLIB) $(BASE_LIBS) - -REQUIRES = libxp nspr security - -CSRCS = $(EXEC_SRCS) $(BI_SRCS) - -OBJS = $(CSRCS:.c=.o) $(BI_SRCS:.c=-us.o) $(BI_SRCS:.c=-ex.o) - -PROGS = $(addprefix $(OBJDIR)/, $(EXEC_SRCS:.c=$(BIN_SUFFIX))) -US_PROGS = $(addprefix $(OBJDIR)/, $(BI_SRCS:.c=-us$(BIN_SUFFIX))) -EX_PROGS = $(addprefix $(OBJDIR)/, $(BI_SRCS:.c=-ex$(BIN_SUFFIX))) - - -NON_DIRS = $(PROGS) $(US_PROGS) $(EX_PROGS) -TARGETS = $(NON_DIRS) - -include $(CORE_DEPTH)/coreconf/rules.mk - - -ifneq ($(OS_ARCH),OS2) -$(OBJDIR)/%-us.o: %.c - @$(MAKE_OBJDIR) - $(CCF) -o $@ $(US_FLAGS) -c $*.c - -$(OBJDIR)/%-ex.o: %.c - @$(MAKE_OBJDIR) - $(CCF) -o $@ $(EXPORT_FLAGS) -c $*.c - -$(OBJDIR)/%.o: %.c - @$(MAKE_OBJDIR) - $(CCF) -o $@ $(EXPORT_FLAGS) -c $*.c - -$(US_PROGS):$(OBJDIR)/%-us: $(OBJDIR)/%-us.o $(US_LIBS) - @$(MAKE_OBJDIR) - $(CCF) -o $@ $(OBJDIR)/$*-us.o $(LDFLAGS) $(US_LIBS) $(OS_LIBS) - -$(EX_PROGS):$(OBJDIR)/%-ex: $(OBJDIR)/%-ex.o $(EX_LIBS) - @$(MAKE_OBJDIR) - $(CCF) -o $@ $(OBJDIR)/$*-ex.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) - -$(PROGS):$(OBJDIR)/%: $(OBJDIR)/%.o $(EX_LIBS) - @$(MAKE_OBJDIR) - $(CCF) -o $@ $@.o $(LDFLAGS) $(EX_LIBS) $(OS_LIBS) - -#install:: $(TARGETS) -# $(INSTALL) $(TARGETS) $(DIST)/bin -endif - -symbols:: - @echo "TARGETS = $(TARGETS)" diff --git a/security/nss/lib/util/Makefile b/security/nss/cmd/Makefile.in index 35c2bfb28..33e7f723e 100644 --- a/security/nss/lib/util/Makefile +++ b/security/nss/cmd/Makefile.in @@ -33,22 +33,27 @@ # ####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # +# (0) Initialize autoconf variables # ####################################################################### -include manifest.mn +MOD_DEPTH = .. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # +# (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include $(CORE_DEPTH)/coreconf/arch.mk +include $(srcdir)/manifest.mn -ifeq ($(OS_ARCH),HP-UX) - ASFILES += ret_cr16.s -endif +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -60,13 +65,12 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -79,8 +83,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### -tests:: $(OBJDIR)/test_utf8 -$(OBJDIR)/test_utf8: utf8.c - @$(MAKE_OBJDIR) - $(CCF) -o $(OBJDIR)/test_utf8 -DTEST_UTF8 utf8.c $(OS_LIBS) diff --git a/security/nss/cmd/SSLsample/.cvsignore b/security/nss/cmd/SSLsample/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/SSLsample/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/SSLsample/Makefile b/security/nss/cmd/SSLsample/Makefile deleted file mode 100644 index 0c21548cd..000000000 --- a/security/nss/cmd/SSLsample/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -# do these once for each target program -all default export libs program install release_export:: - $(MAKE) -f make.client $@ - $(MAKE) -f make.server $@ - -# only do these things once for the whole directory -depend dependclean clean clobber release_classes release_clean release_cpdistdir release_export release_jars release_md release_policy show:: - $(MAKE) -f make.client $@ - - diff --git a/security/nss/cmd/crmf-cgi/Makefile b/security/nss/cmd/SSLsample/Makefile.in index 29f3357c3..12ef64f0e 100644 --- a/security/nss/cmd/crmf-cgi/Makefile +++ b/security/nss/cmd/SSLsample/Makefile.in @@ -33,51 +33,43 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +# DIRS = client server ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### - - ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk - -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2) -OS_LIBS += -lsvld -endif - -ifeq ($(OS_ARCH)$(OS_RELEASE), SunOS5.6) -OS_LIBS += -ldl -lxnet -lposix4 -lsocket -lnsl -endif - -ifeq ($(OS_ARCH), WINNT) -EXTRA_LIBS += $(DIST)/lib/crmf.lib -else -EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) -endif - -include ../platlibs.mk - +include $(srcdir)/../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -89,8 +81,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### +include $(srcdir)/../platrules.mk -lame: - echo $(CPU_ARCH) - -include ../platrules.mk diff --git a/security/nss/cmd/SSLsample/client.mn b/security/nss/cmd/SSLsample/client.mn index 74930c5e5..7256cd482 100644 --- a/security/nss/cmd/SSLsample/client.mn +++ b/security/nss/cmd/SSLsample/client.mn @@ -30,8 +30,6 @@ # GPL. # -CORE_DEPTH = ../../.. - MODULE = security EXPORTS = diff --git a/security/nss/cmd/SSLsample/make.client b/security/nss/cmd/SSLsample/make.client index 3dd7705e3..dffc7e40d 100644 --- a/security/nss/cmd/SSLsample/make.client +++ b/security/nss/cmd/SSLsample/make.client @@ -43,13 +43,13 @@ include client.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### -#include $(CORE_DEPTH)/$(MODULE)/config/config.mk +#include $(MOD_DEPTH)/$(MODULE)/config/config.mk ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # @@ -61,7 +61,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/SSLsample/make.server b/security/nss/cmd/SSLsample/make.server index 7969df798..999d4982d 100644 --- a/security/nss/cmd/SSLsample/make.server +++ b/security/nss/cmd/SSLsample/make.server @@ -43,13 +43,13 @@ include server.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### -#include $(CORE_DEPTH)/$(MODULE)/config/config.mk +#include $(MOD_DEPTH)/$(MODULE)/config/config.mk ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # @@ -61,7 +61,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/SSLsample/server.mn b/security/nss/cmd/SSLsample/server.mn index 74226f08f..03bf34577 100644 --- a/security/nss/cmd/SSLsample/server.mn +++ b/security/nss/cmd/SSLsample/server.mn @@ -30,8 +30,6 @@ # GPL. # -CORE_DEPTH = ../../.. - MODULE = security EXPORTS = diff --git a/security/nss/cmd/addbuiltin/Makefile b/security/nss/cmd/addbuiltin/Makefile index 8650a607d..01dcc3cee 100644 --- a/security/nss/cmd/addbuiltin/Makefile +++ b/security/nss/cmd/addbuiltin/Makefile @@ -42,7 +42,7 @@ include manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -59,7 +59,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/addbuiltin/manifest.mn b/security/nss/cmd/addbuiltin/manifest.mn index c664c2d6c..517af74d4 100644 --- a/security/nss/cmd/addbuiltin/manifest.mn +++ b/security/nss/cmd/addbuiltin/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/atob/.cvsignore b/security/nss/cmd/atob/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/atob/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/certcgi/Makefile b/security/nss/cmd/atob/Makefile.in index 573c12cac..281cafd02 100644 --- a/security/nss/cmd/certcgi/Makefile +++ b/security/nss/cmd/atob/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -52,13 +63,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk +include $(srcdir)/../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -70,7 +81,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - - -include ../platrules.mk +include $(srcdir)/../platrules.mk diff --git a/security/nss/cmd/atob/manifest.mn b/security/nss/cmd/atob/manifest.mn index ed3717be6..f9f77b70a 100644 --- a/security/nss/cmd/atob/manifest.mn +++ b/security/nss/cmd/atob/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/bltest/.cvsignore b/security/nss/cmd/bltest/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/bltest/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/crlutil/Makefile b/security/nss/cmd/bltest/Makefile.in index 573c12cac..281cafd02 100644 --- a/security/nss/cmd/crlutil/Makefile +++ b/security/nss/cmd/bltest/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -52,13 +63,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk +include $(srcdir)/../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -70,7 +81,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - - -include ../platrules.mk +include $(srcdir)/../platrules.mk diff --git a/security/nss/cmd/bltest/manifest.mn b/security/nss/cmd/bltest/manifest.mn index 36bfadc9c..5af6b8476 100644 --- a/security/nss/cmd/bltest/manifest.mn +++ b/security/nss/cmd/bltest/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/btoa/.cvsignore b/security/nss/cmd/btoa/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/btoa/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/btoa/Makefile b/security/nss/cmd/btoa/Makefile deleted file mode 100644 index 763faa253..000000000 --- a/security/nss/cmd/btoa/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/btoa/Makefile.in b/security/nss/cmd/btoa/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/btoa/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/btoa/manifest.mn b/security/nss/cmd/btoa/manifest.mn index 8bbf6ee00..44e4422e8 100644 --- a/security/nss/cmd/btoa/manifest.mn +++ b/security/nss/cmd/btoa/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/certcgi/.cvsignore b/security/nss/cmd/certcgi/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/certcgi/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/atob/Makefile b/security/nss/cmd/certcgi/Makefile.in index ff6f06e7e..8271a2b72 100644 --- a/security/nss/cmd/atob/Makefile +++ b/security/nss/cmd/certcgi/Makefile.in @@ -33,16 +33,26 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/autoconf.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -52,14 +62,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk - +include $(srcdir)/../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -71,6 +80,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - -include ../platrules.mk +include $(srcdir)/../platrules.mk diff --git a/security/nss/cmd/certcgi/manifest.mn b/security/nss/cmd/certcgi/manifest.mn index e065a8e1a..1fb6e7b58 100644 --- a/security/nss/cmd/certcgi/manifest.mn +++ b/security/nss/cmd/certcgi/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIREd. MODULE = security diff --git a/security/nss/cmd/certutil/.cvsignore b/security/nss/cmd/certutil/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/certutil/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/certutil/Makefile b/security/nss/cmd/certutil/Makefile deleted file mode 100644 index 8650a607d..000000000 --- a/security/nss/cmd/certutil/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/certutil/Makefile.in b/security/nss/cmd/certutil/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/certutil/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/certutil/manifest.mn b/security/nss/cmd/certutil/manifest.mn index 3b175bcf3..fa6937280 100644 --- a/security/nss/cmd/certutil/manifest.mn +++ b/security/nss/cmd/certutil/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 -DSECUTIL_NEW diff --git a/security/nss/cmd/checkcert/.cvsignore b/security/nss/cmd/checkcert/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/checkcert/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/checkcert/Makefile.in b/security/nss/cmd/checkcert/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/checkcert/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/checkcert/manifest.mn b/security/nss/cmd/checkcert/manifest.mn index 9d5a99f73..fa2acb946 100644 --- a/security/nss/cmd/checkcert/manifest.mn +++ b/security/nss/cmd/checkcert/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/crlutil/.cvsignore b/security/nss/cmd/crlutil/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/crlutil/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/crlutil/Makefile.in b/security/nss/cmd/crlutil/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/crlutil/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/crlutil/manifest.mn b/security/nss/cmd/crlutil/manifest.mn index e63d71c05..1a20586c6 100644 --- a/security/nss/cmd/crlutil/manifest.mn +++ b/security/nss/cmd/crlutil/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/crmf-cgi/.cvsignore b/security/nss/cmd/crmf-cgi/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/crmf-cgi/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/crmftest/Makefile b/security/nss/cmd/crmf-cgi/Makefile.in index 9eae3715a..dae2b46b0 100644 --- a/security/nss/cmd/crmftest/Makefile +++ b/security/nss/cmd/crmf-cgi/Makefile.in @@ -33,31 +33,37 @@ # ####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # +# (0) Initialize autoconf variables # ####################################################################### -include manifest.mn +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # +# (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(srcdir)/manifest.mn ####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # +# (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### - +include $(CORECONF_SOURCE)/config.mk ####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # +# (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### -include config.mk + +include $(srcdir)/config.mk ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2) -OS_LIBS += -lsvld -endif +OS_LIBS += -lsvld +endif ifeq ($(OS_ARCH)$(OS_RELEASE), SunOS5.6) OS_LIBS += -ldl -lxnet -lposix4 -lsocket -lnsl @@ -66,16 +72,21 @@ endif ifeq ($(OS_ARCH), WINNT) EXTRA_LIBS += $(DIST)/lib/crmf.lib else -EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) +EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) endif -include ../platlibs.mk + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -87,13 +98,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -LDDIST = $(DIST)/lib - -ifeq ($(OS_ARCH), WINNT) -EXTRA_LIBS += $(LDDIST)/sectool.lib -endif - -lame: - echo $(CPU_ARCH) +include $(srcdir)/../platrules.mk -include ../platrules.mk diff --git a/security/nss/cmd/crmf-cgi/manifest.mn b/security/nss/cmd/crmf-cgi/manifest.mn index 98cd2c401..387a76227 100644 --- a/security/nss/cmd/crmf-cgi/manifest.mn +++ b/security/nss/cmd/crmf-cgi/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEPTH = . MODULE = security diff --git a/security/nss/cmd/crmftest/.cvsignore b/security/nss/cmd/crmftest/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/crmftest/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/crmftest/Makefile.in b/security/nss/cmd/crmftest/Makefile.in new file mode 100644 index 000000000..c3cf83296 --- /dev/null +++ b/security/nss/cmd/crmftest/Makefile.in @@ -0,0 +1,105 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +include $(srcdir)/config.mk + +ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2) +OS_LIBS += -lsvld +endif + +ifeq ($(OS_ARCH)$(OS_RELEASE), SunOS5.6) +OS_LIBS += -ldl -lxnet -lposix4 -lsocket -lnsl +endif + +ifeq ($(OS_ARCH), WINNT) +EXTRA_LIBS += $(DIST)/lib/crmf.lib +else +EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) +endif + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + +ifeq ($(OS_ARCH), WINNT) +EXTRA_LIBS += $(DIST)/lib/sectool.lib +endif + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/crmftest/manifest.mn b/security/nss/cmd/crmftest/manifest.mn index b27e4a3d8..b9ca3dc04 100644 --- a/security/nss/cmd/crmftest/manifest.mn +++ b/security/nss/cmd/crmftest/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEPTH = . # MODULE public and private header directories are implicitly REQUIRED. diff --git a/security/nss/cmd/dbck/.cvsignore b/security/nss/cmd/dbck/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/dbck/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/dbck/Makefile b/security/nss/cmd/dbck/Makefile deleted file mode 100644 index 7ca8f0630..000000000 --- a/security/nss/cmd/dbck/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/dbck/Makefile.in b/security/nss/cmd/dbck/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/dbck/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/dbck/manifest.mn b/security/nss/cmd/dbck/manifest.mn index 8424f819d..b887cce84 100644 --- a/security/nss/cmd/dbck/manifest.mn +++ b/security/nss/cmd/dbck/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/derdump/.cvsignore b/security/nss/cmd/derdump/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/derdump/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/derdump/Makefile b/security/nss/cmd/derdump/Makefile deleted file mode 100644 index 573c12cac..000000000 --- a/security/nss/cmd/derdump/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - - -include ../platrules.mk - diff --git a/security/nss/cmd/derdump/Makefile.in b/security/nss/cmd/derdump/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/derdump/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/derdump/manifest.mn b/security/nss/cmd/derdump/manifest.mn index c00df3509..0163ce5dd 100644 --- a/security/nss/cmd/derdump/manifest.mn +++ b/security/nss/cmd/derdump/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/digest/.cvsignore b/security/nss/cmd/digest/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/digest/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/digest/Makefile b/security/nss/cmd/digest/Makefile deleted file mode 100644 index 573c12cac..000000000 --- a/security/nss/cmd/digest/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - - -include ../platrules.mk - diff --git a/security/nss/cmd/digest/Makefile.in b/security/nss/cmd/digest/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/digest/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/digest/manifest.mn b/security/nss/cmd/digest/manifest.mn index 8150b2c1d..310e1c8a0 100644 --- a/security/nss/cmd/digest/manifest.mn +++ b/security/nss/cmd/digest/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/ilock/Makefile b/security/nss/cmd/ilock/Makefile index 4e39ffc3f..f38c4cb4d 100644 --- a/security/nss/cmd/ilock/Makefile +++ b/security/nss/cmd/ilock/Makefile @@ -42,7 +42,7 @@ include manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -58,7 +58,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/ilock/manifest.mn b/security/nss/cmd/ilock/manifest.mn index fcea16608..4da39376e 100644 --- a/security/nss/cmd/ilock/manifest.mn +++ b/security/nss/cmd/ilock/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/keyutil/.cvsignore b/security/nss/cmd/keyutil/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/keyutil/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/keyutil/Makefile b/security/nss/cmd/keyutil/Makefile deleted file mode 100644 index a2ed814be..000000000 --- a/security/nss/cmd/keyutil/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - -include ../platrules.mk diff --git a/security/nss/cmd/keyutil/Makefile.in b/security/nss/cmd/keyutil/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/keyutil/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/keyutil/manifest.mn b/security/nss/cmd/keyutil/manifest.mn index 40b938cac..1bdd25273 100644 --- a/security/nss/cmd/keyutil/manifest.mn +++ b/security/nss/cmd/keyutil/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/lib/.cvsignore b/security/nss/cmd/lib/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/lib/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/lib/Makefile b/security/nss/cmd/lib/Makefile deleted file mode 100644 index 0769c80a3..000000000 --- a/security/nss/cmd/lib/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include config.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - diff --git a/security/nss/cmd/lib/Makefile.in b/security/nss/cmd/lib/Makefile.in new file mode 100644 index 000000000..781393717 --- /dev/null +++ b/security/nss/cmd/lib/Makefile.in @@ -0,0 +1,86 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + + diff --git a/security/nss/cmd/lib/manifest.mn b/security/nss/cmd/lib/manifest.mn index 969596863..9475fcd3d 100644 --- a/security/nss/cmd/lib/manifest.mn +++ b/security/nss/cmd/lib/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. LIBRARY_NAME = sectool diff --git a/security/nss/cmd/makepqg/.cvsignore b/security/nss/cmd/makepqg/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/makepqg/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/makepqg/Makefile b/security/nss/cmd/makepqg/Makefile deleted file mode 100644 index 36bf774fb..000000000 --- a/security/nss/cmd/makepqg/Makefile +++ /dev/null @@ -1,77 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - - diff --git a/security/nss/cmd/makepqg/Makefile.in b/security/nss/cmd/makepqg/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/makepqg/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/makepqg/manifest.mn b/security/nss/cmd/makepqg/manifest.mn index 1bf4337c1..a44d32616 100644 --- a/security/nss/cmd/makepqg/manifest.mn +++ b/security/nss/cmd/makepqg/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # This next line is used by .mk files # and gets translated into $LINCS in manifest.mnw diff --git a/security/nss/cmd/manifest.mn b/security/nss/cmd/manifest.mn index f0d928607..58d890a16 100644 --- a/security/nss/cmd/manifest.mn +++ b/security/nss/cmd/manifest.mn @@ -56,8 +56,6 @@ DIRS = lib \ p7verify \ pk12util \ pp \ - rngtest \ - rsaperf \ sdrtest \ selfserv \ signtool \ diff --git a/security/nss/cmd/modutil/.cvsignore b/security/nss/cmd/modutil/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/modutil/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/modutil/Makefile b/security/nss/cmd/modutil/Makefile.in index 3d2bbb412..464231c73 100644 --- a/security/nss/cmd/modutil/Makefile +++ b/security/nss/cmd/modutil/Makefile.in @@ -33,31 +33,45 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### +INCLUDES += -I$(srcdir) + ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk + +include $(srcdir)/../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -69,8 +83,7 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - -include ../platrules.mk +include $(srcdir)/../platrules.mk # # Cancel the built-in implicit yacc and lex rules. diff --git a/security/nss/cmd/modutil/manifest.mn b/security/nss/cmd/modutil/manifest.mn index fb0ac6ae3..910a1a8ad 100644 --- a/security/nss/cmd/modutil/manifest.mn +++ b/security/nss/cmd/modutil/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = sectools diff --git a/security/nss/cmd/ocspclnt/.cvsignore b/security/nss/cmd/ocspclnt/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/ocspclnt/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/ocspclnt/Makefile b/security/nss/cmd/ocspclnt/Makefile deleted file mode 100644 index 490f738e5..000000000 --- a/security/nss/cmd/ocspclnt/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk diff --git a/security/nss/cmd/bltest/Makefile b/security/nss/cmd/ocspclnt/Makefile.in index c99a3c017..c013150bc 100644 --- a/security/nss/cmd/bltest/Makefile +++ b/security/nss/cmd/ocspclnt/Makefile.in @@ -33,50 +33,52 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn -#MKPROG = purify -cache-dir=/u/mcgreer/pcache -best-effort \ -# -always-use-cache-dir $(CC) +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### - - ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk - -#EXTRA_SHARED_LIBS += \ -# -L/usr/lib \ -# -lposix4 \ -# $(NULL) +include $(srcdir)/../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -include ../platrules.mk +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/ocspclnt/manifest.mn b/security/nss/cmd/ocspclnt/manifest.mn index 225bc7c4a..de061f4bf 100644 --- a/security/nss/cmd/ocspclnt/manifest.mn +++ b/security/nss/cmd/ocspclnt/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/oidcalc/.cvsignore b/security/nss/cmd/oidcalc/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/oidcalc/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/oidcalc/Makefile b/security/nss/cmd/oidcalc/Makefile deleted file mode 100644 index 689240abd..000000000 --- a/security/nss/cmd/oidcalc/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/dbm/src/Makefile b/security/nss/cmd/oidcalc/Makefile.in index 997edacc9..e575a7959 100644 --- a/security/dbm/src/Makefile +++ b/security/nss/cmd/oidcalc/Makefile.in @@ -33,67 +33,53 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### - - ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk +include $(srcdir)/../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### -ifeq ($(OS_CONFIG),OSF1V4.0D) -INCLUDES += -I/usr/sys/include/arch/alpha -endif + ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### +include $(srcdir)/../platrules.mk -CPORLN = ln -s -ifeq ($(OS_ARCH),WINNT) -CPORLN = cp -endif - -DBM_SRCS = $(CSRCS) - -ALL_TRASH += $(DBM_SRCS) - -$(DBM_SRCS) : % : $(CORE_DEPTH)/../dbm/src/% - -$(CPORLN) $< . - -export:: $(DBM_SRCS) - -libs:: $(DBM_SRCS) - -program:: $(DBM_SRCS) - -private_export:: $(DBM_SRCS) - -echo:: - echo "$(DBM_SRCS)" diff --git a/security/nss/cmd/oidcalc/manifest.mn b/security/nss/cmd/oidcalc/manifest.mn index 890e112ef..4f760576e 100644 --- a/security/nss/cmd/oidcalc/manifest.mn +++ b/security/nss/cmd/oidcalc/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/p7content/.cvsignore b/security/nss/cmd/p7content/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/p7content/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/p7content/Makefile b/security/nss/cmd/p7content/Makefile deleted file mode 100644 index 4e39ffc3f..000000000 --- a/security/nss/cmd/p7content/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/p7content/Makefile.in b/security/nss/cmd/p7content/Makefile.in new file mode 100644 index 000000000..e575a7959 --- /dev/null +++ b/security/nss/cmd/p7content/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/p7content/manifest.mn b/security/nss/cmd/p7content/manifest.mn index 442e51f0c..c31e38cae 100644 --- a/security/nss/cmd/p7content/manifest.mn +++ b/security/nss/cmd/p7content/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/p7env/.cvsignore b/security/nss/cmd/p7env/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/p7env/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/p7env/Makefile b/security/nss/cmd/p7env/Makefile deleted file mode 100644 index 4e39ffc3f..000000000 --- a/security/nss/cmd/p7env/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/p7env/Makefile.in b/security/nss/cmd/p7env/Makefile.in new file mode 100644 index 000000000..e575a7959 --- /dev/null +++ b/security/nss/cmd/p7env/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/p7env/manifest.mn b/security/nss/cmd/p7env/manifest.mn index 8b558b6c6..1ce7ddcd0 100644 --- a/security/nss/cmd/p7env/manifest.mn +++ b/security/nss/cmd/p7env/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/p7sign/.cvsignore b/security/nss/cmd/p7sign/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/p7sign/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/p7sign/Makefile b/security/nss/cmd/p7sign/Makefile deleted file mode 100644 index 4e39ffc3f..000000000 --- a/security/nss/cmd/p7sign/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/p7sign/Makefile.in b/security/nss/cmd/p7sign/Makefile.in new file mode 100644 index 000000000..e575a7959 --- /dev/null +++ b/security/nss/cmd/p7sign/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/p7sign/manifest.mn b/security/nss/cmd/p7sign/manifest.mn index 5665dbc7b..7afd3c669 100644 --- a/security/nss/cmd/p7sign/manifest.mn +++ b/security/nss/cmd/p7sign/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/p7verify/.cvsignore b/security/nss/cmd/p7verify/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/p7verify/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/p7verify/Makefile b/security/nss/cmd/p7verify/Makefile deleted file mode 100644 index 4e39ffc3f..000000000 --- a/security/nss/cmd/p7verify/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/p7verify/Makefile.in b/security/nss/cmd/p7verify/Makefile.in new file mode 100644 index 000000000..e575a7959 --- /dev/null +++ b/security/nss/cmd/p7verify/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/p7verify/manifest.mn b/security/nss/cmd/p7verify/manifest.mn index 51fd7091d..ac8b6eddd 100644 --- a/security/nss/cmd/p7verify/manifest.mn +++ b/security/nss/cmd/p7verify/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/pk12util/.cvsignore b/security/nss/cmd/pk12util/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/pk12util/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/pk12util/Makefile b/security/nss/cmd/pk12util/Makefile deleted file mode 100644 index 8650a607d..000000000 --- a/security/nss/cmd/pk12util/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/pk12util/Makefile.in b/security/nss/cmd/pk12util/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/pk12util/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/pk12util/manifest.mn b/security/nss/cmd/pk12util/manifest.mn index a15daef6b..683bc15a7 100644 --- a/security/nss/cmd/pk12util/manifest.mn +++ b/security/nss/cmd/pk12util/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/pk12util/pk12util.c b/security/nss/cmd/pk12util/pk12util.c index 71f345c22..4d9ca833c 100644 --- a/security/nss/cmd/pk12util/pk12util.c +++ b/security/nss/cmd/pk12util/pk12util.c @@ -42,6 +42,7 @@ #define PKCS12_IN_BUFFER_SIZE 200 static char *progName; +PRBool pk12_debugging = PR_FALSE; PRIntn pk12uErrno = 0; @@ -187,12 +188,6 @@ p12u_CreateTemporaryDigestFile(void) return NULL; } - p12cxt->file = PR_Open(p12cxt->filename, PR_RDONLY, 0400); - if (!p12cxt->filename) { - p12u_DestroyExportFileInfo(&p12cxt, PR_FALSE); - return NULL; - } - return p12cxt; } @@ -347,8 +342,7 @@ p12u_ucs2_ascii_conversion_function(PRBool toUnicode, /* If converting Unicode to ASCII, swap bytes before conversion * as neccessary. */ -#ifdef DEBUG - { + if (pk12_debugging) { int i; printf("Converted from:\n"); for (i=0; i<inBufLen; i++) { @@ -357,7 +351,6 @@ p12u_ucs2_ascii_conversion_function(PRBool toUnicode, } printf("\n"); } -#endif it.data = inBuf; it.len = inBufLen; dup = SECITEM_DupItem(&it); @@ -388,8 +381,7 @@ p12u_ucs2_ascii_conversion_function(PRBool toUnicode, SECITEM_ZfreeItem(dup, PR_TRUE); } #endif -#ifdef DEBUG - { + if (pk12_debugging) { int i; printf("Converted to:\n"); for (i=0; i<*outBufLen; i++) { @@ -398,7 +390,6 @@ p12u_ucs2_ascii_conversion_function(PRBool toUnicode, } printf("\n"); } -#endif return ret; } @@ -476,15 +467,15 @@ P12U_InitSlot(PK11SlotInfo *slot, secuPWData *slotPw) (slotPw->source == PW_PLAINTEXT) ? slotPw->data : 0, (slotPw->source == PW_FROMFILE) ? slotPw->data : 0); if (rv != SECSuccess) { - PR_fprintf(PR_STDERR, "%s: Failed to initialize slot \"%s\".\n", - progName, PK11_GetSlotName(slot)); + SECU_PrintError(progName, "Failed to initialize slot \"%s\"", + PK11_GetSlotName(slot)); return SECFailure; } } if (PK11_Authenticate(slot, PR_TRUE, slotPw) != SECSuccess) { - PR_fprintf(PR_STDERR, "%s: Failed to authenticate to PKCS11 slot.\n", - progName); + SECU_PrintError(progName, + "Failed to authenticate to PKCS11 slot"); PORT_SetError(SEC_ERROR_USER_CANCELLED); pk12uErrno = PK12UERR_USER_CANCELLED; return SECFailure; @@ -520,15 +511,15 @@ P12U_ImportPKCS12Object(char *in_file, PK11SlotInfo *slot, rv = P12U_InitSlot(slot, slotPw); if (rv != SECSuccess) { - PR_fprintf(PR_STDERR, "%s: Failed to authenticate to \"%s\".\n", - progName, PK11_GetSlotName(slot)); + SECU_PrintError(progName, "Failed to authenticate to \"%s\"", + PK11_GetSlotName(slot)); pk12uErrno = PK12UERR_PK11GETSLOT; goto loser; } p12cxt = p12u_InitFile(PR_TRUE, in_file); if(!p12cxt) { - printf("%s: Initialization failed: %s\n", progName, in_file); + SECU_PrintError(progName,"Initialization failed: %s", in_file); pk12uErrno = PK12UERR_INIT_FILE; goto loser; } @@ -542,14 +533,14 @@ P12U_ImportPKCS12Object(char *in_file, PK11SlotInfo *slot, if(P12U_UnicodeConversion(NULL, &uniPwitem, pwitem, PR_TRUE, swapUnicode) != SECSuccess) { - printf("%s: Unicode conversion failed \n", progName); + SECU_PrintError(progName,"Unicode conversion failed"); pk12uErrno = PK12UERR_UNICODECONV; goto loser; } tmpcxt = p12u_CreateTemporaryDigestFile(); if(!tmpcxt) { - printf("%s: Create Temporary digest file failed.\n", progName); + SECU_PrintError(progName,"Create Temporary digest file failed"); pk12uErrno = PK12UERR_TMPDIGCREATE; goto loser; } @@ -560,7 +551,7 @@ P12U_ImportPKCS12Object(char *in_file, PK11SlotInfo *slot, p12u_DigestRead, p12u_DigestWrite, tmpcxt); if(!p12dcx) { - printf("%s: PKCS12 decoder start failed.\n", progName); + SECU_PrintError(progName,"PKCS12 decoder start failed"); pk12uErrno = PK12UERR_PK12DECODESTART; goto loser; } @@ -568,7 +559,7 @@ P12U_ImportPKCS12Object(char *in_file, PK11SlotInfo *slot, /* decode the item */ rv = SECU_FileToItem(&p12file, p12cxt->file); if (rv != SECSuccess) { - fprintf(stderr, "%s: Failed to read from import file.\n", progName); + SECU_PrintError(progName,"Failed to read from import file"); goto loser; } rv = SEC_PKCS12DecoderUpdate(p12dcx, p12file.data, p12file.len); @@ -587,7 +578,7 @@ P12U_ImportPKCS12Object(char *in_file, PK11SlotInfo *slot, } goto tried_pdu_import; #endif /* EXTRA */ - printf("%s: PKCS12 decoding failed.\n", progName); + SECU_PrintError(progName,"PKCS12 decoding failed"); pk12uErrno = PK12UERR_DECODE; } @@ -595,7 +586,7 @@ P12U_ImportPKCS12Object(char *in_file, PK11SlotInfo *slot, /* does the blob authenticate properly? */ if(SEC_PKCS12DecoderVerify(p12dcx) != SECSuccess) { - printf("%s: PKCS12 decode not verified\n", progName); + SECU_PrintError(progName,"PKCS12 decode not verified"); pk12uErrno = PK12UERR_DECODEVERIFY; goto loser; } @@ -605,15 +596,16 @@ P12U_ImportPKCS12Object(char *in_file, PK11SlotInfo *slot, != SECSuccess) { if (PORT_GetError() == SEC_ERROR_PKCS12_DUPLICATE_DATA) { pk12uErrno = PK12UERR_CERTALREADYEXISTS; + } else { + pk12uErrno = PK12UERR_DECODEVALIBAGS; } - printf("%s: PKCS12 decode validate bags failed.\n", progName); - pk12uErrno = PK12UERR_DECODEVALIBAGS; + SECU_PrintError(progName,"PKCS12 decode validate bags failed"); goto loser; } /* stuff 'em in */ if(SEC_PKCS12DecoderImportBags(p12dcx) != SECSuccess) { - printf("%s: PKCS12 decode import bags failed.\n", progName); + SECU_PrintError(progName,"PKCS12 decode import bags failed"); pk12uErrno = PK12UERR_DECODEIMPTBAGS; goto loser; } @@ -622,7 +614,7 @@ P12U_ImportPKCS12Object(char *in_file, PK11SlotInfo *slot, /* important - to add the password hash into the key database */ rv = PK11_CheckUserPassword(slot, pw_string); if( rv != SECSuccess ) { - printf("Failed to CheckUserPassword\n"); + SECU_PrintError(progName,"Failed to CheckUserPassword"); exit(-1); } #endif @@ -715,19 +707,19 @@ P12U_ExportPKCS12Object(char *nn, char *outfile, cert = PK11_FindCertFromNickname(nn, NULL); if(!cert) { - printf("%s: find cert by nickname failed.\n", progName); + SECU_PrintError(progName,"find cert by nickname failed"); pk12uErrno = PK12UERR_FINDCERTBYNN; return; } if (!cert->slot) { - fprintf(stderr, "%s: cert does not have a slot.\n", progName); + SECU_PrintError(progName,"cert does not have a slot"); pk12uErrno = PK12UERR_FINDCERTBYNN; goto loser; } if (P12U_InitSlot(cert->slot, slotPw) != SECSuccess) { - fprintf(stderr, "%s: Failed to authenticate to \"%s\".\n", - progName, PK11_GetSlotName(cert->slot)); + SECU_PrintError(progName,"Failed to authenticate to \"%s\"", + PK11_GetSlotName(cert->slot)); pk12uErrno = PK12UERR_PK11GETSLOT; goto loser; } @@ -740,14 +732,14 @@ P12U_ExportPKCS12Object(char *nn, char *outfile, p12ecx = SEC_PKCS12CreateExportContext(NULL, NULL, cert->slot, NULL); if(!p12ecx) { - printf("%s: export context creation failed.\n", progName); + SECU_PrintError(progName,"export context creation failed"); pk12uErrno = PK12UERR_EXPORTCXCREATE; goto loser; } if(SEC_PKCS12AddPasswordIntegrity(p12ecx, pwitem, SEC_OID_SHA1) != SECSuccess) { - printf("%s: PKCS12 add password integrity failed.\n", progName); + SECU_PrintError(progName,"PKCS12 add password integrity failed"); pk12uErrno = PK12UERR_PK12ADDPWDINTEG; goto loser; } @@ -761,7 +753,7 @@ P12U_ExportPKCS12Object(char *nn, char *outfile, } if(!certSafe || !keySafe) { - printf("%s: key or cert safe creation failed.\n", progName); + SECU_PrintError(progName,"key or cert safe creation failed"); pk12uErrno = PK12UERR_CERTKEYSAFE; goto loser; } @@ -770,21 +762,21 @@ P12U_ExportPKCS12Object(char *nn, char *outfile, CERT_GetDefaultCertDB(), keySafe, NULL, PR_TRUE, pwitem, SEC_OID_PKCS12_V2_PBE_WITH_SHA1_AND_3KEY_TRIPLE_DES_CBC) != SECSuccess) { - printf("%s: add cert and key failed.\n", progName); + SECU_PrintError(progName,"add cert and key failed"); pk12uErrno = PK12UERR_ADDCERTKEY; goto loser; } - p12cxt = p12u_InitFile(PR_FALSE, outfile); + p12cxt = p12u_InitFile(PR_FALSE, outfile); if(!p12cxt) { - printf("%s: Initialization failed: %s\n", progName, outfile); + SECU_PrintError(progName,"Initialization failed: %s", outfile); pk12uErrno = PK12UERR_INIT_FILE; goto loser; } if(SEC_PKCS12Encode(p12ecx, p12u_WriteToExportFile, p12cxt) != SECSuccess) { - printf("%s: PKCS12 encode failed.\n", progName); + SECU_PrintError(progName,"PKCS12 encode failed"); pk12uErrno = PK12UERR_ENCODE; goto loser; } @@ -869,7 +861,8 @@ enum { opt_Export, opt_P12FilePWFile, opt_P12FilePW, - opt_DBPrefix + opt_DBPrefix, + opt_Debug }; static secuCommandFlag pk12util_options[] = @@ -884,7 +877,8 @@ static secuCommandFlag pk12util_options[] = { /* opt_Export */ 'o', PR_TRUE, 0, PR_FALSE }, { /* opt_P12FilePWFile */ 'w', PR_TRUE, 0, PR_FALSE }, { /* opt_P12FilePW */ 'W', PR_TRUE, 0, PR_FALSE }, - { /* opt_DBPrefix */ 'P', PR_TRUE, 0, PR_FALSE } + { /* opt_DBPrefix */ 'P', PR_TRUE, 0, PR_FALSE }, + { /* opt_Debug */ 'v', PR_FALSE, 0, PR_FALSE } }; int @@ -914,6 +908,8 @@ main(int argc, char **argv) if (rv != SECSuccess) Usage(progName); + pk12_debugging = pk12util.options[opt_Debug].activated; + if (pk12util.options[opt_Import].activated && pk12util.options[opt_Export].activated) { Usage(progName); @@ -964,8 +960,7 @@ main(int argc, char **argv) slot = PK11_FindSlotByName(slotname); if (!slot) { - PR_fprintf(PR_STDERR, "%s: Invalid slot \"%s\".\n", - progName, slotname); + SECU_PrintError(progName,"Invalid slot \"%s\"", slotname); goto done; } diff --git a/security/nss/cmd/platlibs.mk b/security/nss/cmd/platlibs.mk index 4f486e938..0463eee87 100644 --- a/security/nss/cmd/platlibs.mk +++ b/security/nss/cmd/platlibs.mk @@ -107,7 +107,7 @@ EXTRA_LIBS += \ $(DIST)/lib/libswfci.$(LIB_SUFFIX) \ $(CRYPTOLIB) \ $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ - $(DIST)/lib/libdbm.$(LIB_SUFFIX) \ + $(DBM_LIBS) \ $(NULL) ifeq ($(OS_ARCH), AIX) @@ -123,12 +123,7 @@ EXTRA_SHARED_LIBS += \ $(DIST)/lib/nspr4.lib \ $(NULL) else -EXTRA_SHARED_LIBS += \ - -L$(DIST)/lib/ \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ - $(NULL) +EXTRA_SHARED_LIBS += $(NSPR_LIBS) endif endif @@ -170,9 +165,7 @@ EXTRA_SHARED_LIBS += \ -lssl3 \ -lsmime3 \ -lnss3 \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ + $(NSPR_LIBS) \ $(NULL) endif diff --git a/security/nss/cmd/pp/.cvsignore b/security/nss/cmd/pp/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/pp/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/pp/Makefile b/security/nss/cmd/pp/Makefile deleted file mode 100644 index 4e39ffc3f..000000000 --- a/security/nss/cmd/pp/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/pp/Makefile.in b/security/nss/cmd/pp/Makefile.in new file mode 100644 index 000000000..e575a7959 --- /dev/null +++ b/security/nss/cmd/pp/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/pp/manifest.mn b/security/nss/cmd/pp/manifest.mn index dc0da84f9..1c66d5ae6 100644 --- a/security/nss/cmd/pp/manifest.mn +++ b/security/nss/cmd/pp/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/rsaperf/Makefile b/security/nss/cmd/rsaperf/Makefile index cf93911eb..6ef7481a9 100644 --- a/security/nss/cmd/rsaperf/Makefile +++ b/security/nss/cmd/rsaperf/Makefile @@ -42,7 +42,7 @@ include manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -65,7 +65,7 @@ endif # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/rsaperf/manifest.mn b/security/nss/cmd/rsaperf/manifest.mn index 2f2407808..55ed340d8 100644 --- a/security/nss/cmd/rsaperf/manifest.mn +++ b/security/nss/cmd/rsaperf/manifest.mn @@ -31,8 +31,8 @@ # GPL. # -DEPTH = ../../.. -CORE_DEPTH = ../../.. +DEPTH = ../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/sdrtest/.cvsignore b/security/nss/cmd/sdrtest/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/sdrtest/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/sdrtest/Makefile b/security/nss/cmd/sdrtest/Makefile deleted file mode 100644 index 490f738e5..000000000 --- a/security/nss/cmd/sdrtest/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk diff --git a/security/nss/cmd/sdrtest/Makefile.in b/security/nss/cmd/sdrtest/Makefile.in new file mode 100644 index 000000000..c013150bc --- /dev/null +++ b/security/nss/cmd/sdrtest/Makefile.in @@ -0,0 +1,84 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/sdrtest/manifest.mn b/security/nss/cmd/sdrtest/manifest.mn index 61daf390b..103ae72a2 100644 --- a/security/nss/cmd/sdrtest/manifest.mn +++ b/security/nss/cmd/sdrtest/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/selfserv/.cvsignore b/security/nss/cmd/selfserv/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/selfserv/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/selfserv/Makefile b/security/nss/cmd/selfserv/Makefile deleted file mode 100644 index f2a407990..000000000 --- a/security/nss/cmd/selfserv/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/selfserv/Makefile.in b/security/nss/cmd/selfserv/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/selfserv/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/selfserv/manifest.mn b/security/nss/cmd/selfserv/manifest.mn index f8050ed9e..dd15db844 100644 --- a/security/nss/cmd/selfserv/manifest.mn +++ b/security/nss/cmd/selfserv/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/signtool/.cvsignore b/security/nss/cmd/signtool/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/signtool/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/signtool/Makefile b/security/nss/cmd/signtool/Makefile.in index 20225ffe1..b121a50bf 100644 --- a/security/nss/cmd/signtool/Makefile +++ b/security/nss/cmd/signtool/Makefile.in @@ -1,5 +1,5 @@ #! gmake -# +# # The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -52,7 +63,7 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk +include $(srcdir)/../platlibs.mk # can't do this in manifest.mn because OS_ARCH isn't defined there. ifeq ($(OS_ARCH), WINNT) @@ -74,14 +85,17 @@ endif # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### + + ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -include ../platrules.mk +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/signtool/manifest.mn b/security/nss/cmd/signtool/manifest.mn index df226eebe..a881a4c17 100644 --- a/security/nss/cmd/signtool/manifest.mn +++ b/security/nss/cmd/signtool/manifest.mn @@ -30,7 +30,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/signver/.cvsignore b/security/nss/cmd/signver/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/signver/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/signver/Makefile b/security/nss/cmd/signver/Makefile deleted file mode 100644 index e4a3a6069..000000000 --- a/security/nss/cmd/signver/Makefile +++ /dev/null @@ -1,71 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - -include ../platrules.mk diff --git a/security/nss/cmd/signver/Makefile.in b/security/nss/cmd/signver/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/signver/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/signver/manifest.mn b/security/nss/cmd/signver/manifest.mn index 1ddccb504..de2d03df8 100644 --- a/security/nss/cmd/signver/manifest.mn +++ b/security/nss/cmd/signver/manifest.mn @@ -30,7 +30,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/smimetools/.cvsignore b/security/nss/cmd/smimetools/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/smimetools/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/smimetools/Makefile b/security/nss/cmd/smimetools/Makefile deleted file mode 100644 index 9e3263d43..000000000 --- a/security/nss/cmd/smimetools/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - -include rules.mk - -include ../platrules.mk diff --git a/security/nss/cmd/smimetools/Makefile.in b/security/nss/cmd/smimetools/Makefile.in new file mode 100644 index 000000000..0a7d75ffa --- /dev/null +++ b/security/nss/cmd/smimetools/Makefile.in @@ -0,0 +1,84 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/rules.mk +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/smimetools/manifest.mn b/security/nss/cmd/smimetools/manifest.mn index 9ed96c658..6b47e79d0 100644 --- a/security/nss/cmd/smimetools/manifest.mn +++ b/security/nss/cmd/smimetools/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/smimetools/rules.mk b/security/nss/cmd/smimetools/rules.mk index 51e0baaed..1ba5468f2 100644 --- a/security/nss/cmd/smimetools/rules.mk +++ b/security/nss/cmd/smimetools/rules.mk @@ -34,4 +34,4 @@ # install:: - $(INSTALL) -m 755 $(SCRIPTS) $(SOURCE_BIN_DIR) + $(INSTALL) -m 755 $(addprefix $(srcdir)/, $(SCRIPTS)) $(SOURCE_BIN_DIR) diff --git a/security/nss/cmd/sslstrength/.cvsignore b/security/nss/cmd/sslstrength/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/sslstrength/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/sslstrength/Makefile b/security/nss/cmd/sslstrength/Makefile deleted file mode 100644 index a6a708692..000000000 --- a/security/nss/cmd/sslstrength/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include $(CORE_DEPTH)/security/cmd/platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - - diff --git a/security/nss/cmd/sslstrength/Makefile.in b/security/nss/cmd/sslstrength/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/sslstrength/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/sslstrength/manifest.mn b/security/nss/cmd/sslstrength/manifest.mn index e76d1c639..e57a94aba 100644 --- a/security/nss/cmd/sslstrength/manifest.mn +++ b/security/nss/cmd/sslstrength/manifest.mn @@ -30,7 +30,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/cmd/ssltap/.cvsignore b/security/nss/cmd/ssltap/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/ssltap/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/ssltap/Makefile b/security/nss/cmd/ssltap/Makefile deleted file mode 100644 index f6d8cc93e..000000000 --- a/security/nss/cmd/ssltap/Makefile +++ /dev/null @@ -1,79 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -# Since ssltap doesn't use any of NSS, we'll skip NSS's link libs, -# and just link with NSPR. -# -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - - --include ../platrules.mk - diff --git a/security/nss/cmd/ssltap/Makefile.in b/security/nss/cmd/ssltap/Makefile.in new file mode 100644 index 000000000..281cafd02 --- /dev/null +++ b/security/nss/cmd/ssltap/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/ssltap/manifest.mn b/security/nss/cmd/ssltap/manifest.mn index 0719e6de4..57bdceeb5 100644 --- a/security/nss/cmd/ssltap/manifest.mn +++ b/security/nss/cmd/ssltap/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/strsclnt/.cvsignore b/security/nss/cmd/strsclnt/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/strsclnt/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/strsclnt/Makefile b/security/nss/cmd/strsclnt/Makefile deleted file mode 100644 index 4e39ffc3f..000000000 --- a/security/nss/cmd/strsclnt/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../platlibs.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/cmd/strsclnt/Makefile.in b/security/nss/cmd/strsclnt/Makefile.in new file mode 100644 index 000000000..e575a7959 --- /dev/null +++ b/security/nss/cmd/strsclnt/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/strsclnt/manifest.mn b/security/nss/cmd/strsclnt/manifest.mn index 2333e2c2e..5038860fc 100644 --- a/security/nss/cmd/strsclnt/manifest.mn +++ b/security/nss/cmd/strsclnt/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/swfort/.cvsignore b/security/nss/cmd/swfort/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/swfort/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/swfort/Makefile b/security/nss/cmd/swfort/Makefile deleted file mode 100644 index a5b4350a6..000000000 --- a/security/nss/cmd/swfort/Makefile +++ /dev/null @@ -1,108 +0,0 @@ -#! gmake -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. - -CORE_DEPTH = ../../.. - -include manifest.mn -include $(CORE_DEPTH)/coreconf/config.mk - -# $(NULL) - - -INCLUDES += \ - -I$(DIST)/../public/security \ - -I$(DIST)/../private/security \ - -I$(DEPTH)/security/lib/cert \ - -I$(DEPTH)/security/lib/key \ - -I$(DEPTH)/security/lib/util \ - -I./include \ - $(NULL) - - -# For the time being, sec stuff is export only -# US_FLAGS = -DEXPORT_VERSION -DUS_VERSION - -US_FLAGS = -DEXPORT_VERSION -EXPORT_FLAGS = -DEXPORT_VERSION - -BASE_LIBS = \ - $(DIST)/lib/libdbm.$(LIB_SUFFIX) \ - $(DIST)/lib/libxp.$(LIB_SUFFIX) \ - $(DIST)/lib/libnspr.$(LIB_SUFFIX) \ - $(NULL) - -# $(DIST)/lib/libpurenspr.$(LIB_SUFFIX) \ - -#There are a circular dependancies in security/lib, and we deal with it by -# double linking some libraries -SEC_LIBS = \ - $(DIST)/lib/libsecnav.$(LIB_SUFFIX) \ - $(DIST)/lib/libssl.$(LIB_SUFFIX) \ - $(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \ - $(DIST)/lib/libcert.$(LIB_SUFFIX) \ - $(DIST)/lib/libkey.$(LIB_SUFFIX) \ - $(DIST)/lib/libsecmod.$(LIB_SUFFIX) \ - $(DIST)/lib/libcrypto.$(LIB_SUFFIX) \ - $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ - $(DIST)/lib/libssl.$(LIB_SUFFIX) \ - $(DIST)/lib/libpkcs7.$(LIB_SUFFIX) \ - $(DIST)/lib/libcert.$(LIB_SUFFIX) \ - $(DIST)/lib/libkey.$(LIB_SUFFIX) \ - $(DIST)/lib/libsecmod.$(LIB_SUFFIX) \ - $(DIST)/lib/libcrypto.$(LIB_SUFFIX) \ - $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ - $(DIST)/lib/libhash.$(LIB_SUFFIX) \ - $(NULL) - -MYLIB = lib/$(OBJDIR)/libsectool.$(LIB_SUFFIX) - -US_LIBS = $(MYLIB) $(SEC_LIBS) $(BASE_LIBS) $(MYLIB) $(BASE_LIBS) -EX_LIBS = $(MYLIB) $(SEC_LIBS) $(BASE_LIBS) $(MYLIB) $(BASE_LIBS) - -REQUIRES = libxp nspr security - -CSRCS = $(EXEC_SRCS) $(BI_SRCS) - -OBJS = $(CSRCS:.c=.o) $(BI_SRCS:.c=-us.o) $(BI_SRCS:.c=-ex.o) - -PROGS = $(addprefix $(OBJDIR)/, $(EXEC_SRCS:.c=$(BIN_SUFFIX))) -US_PROGS = $(addprefix $(OBJDIR)/, $(BI_SRCS:.c=-us$(BIN_SUFFIX))) -EX_PROGS = $(addprefix $(OBJDIR)/, $(BI_SRCS:.c=-ex$(BIN_SUFFIX))) - - -NON_DIRS = $(PROGS) $(US_PROGS) $(EX_PROGS) -TARGETS = $(NON_DIRS) - -include $(CORE_DEPTH)/coreconf/rules.mk - -symbols:: - @echo "TARGETS = $(TARGETS)" diff --git a/security/nss/cmd/swfort/Makefile.in b/security/nss/cmd/swfort/Makefile.in new file mode 100644 index 000000000..e575a7959 --- /dev/null +++ b/security/nss/cmd/swfort/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../platrules.mk + diff --git a/security/nss/cmd/swfort/instinit/.cvsignore b/security/nss/cmd/swfort/instinit/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/swfort/instinit/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/swfort/instinit/Makefile b/security/nss/cmd/swfort/instinit/Makefile deleted file mode 100644 index f912d54cd..000000000 --- a/security/nss/cmd/swfort/instinit/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include ../../platlibs.mk - - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - -include ../../platrules.mk diff --git a/security/nss/cmd/swfort/instinit/Makefile.in b/security/nss/cmd/swfort/instinit/Makefile.in new file mode 100644 index 000000000..f185ab850 --- /dev/null +++ b/security/nss/cmd/swfort/instinit/Makefile.in @@ -0,0 +1,85 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/../../platlibs.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +include $(srcdir)/../../platrules.mk + diff --git a/security/nss/cmd/swfort/instinit/manifest.mn b/security/nss/cmd/swfort/instinit/manifest.mn index 83cb3e2da..4a8f3fe28 100644 --- a/security/nss/cmd/swfort/instinit/manifest.mn +++ b/security/nss/cmd/swfort/instinit/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/swfort/manifest.mn b/security/nss/cmd/swfort/manifest.mn index 2f8be569d..bcfc36342 100644 --- a/security/nss/cmd/swfort/manifest.mn +++ b/security/nss/cmd/swfort/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. REQUIRES = security seccmd dbm diff --git a/security/nss/cmd/swfort/newuser/.cvsignore b/security/nss/cmd/swfort/newuser/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/swfort/newuser/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/swfort/newuser/Makefile b/security/nss/cmd/swfort/newuser/Makefile.in index d65b21949..85525ba7c 100644 --- a/security/nss/cmd/swfort/newuser/Makefile +++ b/security/nss/cmd/swfort/newuser/Makefile.in @@ -1,4 +1,5 @@ #! gmake +# # The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of @@ -32,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -64,14 +76,13 @@ EXTRA_LIBS += \ $(NULL) endif -include ../../platlibs.mk - +include $(srcdir)/../../platlibs.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -83,5 +94,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -include ../../platrules.mk +include $(srcdir)/../../platrules.mk diff --git a/security/nss/cmd/swfort/newuser/manifest.mn b/security/nss/cmd/swfort/newuser/manifest.mn index d48803b1e..037aa0320 100644 --- a/security/nss/cmd/swfort/newuser/manifest.mn +++ b/security/nss/cmd/swfort/newuser/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/tstclnt/.cvsignore b/security/nss/cmd/tstclnt/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/tstclnt/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/tstclnt/Makefile b/security/nss/cmd/tstclnt/Makefile.in index 7e236b453..71de50f01 100644 --- a/security/nss/cmd/tstclnt/Makefile +++ b/security/nss/cmd/tstclnt/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -52,7 +63,7 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk +include $(srcdir)/../platlibs.mk ifeq ($(OS_ARCH), WINNT) ifndef BUILD_OPT @@ -66,17 +77,17 @@ endif # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### -#include ../platlibs.mk + ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -include ../platrules.mk +include $(srcdir)/../platrules.mk diff --git a/security/nss/cmd/tstclnt/manifest.mn b/security/nss/cmd/tstclnt/manifest.mn index 00378736a..ea44b06bb 100644 --- a/security/nss/cmd/tstclnt/manifest.mn +++ b/security/nss/cmd/tstclnt/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # MODULE public and private header directories are implicitly REQUIRED. MODULE = security diff --git a/security/nss/cmd/ttformat/Makefile b/security/nss/cmd/ttformat/Makefile index f2a407990..96daf95e6 100644 --- a/security/nss/cmd/ttformat/Makefile +++ b/security/nss/cmd/ttformat/Makefile @@ -42,7 +42,7 @@ include manifest.mn # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -57,7 +57,7 @@ include ../platlibs.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # diff --git a/security/nss/cmd/ttformat/manifest.mn b/security/nss/cmd/ttformat/manifest.mn index d743cfb1c..696901486 100644 --- a/security/nss/cmd/ttformat/manifest.mn +++ b/security/nss/cmd/ttformat/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DEFINES += -DNSPR20 diff --git a/security/nss/cmd/zlib/.cvsignore b/security/nss/cmd/zlib/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/cmd/zlib/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/zlib/Makefile b/security/nss/cmd/zlib/Makefile deleted file mode 100644 index fa46e6763..000000000 --- a/security/nss/cmd/zlib/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include config.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - - diff --git a/security/nss/cmd/zlib/Makefile.in b/security/nss/cmd/zlib/Makefile.in new file mode 100644 index 000000000..3e1448f91 --- /dev/null +++ b/security/nss/cmd/zlib/Makefile.in @@ -0,0 +1,86 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + + + diff --git a/security/nss/cmd/zlib/manifest.mn b/security/nss/cmd/zlib/manifest.mn index 6b4fbd4ec..b5b860cff 100644 --- a/security/nss/cmd/zlib/manifest.mn +++ b/security/nss/cmd/zlib/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = seccmd diff --git a/security/nss/configure b/security/nss/configure new file mode 100755 index 000000000..263eb7317 --- /dev/null +++ b/security/nss/configure @@ -0,0 +1,3331 @@ +#! /bin/sh + +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.13 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +# Defaults: +ac_help= +ac_default_prefix=/usr/local +# Any additions from configure.in: +ac_help="$ac_help + --with-dist-prefix=DIST_PREFIX + place build files in DIST_PREFIX [dist]" +ac_help="$ac_help + --with-dist-bindir=DIR build execuatables in DIR [DIST_PREFIX/bin]" +ac_help="$ac_help + --with-dist-includedir=DIR + build include files in DIR [DIST_PREFIX/include]" +ac_help="$ac_help + --with-dist-libdir=DIR build library files in DIR [DIST_PREFIX/lib]" +ac_help="$ac_help + --with-dbm-prefix=DIR Prefix where dbm is installed" +ac_help="$ac_help + --with-dbm-includedir Location of dbm headers" +ac_help="$ac_help + --with-dbm-libdir Location of dbm libs" +ac_help="$ac_help + --with-mozilla Compile for Mozilla tree" +ac_help="$ac_help + --enable-optimize Enable code optimizations" +ac_help="$ac_help + --disable-debug Do not compile in debugging symbols" +ac_help="$ac_help + --disable-cmd Don't build command-line tools" +ac_help="$ac_help + --with-nspr-prefix=PFX Prefix where NSPR is installed" +ac_help="$ac_help + --with-nspr-exec-prefix=PFX + Exec prefix where NSPR is installed" +ac_help="$ac_help + --disable-md Do not use compiler-based dependencies " + +# Initialize some variables set by options. +# The variables have the same names as the options, with +# dashes changed to underlines. +build=NONE +cache_file=./config.cache +exec_prefix=NONE +host=NONE +no_create= +nonopt=NONE +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +target=NONE +verbose= +x_includes=NONE +x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' + +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 + +ac_prev= +for ac_option +do + + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case "$ac_option" in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build="$ac_optarg" ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file="$ac_optarg" ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + + -disable-* | --disable-*) + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; + + -enable-* | --enable-*) + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "enable_${ac_feature}='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix="$ac_optarg" ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; + + -host | --host | --hos | --ho) + ac_prev=host ;; + -host=* | --host=* | --hos=* | --ho=*) + host="$ac_optarg" ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix="$ac_optarg" ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix="$ac_optarg" ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix="$ac_optarg" ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name="$ac_optarg" ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site="$ac_optarg" ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir="$ac_optarg" ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target="$ac_optarg" ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.13" + exit 0 ;; + + -with-* | --with-*) + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "with_${ac_package}='$ac_optarg'" ;; + + -without-* | --without-*) + ac_package=`echo $ac_option|sed -e 's/-*without-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes="$ac_optarg" ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries="$ac_optarg" ;; + + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + ;; + + *) + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" + ;; + + esac +done + +if test -n "$ac_prev"; then + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +fi + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg +do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done + +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=../coreconf/rules.mk + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + else + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + fi +fi +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` + +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + echo "loading site script $ac_site_file" + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +fi + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +ac_exeext= +ac_objext=o +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi + + + +ac_aux_dir= +for ac_dir in ${srcdir}/build/autoconf $srcdir/${srcdir}/build/autoconf; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in ${srcdir}/build/autoconf $srcdir/${srcdir}/build/autoconf" 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + +# Do some error checking and defaulting for the host and target type. +# The inputs are: +# configure --host=HOST --target=TARGET --build=BUILD NONOPT +# +# The rules are: +# 1. You are not allowed to specify --host, --target, and nonopt at the +# same time. +# 2. Host defaults to nonopt. +# 3. If nonopt is not specified, then host defaults to the current host, +# as determined by config.guess. +# 4. Target and build default to nonopt. +# 5. If nonopt is not specified, then target and build default to host. + +# The aliases save the names the user supplied, while $host etc. +# will get canonicalized. +case $host---$target---$nonopt in +NONE---*---* | *---NONE---* | *---*---NONE) ;; +*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; +esac + + +# Make sure we can run config.sub. +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : +else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +fi + +echo $ac_n "checking host system type""... $ac_c" 1>&6 +echo "configure:604: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + +echo $ac_n "checking target system type""... $ac_c" 1>&6 +echo "configure:625: checking target system type" >&5 + +target_alias=$target +case "$target_alias" in +NONE) + case $nonopt in + NONE) target_alias=$host_alias ;; + *) target_alias=$nonopt ;; + esac ;; +esac + +target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` +target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$target" 1>&6 + +echo $ac_n "checking build system type""... $ac_c" 1>&6 +echo "configure:643: checking build system type" >&5 + +build_alias=$build +case "$build_alias" in +NONE) + case $nonopt in + NONE) build_alias=$host_alias ;; + *) build_alias=$nonopt ;; + esac ;; +esac + +build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` +build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$build" 1>&6 + +test "$host_alias" != "$target_alias" && + test "$program_prefix$program_suffix$program_transform_name" = \ + NONENONEs,x,x, && + program_prefix=${target_alias}- + + +CORECONF_SOURCE='$(topsrcdir)/../coreconf' + +cat >> confdefs.h <<\EOF +#define USE_AUTOCONF 1 +EOF + + +USE_PTHREADS= +ENABLE_CMD=1 +MOZILLA_CLIENT= +_OPTIMIZE_FLAGS=-O +_DEBUG_FLAGS=-g +MOZ_DEBUG=1 +MOZ_OPTIMIZE= + +CFLAGS="${CFLAGS=}" +LDFLAGS="${LDFLAGS=}" +HOST_CFLAGS="${HOST_CFLAGS=}" +HOST_LDFLAGS="${HOST_LDFLAGS=}" + +case "$target" in +*-cygwin*) + # Check to see if we are really running in a msvc environemnt + _WIN32_MSVC= + if test "$CC" = "cl" || test "$CXX" = "cl"; then + _WIN32_MSVC=1 + elif test -z "$CC"; then + echo 'main() { return 0; }' > dummy.c + cl -o dummy dummy.c + if test $? = 0; then + _WIN32_MSVC=1 + fi + rm -f dummy dummy.o dummy.obj dummy.exe dummy.c + fi + ;; +*-msvc*) + _WIN32_MSVC=1 + ;; +esac + +if test -n "$_WIN32_MSVC"; then + SKIP_PATH_CHECKS=1 + SKIP_COMPILER_CHECKS=1 + SKIP_LIBRARY_CHECKS=1 +fi + +dist_prefix='${MOD_DEPTH}/dist' +dist_bindir='${dist_prefix}/bin' +dist_includedir='${dist_prefix}/include' +dist_libdir='${dist_prefix}/lib' + +# Check whether --with-dist-prefix or --without-dist-prefix was given. +if test "${with_dist_prefix+set}" = set; then + withval="$with_dist_prefix" + dist_prefix=$withval +fi + + +# Check whether --with-dist-bindir or --without-dist-bindir was given. +if test "${with_dist_bindir+set}" = set; then + withval="$with_dist_bindir" + dist_bindir=$withval +fi + + +# Check whether --with-dist-includedir or --without-dist-includedir was given. +if test "${with_dist_includedir+set}" = set; then + withval="$with_dist_includedir" + dist_includedir=$withval +fi + + +# Check whether --with-dist-libdir or --without-dist-libdir was given. +if test "${with_dist_libdir+set}" = set; then + withval="$with_dist_libdir" + dist_libdir=$withval +fi + + + + + + + +# Check whether --with-dbm-prefix or --without-dbm-prefix was given. +if test "${with_dbm_prefix+set}" = set; then + withval="$with_dbm_prefix" + dbm_prefix=$withval +fi + + +# Check whether --with-dbm-includedir or --without-dbm-includedir was given. +if test "${with_dbm_includedir+set}" = set; then + withval="$with_dbm_includedir" + dbm_includedir=$withval +fi + + +# Check whether --with-dbm-libdir or --without-dbm-libdir was given. +if test "${with_dbm_libdir+set}" = set; then + withval="$with_dbm_libdir" + dbm_libdir=$withval +fi + + +if test "$dbm_prefix"; then + if test -z "$dbm_libdir"; then + dbm_libdir="$dbm_prefix/lib" + fi + if test -z "$dbm_includedir"; then + dbm_includedir="$dbm_prefix/include" + fi +fi + +if test "$dbm_libdir"; then + DBM_LIBS="$dbm_libdir/libdbm.a" +else + DBM_LIBS='$(DIST)/lib/libdbm.$(LIB_SUFFIX)' +fi + +if test "$dbm_includedir"; then + DBM_CFLAGS="-I$dbm_includedir" +fi + + + + +# Check whether --with-mozilla or --without-mozilla was given. +if test "${with_mozilla+set}" = set; then + withval="$with_mozilla" + if test "$withval" = "yes"; then + MOZILLA_CLIENT=1 + else + MOZILLA_CLIENT= + fi +fi + + +# Check whether --enable-optimize or --disable-optimize was given. +if test "${enable_optimize+set}" = set; then + enableval="$enable_optimize" + MOZ_OPTIMIZE=1 +fi + + +# Check whether --enable-debug or --disable-debug was given. +if test "${enable_debug+set}" = set; then + enableval="$enable_debug" + if test "$enableval" = "no"; then + MOZ_DEBUG= + fi +fi + + + + +# Check whether --enable-cmd or --disable-cmd was given. +if test "${enable_cmd+set}" = set; then + enableval="$enable_cmd" + if test "$enableval" = "no"; then + ENABLE_CMD= + fi +fi + + +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:835: 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 + case "$WHOAMI" in + /*) + ac_cv_path_WHOAMI="$WHOAMI" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_WHOAMI="$WHOAMI" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_WHOAMI="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_WHOAMI" && ac_cv_path_WHOAMI="echo not_whoami" + ;; +esac +fi +WHOAMI="$ac_cv_path_WHOAMI" +if test -n "$WHOAMI"; then + echo "$ac_t""$WHOAMI" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +elif test -z "$WHOAMI"; then + WHOAMI=whoami +fi + +if test -n "$MOZ_DEBUG"; then + cat >> confdefs.h <<\EOF +#define DEBUG 1 +EOF + + cat >> confdefs.h <<EOF +#define DEBUG_`$WHOAMI` 1 +EOF + + DEFINES="$DEFINES -UNDEBUG" +else + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + + DEFINES="$DEFINES -UDEBUG" +fi + +if test -z "$SKIP_COMPILER_CHECKS"; then + +if test "$target" != "$host"; then + echo "cross compiling from $host to $target" + cross_compiling=yes + + _SAVE_CC="$CC" + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + + echo $ac_n "checking for $host compiler""... $ac_c" 1>&6 +echo "configure:901: 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:908: 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 + if test -n "$HOST_CC"; then + ac_cv_prog_HOST_CC="$HOST_CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_HOST_CC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +HOST_CC="$ac_cv_prog_HOST_CC" +if test -n "$HOST_CC"; then + echo "$ac_t""$HOST_CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$HOST_CC" && break +done +test -n "$HOST_CC" || HOST_CC="""" + + if test -z "$HOST_CC"; then + { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + fi + echo "$ac_t""$HOST_CC" 1>&6 + if test -z "$HOST_CFLAGS"; then + HOST_CFLAGS="$CFLAGS" + fi + if test -z "$HOST_LDFLAGS"; then + HOST_LDFLAGS="$LDFLAGS" + fi + + CC="$HOST_CC" + CFLAGS="$HOST_CFLAGS" + LDFLAGS="$HOST_LDFLAGS" + + echo $ac_n "checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:955: checking whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 + cat > conftest.$ac_ext <<EOF +#line 957 "configure" +#include "confdefs.h" + +int main() { +return(0); +; return 0; } +EOF +if { (eval echo configure:964: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + { echo "configure: error: installation or configuration problem: $host compiler $HOST_CC cannot create executables." 1>&2; exit 1; } +fi +rm -f conftest* + + CC=$_SAVE_CC + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + + if test -z "$CC"; then + for ac_prog in "${target_alias}-gcc" "${target}-gcc" +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:985: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CC" && break +done +test -n "$CC" || CC=":" + + fi + unset ac_cv_prog_CC + # 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:1020: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +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:1050: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # 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:1101: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1133: 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. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 1144 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:1149: \"$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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +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:1175: 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:1180: 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 + cat > conftest.c <<EOF +#ifdef __GNUC__ + yes; +#endif +EOF +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1189: \"$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 +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +else + GCC= +fi + +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:1208: 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 + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi + + if test -z "$CXX"; then + for ac_prog in "${target_alias}-g++" "${target}-g++" +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:1245: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CXX="$ac_cv_prog_CXX" +if test -n "$CXX"; then + echo "$ac_t""$CXX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CXX" && break +done +test -n "$CXX" || CXX=":" + + fi + unset ac_cv_prog_CXX + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl +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:1282: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CXX="$ac_cv_prog_CXX" +if test -n "$CXX"; then + echo "$ac_t""$CXX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CXX" && break +done +test -n "$CXX" || CXX="gcc" + + +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1314: 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. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + +cat > conftest.$ac_ext << EOF + +#line 1325 "configure" +#include "confdefs.h" + +int main(){return(0);} +EOF +if { (eval echo configure:1330: \"$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 + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cxx_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 +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:1356: 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:1361: 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 + cat > conftest.C <<EOF +#ifdef __GNUC__ + yes; +#endif +EOF +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1370: \"$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 +fi +fi + +echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +if test $ac_cv_prog_gxx = yes; then + GXX=yes +else + GXX= +fi + +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:1389: 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 + echo 'void f(){}' > conftest.cc +if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes +else + ac_cv_prog_cxx_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi + + if test -z "$RANLIB"; then + for ac_prog in "${target_alias}-ranlib" "${target}-ranlib" +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:1426: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$RANLIB" && break +done +test -n "$RANLIB" || RANLIB=":" + + fi + if test -z "$AR"; then + for ac_prog in "${target_alias}-ar" "${target}-ar" +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:1463: 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 + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$AR" && break +done +test -n "$AR" || AR=":" + + fi + if test -z "$AS"; then + for ac_prog in "${target_alias}-as" "${target}-as" +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:1500: 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 + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AS="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AS="$ac_cv_prog_AS" +if test -n "$AS"; then + echo "$ac_t""$AS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$AS" && break +done +test -n "$AS" || AS=":" + + fi + if test -z "$LD"; then + for ac_prog in "${target_alias}-ld" "${target}-ld" +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:1537: 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 + if test -n "$LD"; then + ac_cv_prog_LD="$LD" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_LD="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +LD="$ac_cv_prog_LD" +if test -n "$LD"; then + echo "$ac_t""$LD" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$LD" && break +done +test -n "$LD" || LD=":" + + fi + +else + # 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:1573: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +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:1603: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # 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:1654: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1686: 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. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 1697 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:1702: \"$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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +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:1728: 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:1733: 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 + cat > conftest.c <<EOF +#ifdef __GNUC__ + yes; +#endif +EOF +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1742: \"$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 +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +else + GCC= +fi + +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:1761: 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 + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi + + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl +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:1797: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CXX="$ac_cv_prog_CXX" +if test -n "$CXX"; then + echo "$ac_t""$CXX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CXX" && break +done +test -n "$CXX" || CXX="gcc" + + +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1829: 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. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + +cat > conftest.$ac_ext << EOF + +#line 1840 "configure" +#include "confdefs.h" + +int main(){return(0);} +EOF +if { (eval echo configure:1845: \"$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 + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cxx_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 +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:1871: 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:1876: 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 + cat > conftest.C <<EOF +#ifdef __GNUC__ + yes; +#endif +EOF +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1885: \"$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 +fi +fi + +echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +if test $ac_cv_prog_gxx = yes; then + GXX=yes +else + GXX= +fi + +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:1904: 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 + echo 'void f(){}' > conftest.cc +if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes +else + ac_cv_prog_cxx_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +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:1938: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + for ac_prog in as +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:1970: 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 + case "$AS" in + /*) + ac_cv_path_AS="$AS" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_AS="$AS" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_AS="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +AS="$ac_cv_path_AS" +if test -n "$AS"; then + echo "$ac_t""$AS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$AS" && break +done +test -n "$AS" || AS="$CC" + + for ac_prog in ar +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:2011: 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 + case "$AR" in + /*) + ac_cv_path_AR="$AR" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_AR="$AR" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_AR="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +AR="$ac_cv_path_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$AR" && break +done +test -n "$AR" || AR=":" + + for ac_prog in ld +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:2052: 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 + case "$LD" in + /*) + ac_cv_path_LD="$LD" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_LD="$LD" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_LD="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +LD="$ac_cv_path_LD" +if test -n "$LD"; then + echo "$ac_t""$LD" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$LD" && break +done +test -n "$LD" || LD=":" + + if test -z "$HOST_CC"; then + HOST_CC="$CC" + fi + if test -z "$HOST_CFLAGS"; then + HOST_CFLAGS="$CFLAGS" + fi +fi + +GNU_CC= +GNU_CXX= + +if test "$GCC" = "yes"; then + GNU_CC=1 +fi +if test "`echo | $AS -V 2>&1 | grep -c GNU`" != "0"; then + GNU_AS=1 +fi +rm -f a.out + +if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 +else + CROSS_COMPILE= +fi + +fi # SKIP_COMPILER_CHECKS + +if test -z "$SKIP_PATH_CHECKS"; then + +for ac_prog in gawk mawk nawk awk +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:2122: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AWK="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AWK="$ac_cv_prog_AWK" +if test -n "$AWK"; then + echo "$ac_t""$AWK" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$AWK" && break +done + +for ac_prog in gmake make +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 +if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$MAKE" in + /*) + ac_cv_path_MAKE="$MAKE" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_MAKE="$MAKE" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_MAKE="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +MAKE="$ac_cv_path_MAKE" +if test -n "$MAKE"; then + echo "$ac_t""$MAKE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MAKE" && break +done +test -n "$MAKE" || MAKE=":" + +_make_try=`$MAKE --version 2>/dev/null` +if test ! "$_make_try" +then + echo + echo "*** $MAKE is not GNU Make. You will not be able to build NSS without GNU Make." + echo + exit 1 +fi +_make_vers=`$MAKE --version | grep Make | $AWK '{ print \$4 }' | sed 's/,//' 2>/dev/null` +if test "$_make_vers" = "3.77" +then + echo + echo "*** Found GNU Make 3.77. This version is known to have problems with the" + echo "*** wildcard function in certain circumstances. You may experience infinite" + echo "*** looping while building NSS with 3.77. If this happens, you can" + echo "*** either downgrade to 3.76.1 or try configuring with --disable-md." + echo +fi + +echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +echo "configure:2212: checking whether ${MAKE-make} sets \${MAKE}" >&5 +set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftestmake <<\EOF +all: + @echo 'ac_maketemp="${MAKE}"' +EOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` +if test -n "$ac_maketemp"; then + eval ac_cv_prog_make_${ac_make}_set=yes +else + eval ac_cv_prog_make_${ac_make}_set=no +fi +rm -f conftestmake +fi +if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then + echo "$ac_t""yes" 1>&6 + SET_MAKE= +else + echo "$ac_t""no" 1>&6 + SET_MAKE="MAKE=${MAKE-make}" +fi + +for ac_prog in perl5 perl +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:2243: 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 + case "$PERL" in + /*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PERL="$PERL" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PERL="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +PERL="$ac_cv_path_PERL" +if test -n "$PERL"; then + echo "$ac_t""$PERL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$PERL" && break +done +test -n "$PERL" || PERL=":" + +if test -z "$PERL" || test "$PERL" = ":"; then + { echo "configure: error: perl not found in \$PATH" 1>&2; exit 1; } +fi + +# Extract the first word of "xargs", so it can be a program name with args. +set dummy xargs; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2286: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$XARGS" in + /*) + ac_cv_path_XARGS="$XARGS" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_XARGS="$XARGS" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_XARGS="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +XARGS="$ac_cv_path_XARGS" +if test -n "$XARGS"; then + echo "$ac_t""$XARGS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + +fi # SKIP_PATH_CHECKS + +OBJ_SUFFIX=o +LIB_SUFFIX=a +DLL_SUFFIX=so +MKSHLIB='$(CC) -shared -Wl,-soname -Wl,$(notdir $@)' +AR_FLAGS='cr $@' +AS='$(CC)' + +OS_TARGET=`uname -s` +OS_ARCH=`uname -s | sed -e 's|/|_|g'` +#OS_RELEASE=`uname -r | awk -F\. '{ print $1 "." $2 }'` +OS_TEST=`uname -m` + + +# Attempt to differentiate between sparc and x86 Solaris + +if test "${OS_TEST}" = "i86pc"; then + OS_RELEASE=`uname -r`"_${OS_TEST}" +else + OS_RELEASE=`uname -r` +fi + +# Force the IRIX64 machines to use IRIX. + +if test "${OS_ARCH}" = "IRIX64"; then + OS_ARCH=IRIX +fi + +# Force the older BSD/OS versions to use the new arch name. + +if test "${OS_ARCH}" = "BSD_386"; then + OS_ARCH=BSD_OS +fi + +# Catch Deterim if SVR4 is NCR or UNIXWARE + +if test "${OS_ARCH}" = "UNIX_SV"; then + _TEST=`grep NCR /etc/bcheckrc | head -1 2>/dev/null` + if echo "$_TEST" | grep -c NCR 2>/dev/null; then + OS_ARCH=NCR + else + OS_ARCH=UNIXWARE + fi + OS_RELEASE=`uname -v` +fi + +if test "${OS_ARCH}" = "UNIX_System_V"; then + OS_ARCH=NEC +fi + +if test "${OS_ARCH}" = "AIX"; then + OS_RELEASE=`uname -v`.`uname -r` +fi + +# Distinguish between OSF1 V4.0B and V4.0D +if test "${OS_ARCH}${OS_RELEASE}" = "OSF1V4.0"; then + OS_VERSION=`uname -r` + if test "${OS_VERSION}" = "564"; then + OS_RELEASE="V4.0B" + fi + if test "${OS_VERSION}" = "878"; then + OS_RELEASE="V4.0D" + fi +fi + +# SINIX changes name to ReliantUNIX with 5.43 +if test "${OS_ARCH}" = "ReliantUNIX-N"; then + OS_ARCH=ReliantUNIX + OS_RELEASE=5.4 +fi + +if test "${OS_ARCH}" = "SINIX-N"; then + OS_ARCH=ReliantUNIX + OS_RELEASE=5.4 +fi + +# Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3 +if echo ${OS_ARCH} | egrep -c '(Linux|FreeBSD)' >/dev/null; then + OS_RELEASE=`echo ${OS_RELEASE} | sed 's|-.*||'` +fi + +if test "${OS_ARCH}" = "Linux"; then + OS_RELEASE=`basename ${OS_RELEASE}` +fi + +# For OS/2 +if test "${OS_ARCH}" = "OS_2"; then + OS_ARCH=OS2 + OS_RELEASE=`uname -v` +fi + +if echo ${OS_ARCH} | grep -c OpenVMS >/dev/null; then + OS_ARCH=OpenVMS + OS_RELEASE=`uname -v` +fi + +####################################################################### +# Master "Core Components" macros for getting the OS target # +####################################################################### + +# +# Note: OS_TARGET should be specified on the command line for gmake. +# When OS_TARGET=WIN95 is specified, then a Windows 95 target is built. +# The difference between the Win95 target and the WinNT target is that +# the WinNT target uses Windows NT specific features not available +# in Windows 95. The Win95 target will run on Windows NT, but (supposedly) +# at lesser performance (the Win95 target uses threads; the WinNT target +# uses fibers). +# +# If OS_TARGET is not specified, it defaults to $(OS_ARCH), i.e., no +# cross-compilation. +# + +# +# The following hack allows one to build on a WIN95 machine (as if +# s/he were cross-compiling on a WINNT host for a WIN95 target). +# It also accomodates for MKS's uname.exe. If you never intend +# to do development on a WIN95 machine, you don't need this. It doesn't +# work any more anyway. +# +if test "${OS_ARCH}" = "WIN95"; then + OS_ARCH=WINNT + OS_TARGET=WIN95 +fi + +if test "${OS_ARCH}" = "Windows_95"; then + OS_ARCH=Windows_NT + OS_TARGET=WIN95 +fi + +# +# On WIN32, we also define the variable CPU_ARCH. +# + +if test "${OS_ARCH}" = "WINNT"; then + CPU_ARCH=`uname -p` + if test "${CPU_ARCH}" = "I386"; then + CPU_ARCH=x386 + fi +elif test "${OS_ARCH}" = "Windows_NT"; then +# +# If uname -s returns "Windows_NT", we assume that we are using +# the uname.exe in MKS toolkit. +# +# The -r option of MKS uname only returns the major version number. +# So we need to use its -v option to get the minor version number. +# Moreover, it doesn't have the -p option, so we need to use uname -m. +# + OS_ARCH=WINNT + OS_MINOR_RELEASE=`uname -v` + if test "${OS_MINOR_RELEASE}" = "00"; then + OS_MINOR_RELEASE=0 + fi + OS_RELEASE="${OS_RELEASE}.${OS_MINOR_RELEASE}" + CPU_ARCH=`uname -m` + # + # MKS's uname -m returns "586" on a Pentium machine. + # + if echo "${CPU_ARCH}" | grep -c 86 2>/dev/null; then + CPU_ARCH=x386 + fi +elif echo "$OS_ARCH" | grep -c CYGWIN_NT >/dev/null; then +# +# If uname -s returns "CYGWIN_NT-4.0", we assume that we are using +# the uname.exe in the Cygwin tools. +# + OS_RELEASE=`echo $OS_ARCH | sed 's|^CYGWIN_NT-||'` + OS_ARCH=WINNT + CPU_ARCH=`uname -m` + # + # Cygwin's uname -m returns "i686" on a Pentium Pro machine. + # + if echo "$CPU_ARCH" | grep -c 86 >/dev/null; then + CPU_ARCH=x386 + fi +elif test "$OS_ARCH" = "CYGWIN32_NT"; then +# +# Prior to the Beta 20 release, Cygwin was called GNU-Win32. +# If uname -s returns "CYGWIN32/NT", we assume that we are using +# the uname.exe in the GNU-Win32 tools. +# + OS_ARCH=WINNT + CPU_ARCH=`uname -m` + # + # GNU-Win32's uname -m returns "i686" on a Pentium Pro machine. + # + if echo "$CPU_ARCH" | grep -c 86 >/dev/null; then + CPU_ARCH=x386 + fi +fi + +if test -n "$MOZILLA_CLIENT" && test "$OS_ARCH" = "WINNT"; then + OS_TARGET=WIN95 + if test -n "$MOZ_DEBUG"; then + USE_DEBUG_RTL=1 + fi +fi + +if test -z "${OS_TARGET}"; then + OS_TARGET=$OS_ARCH +fi + +if test "${OS_TARGET}" = "WIN95"; then + OS_RELEASE=4.0 +fi + + +HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" +HOST_CXXFLAGS="$HOST_CXXFLAGS -DXP_UNIX" + +case "$target" in + +*-cygwin*|*-msvc*) + cat >> confdefs.h <<\EOF +#define XP_PC 1 +EOF + + cat >> confdefs.h <<\EOF +#define WIN32 1 +EOF + + cat >> confdefs.h <<\EOF +#define _WINDOWS 1 +EOF + + + if test -n "$MOZILLA_CLIENT"; then + CFLAGS="$CFLAGS -I\$(SOURCE_XP_DIR)/include" + fi + + AWK=awk + PERL=perl + XARGS=xargs + NSPR_CFLAGS='-I$(DIST)/include/nspr' + + CC=cl + CCC=cl + LINK=link + AR='lib -NOLOGO -OUT:"$@"' + RANLIB=echo + BSDECHO=echo + AS=ml.exe + ASFLAGS='-Cp -Sn -Zi -coff $(INCLUDES)' + LIB_SUFFIX=lib + DLL_SUFFIX=dll + RC=rc.exe + DLLFLAGS='-OUT:"$@"' + + if test -n "$MOZ_DEBUG"; then + if test -n "$USE_DEBUG_RTL"; then + CFLAGS="$CFLAGS -MDd" + else + CFLAGS="$CFLAGS -MD" + fi + _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Od -Z7" + DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV" + LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" + else + CFLAGS="$CFLAGS -MD" + _OPTIMIZE_FLAGS=-O2 + fi + ;; + +*-linux*) + USE_PTHREADS=1 + cat >> confdefs.h <<\EOF +#define XP_UNIX 1 +EOF + + cat >> confdefs.h <<\EOF +#define LINUX 1 +EOF + + cat >> confdefs.h <<\EOF +#define linux 1 +EOF + + cat >> confdefs.h <<\EOF +#define _POSIX_SOURCE 1 +EOF + + cat >> confdefs.h <<\EOF +#define _BSD_SOURCE 1 +EOF + + cat >> confdefs.h <<\EOF +#define HAVE_STRERROR 1 +EOF + + cat >> confdefs.h <<\EOF +#define LINUX1_2 1 +EOF + + CFLAGS="$CFLAGS -ansi -Wall -pipe" + CXXFLAGS="$CXXFLAGS -ansi -Wall -pipe -fno-rtti -fno-exceptions" + DSO_CFLAGS=-fPIC + DSO_LDOPTS=-shared + _OPTIMIZE_FLAGS=-O2 + + if test -n "$USE_PTHREADS"; then + cat >> confdefs.h <<\EOF +#define _REENTRANT 1 +EOF + + OS_LIBS="-lpthread $OS_LIBS" + fi + + OS_LIBS="$OS_LIBS -ldl -lc" + + case "${target_cpu}" in + alpha) + cat >> confdefs.h <<\EOF +#define _ALPHA_ 1 +EOF + + cat >> confdefs.h <<\EOF +#define _XOPEN_SOURCE 1 +EOF + + CFLAGS="$CFLAGS -mieee" + CXXFLAGS="$CXXFLAGS -mieee" + CPU_ARCH=alpha + ;; + i?86) + cat >> confdefs.h <<\EOF +#define i386 1 +EOF + + cat >> confdefs.h <<\EOF +#define _XOPEN_SOURCE 1 +EOF + + CPU_ARCH=x86 + ;; + ppc) + cat >> confdefs.h <<\EOF +#define MACLINUX 1 +EOF + + CPU_ARCH=ppc + ;; + *) + ;; + esac + + case "$OS_RELEASE" in + 2.0) + cat >> confdefs.h <<\EOF +#define LINUX2_0 1 +EOF + + ;; + 2.1) + cat >> confdefs.h <<\EOF +#define LINUX2_1 1 +EOF + + ;; + 2.2) + cat >> confdefs.h <<\EOF +#define LINUX2_1 1 +EOF + + ;; + 2.4) + cat >> confdefs.h <<\EOF +#define LINUX2_1 1 +EOF + + ;; + esac + ;; + +*-solaris*) + USE_PTHREADS= + LOCAL_THREADS_ONLY=1 + cat >> confdefs.h <<\EOF +#define XP_UNIX 1 +EOF + + cat >> confdefs.h <<\EOF +#define SVR4 1 +EOF + + cat >> confdefs.h <<\EOF +#define SYSV 1 +EOF + + cat >> confdefs.h <<\EOF +#define __svr4 1 +EOF + + cat >> confdefs.h <<\EOF +#define __svr4__ 1 +EOF + + cat >> confdefs.h <<\EOF +#define SOLARIS 1 +EOF + + MKSHLIB='$(LD) $(DSO_LDOPTS)' + DSO_LDOPTS='-G -h $(notdir $@)' + if test -n "$GNU_CC"; then + DSO_CFLAGS=-fPIC + CFLAGS="$CFLAGS -Wall -Wno-format" + CXXFLAGS="$CXXFLAGS -Wall -Wno-format" + ASFLAGS="$ASFLAGS -x assembler-with-cpp" + else + DSO_CFLAGS=-KPIC + fi + if test -z "$GNU_AS"; then + ASFLAGS="$ASFLAGS -Wa,-P" + fi + if test -n "$MOZ_DEBUG"; then + CFLAGS="$CFLAGS -xs" + fi + if test -n "$USE_64"; then + if test -n "$GNU_CC"; then + ARCHFLAG=UNKNOWN + else + ARCHFLAG='-xarch=v9' + fi + LD=/usr/ccs/bin/ld + else + if test -n "$GNU_CC"; then + if test -n "$USE_HYBRID"; then + ARCHFLAG='-mcpu=v9 -Wa,-xarch=v8plus' + else + ARCHFLAG='-mcpu=v8' + fi + else + if test -n "$USE_HYBRID"; then + ARCHFLAG='-xarch=v8plus' + else + ARCHFLAG='-xarch=v8' + fi + fi + fi + case "${target_cpu}" in + sparc) + CPU_ARCH=sparc + ;; + esac + + case "${target_os}" in + solaris2.5*) + cat >> confdefs.h <<\EOF +#define SOLARIS2_5 1 +EOF + + ;; + solaris2.6*) + cat >> confdefs.h <<\EOF +#define _SVID_GETTOD 1 +EOF + + cat >> confdefs.h <<\EOF +#define SOLARIS2_6 1 +EOF + + ;; + solaris2.7*) + cat >> confdefs.h <<\EOF +#define _SVID_GETTOD 1 +EOF + + cat >> confdefs.h <<\EOF +#define SOLARIS2_7 1 +EOF + + ;; + solaris2.8*) + cat >> confdefs.h <<\EOF +#define _SVID_GETTOD 1 +EOF + + cat >> confdefs.h <<\EOF +#define SOLARIS2_8 1 +EOF + + ;; + *) + ;; + esac + + if test -z "$LOCAL_THREADS_ONLY"; then + cat >> confdefs.h <<\EOF +#define _REENTRANT 1 +EOF + + fi + + CFLAGS="$CFLAGS $ARCHFLAG -I/usr/dt/include -I/usr/openwin/include" + OS_LIBS="$OS_LIBS -lthread -lnsl -lsocket -lposix4 -ldl -lc" + ;; + +esac + + + + +if test -z "$SKIP_LIBRARY_CHECKS"; then + + + +# Check whether --with-nspr-prefix or --without-nspr-prefix was given. +if test "${with_nspr_prefix+set}" = set; then + withval="$with_nspr_prefix" + nspr_config_prefix="$withval" +else + nspr_config_prefix="" +fi + + +# Check whether --with-nspr-exec-prefix or --without-nspr-exec-prefix was given. +if test "${with_nspr_exec_prefix+set}" = set; then + withval="$with_nspr_exec_prefix" + nspr_config_exec_prefix="$withval" +else + nspr_config_exec_prefix="" +fi + + + if test -n "$nspr_config_exec_prefix"; then + nspr_config_args="$nspr_config_args --exec-prefix=$nspr_config_exec_prefix" + if test -z "$NSPR_CONFIG"; then + NSPR_CONFIG=$nspr_config_exec_prefix/bin/nspr-config + fi + fi + if test -n "$nspr_config_prefix"; then + nspr_config_args="$nspr_config_args --prefix=$nspr_config_prefix" + if test -z "$NSPR_CONFIG"; then + NSPR_CONFIG=$nspr_config_prefix/bin/nspr-config + fi + fi + + unset ac_cv_path_NSPR_CONFIG + # Extract the first word of "nspr-config", so it can be a program name with args. +set dummy nspr-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:2860: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$NSPR_CONFIG" in + /*) + ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NSPR_CONFIG="$NSPR_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_NSPR_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_NSPR_CONFIG" && ac_cv_path_NSPR_CONFIG="no" + ;; +esac +fi +NSPR_CONFIG="$ac_cv_path_NSPR_CONFIG" +if test -n "$NSPR_CONFIG"; then + echo "$ac_t""$NSPR_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + min_nspr_version=4.0.0 + echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 +echo "configure:2895: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 + + no_nspr="" + if test "$NSPR_CONFIG" = "no"; then + no_nspr="yes" + else + NSPR_CFLAGS=`$NSPR_CONFIG $nspr_config_args --cflags` + NSPR_LIBS=`$NSPR_CONFIG $nspr_config_args --libs` + + nspr_config_major_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + nspr_config_minor_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + nspr_config_micro_version=`$NSPR_CONFIG $nspr_config_args --version | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + fi + + if test -z "$no_nspr"; then + echo "$ac_t""yes" 1>&6 + MOZ_NATIVE_NSPR=1 + else + echo "$ac_t""no" 1>&6 + fi + + + + + + + +if test -z "$MOZ_NATIVE_NSPR"; then + echo "configure: warning: nspr-config not found. building local copy of NSPR" 1>&2 + NSPR_CFLAGS='`$(MOD_DEPTH)/../../nsprpub/config/nspr-config --prefix=$(DIST) --cflags`' + case "$target" in + *-*-os2_vacpp) + NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS'' + ;; + *) + NSPR_LIBS='`$(MOD_DEPTH)/../../nsprpub/config/nspr-config --prefix=$(DIST) --libs`' + ;; + esac +fi + +fi # SKIP_LIBRARY_CHECKS + + +_cpp_md_flag= +# Check whether --enable-md or --disable-md was given. +if test "${enable_md+set}" = set; then + enableval="$enable_md" + : +else + if test "$GNU_CC"; then + _cpp_md_flag=1 + fi +fi + +if test "$_cpp_md_flag"; then + COMPILER_DEPEND=1 + MDDEPDIR='.deps' + _DEPEND_CFLAGS='$(filter-out %/.pp,-Wp,-MD,$(MDDEPDIR)/$(*F).pp)' +fi + +if test -n "$MOZ_OPTIMIZE"; then + CFLAGS="$CFLAGS $_OPTIMIZE_FLAGS" +fi + +if test -n "$MOZ_DEBUG"; then + CFLAGS="$CFLAGS $_DEBUG_FLAGS" +fi + +CFLAGS=`echo \ + $_DEPEND_CFLAGS \ + $CFLAGS` + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +. ${srcdir}/secmakefiles.sh + +echo $MAKEFILES | $PERL $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh +. ./conftest.sh +rm conftest.sh + +echo $MAKEFILES | $PERL -e 'while (<STDIN>) { chomp; foreach $f (split(/\s+/)) { $f =~ s/:.*//; print "$f "; } } print "\n";' > unallmakefiles + +trap '' 1 2 15 +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs + + +# Without the "./", some shells look in PATH for config.status. +: ${CONFIG_STATUS=./config.status} + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS <<EOF +#! /bin/sh +# Generated automatically by configure. +# Run this file to recreate the current configuration. +# This directory was configured as follows, +# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +# +# $0 $ac_configure_args +# +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. + +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option +do + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.13" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; + esac +done + +ac_given_srcdir=$srcdir + +trap 'rm -fr `echo "$MAKEFILES" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS <<EOF + +# Protect against being on the right side of a sed subst in config.status. +sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; + s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@SHELL@%$SHELL%g +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@host@%$host%g +s%@host_alias@%$host_alias%g +s%@host_cpu@%$host_cpu%g +s%@host_vendor@%$host_vendor%g +s%@host_os@%$host_os%g +s%@target@%$target%g +s%@target_alias@%$target_alias%g +s%@target_cpu@%$target_cpu%g +s%@target_vendor@%$target_vendor%g +s%@target_os@%$target_os%g +s%@build@%$build%g +s%@build_alias@%$build_alias%g +s%@build_cpu@%$build_cpu%g +s%@build_vendor@%$build_vendor%g +s%@build_os@%$build_os%g +s%@dist_prefix@%$dist_prefix%g +s%@dist_bindir@%$dist_bindir%g +s%@dist_includedir@%$dist_includedir%g +s%@dist_libdir@%$dist_libdir%g +s%@DBM_LIBS@%$DBM_LIBS%g +s%@DBM_CFLAGS@%$DBM_CFLAGS%g +s%@WHOAMI@%$WHOAMI%g +s%@HOST_CC@%$HOST_CC%g +s%@CC@%$CC%g +s%@CXX@%$CXX%g +s%@RANLIB@%$RANLIB%g +s%@AR@%$AR%g +s%@AS@%$AS%g +s%@LD@%$LD%g +s%@AWK@%$AWK%g +s%@MAKE@%$MAKE%g +s%@SET_MAKE@%$SET_MAKE%g +s%@PERL@%$PERL%g +s%@XARGS@%$XARGS%g +s%@NSPR_CONFIG@%$NSPR_CONFIG%g +s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g +s%@NSPR_LIBS@%$NSPR_LIBS%g +s%@MOZILLA_CLIENT@%$MOZILLA_CLIENT%g +s%@ENABLE_CMD@%$ENABLE_CMD%g +s%@CORECONF_SOURCE@%$CORECONF_SOURCE%g +s%@HOST_CFLAGS@%$HOST_CFLAGS%g +s%@COMPILER_DEPEND@%$COMPILER_DEPEND%g +s%@MDDEPDIR@%$MDDEPDIR%g +s%@ASFLAGS@%$ASFLAGS%g +s%@DEFINES@%$DEFINES%g +s%@GNU_CC@%$GNU_CC%g +s%@GNU_CXX@%$GNU_CXX%g +s%@MKSHLIB@%$MKSHLIB%g +s%@DSO_CFLAGS@%$DSO_CFLAGS%g +s%@DSO_LDOPTS@%$DSO_LDOPTS%g +s%@AR_FLAGS@%$AR_FLAGS%g +s%@OS_LIBS@%$OS_LIBS%g +s%@RC@%$RC%g +s%@DLLFLAGS@%$DLLFLAGS%g +s%@WINDRES@%$WINDRES%g +s%@USE_PTHREADS@%$USE_PTHREADS%g +s%@OS_TARGET@%$OS_TARGET%g +s%@OS_ARCH@%$OS_ARCH%g +s%@OS_RELEASE@%$OS_RELEASE%g +s%@OS_TEST@%$OS_TEST%g +s%@CPU_ARCH@%$CPU_ARCH%g +s%@LIB_SUFFIX@%$LIB_SUFFIX%g +s%@DLL_SUFFIX@%$DLL_SUFFIX%g + +CEOF +EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + +cat >> $CONFIG_STATUS <<EOF + +CONFIG_FILES=\${CONFIG_FILES-"$MAKEFILES"} +EOF +cat >> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* + +EOF +cat >> $CONFIG_STATUS <<EOF + +EOF +cat >> $CONFIG_STATUS <<\EOF + +exit 0 +EOF +chmod +x $CONFIG_STATUS +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + diff --git a/security/nss/configure.in b/security/nss/configure.in new file mode 100644 index 000000000..f5ef1e6af --- /dev/null +++ b/security/nss/configure.in @@ -0,0 +1,892 @@ +dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; -*- +dnl The contents of this file are subject to the Mozilla Public +dnl License Version 1.1 (the "License"); you may not use this file +dnl except in compliance with the License. You may obtain a copy of +dnl the License at http://www.mozilla.org/MPL/ +dnl +dnl Software distributed under the License is distributed on an "AS +dnl IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +dnl implied. See the License for the specific language governing +dnl rights and limitations under the License. +dnl +dnl The Original Code is the configure.in script for NSS. +dnl +dnl The Initial Developer of the Original Code is Netscape +dnl Communications. Portions created by Netscape Communications are +dnl Copyright (C) 2000 Netscape Communications. All Rights Reserved. +dnl +dnl Contributor(s): +dnl Brian Ryner <bryner@netscape.com> +dnl Chris Seawood <cls@seawood.org> +dnl +dnl Process this file with autoconf to produce a configure script. +dnl +AC_PREREQ(2.12) +AC_INIT(../coreconf/rules.mk) + +AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) +AC_CANONICAL_SYSTEM + +CORECONF_SOURCE='$(topsrcdir)/../coreconf' + +dnl Set this define to make fixes w/o breaking anything else. +AC_DEFINE(USE_AUTOCONF) + +dnl ======================================================== +dnl = Defaults +dnl ======================================================== +USE_PTHREADS= +ENABLE_CMD=1 +MOZILLA_CLIENT= +_OPTIMIZE_FLAGS=-O +_DEBUG_FLAGS=-g +MOZ_DEBUG=1 +MOZ_OPTIMIZE= + +dnl ======================================================== +dnl = +dnl = Dont change the following lines. Doing so breaks: +dnl = +dnl = CFLAGS="-foo" ./configure +dnl = +dnl ======================================================== +CFLAGS="${CFLAGS=}" +LDFLAGS="${LDFLAGS=}" +HOST_CFLAGS="${HOST_CFLAGS=}" +HOST_LDFLAGS="${HOST_LDFLAGS=}" + +dnl ======================================================== +dnl = Target test that may affect rest of script +dnl ======================================================== +case "$target" in +*-cygwin*) + # Check to see if we are really running in a msvc environemnt + _WIN32_MSVC= + if test "$CC" = "cl" || test "$CXX" = "cl"; then + _WIN32_MSVC=1 + elif test -z "$CC"; then + echo 'main() { return 0; }' > dummy.c + cl -o dummy dummy.c + if test $? = 0; then + _WIN32_MSVC=1 + fi + rm -f dummy dummy.o dummy.obj dummy.exe dummy.c + fi + ;; +*-msvc*) + _WIN32_MSVC=1 + ;; +esac + +if test -n "$_WIN32_MSVC"; then + SKIP_PATH_CHECKS=1 + SKIP_COMPILER_CHECKS=1 + SKIP_LIBRARY_CHECKS=1 +fi + +dnl ======================================================== +dnl = +dnl = Check options that may affect the compiler +dnl = +dnl ======================================================== +dist_prefix='${MOD_DEPTH}/dist' +dist_bindir='${dist_prefix}/bin' +dist_includedir='${dist_prefix}/include' +dist_libdir='${dist_prefix}/lib' + +AC_ARG_WITH(dist-prefix, + [ --with-dist-prefix=DIST_PREFIX + place build files in DIST_PREFIX [dist]], + dist_prefix=$withval) + +AC_ARG_WITH(dist-bindir, + [ --with-dist-bindir=DIR build execuatables in DIR [DIST_PREFIX/bin]], + dist_bindir=$withval) + +AC_ARG_WITH(dist-includedir, + [ --with-dist-includedir=DIR + build include files in DIR [DIST_PREFIX/include]], + dist_includedir=$withval) + +AC_ARG_WITH(dist-libdir, + [ --with-dist-libdir=DIR build library files in DIR [DIST_PREFIX/lib]], + dist_libdir=$withval) + +AC_SUBST(dist_prefix) +AC_SUBST(dist_bindir) +AC_SUBST(dist_includedir) +AC_SUBST(dist_libdir) + +AC_ARG_WITH(dbm-prefix, + [ --with-dbm-prefix=DIR Prefix where dbm is installed], + dbm_prefix=$withval) + +AC_ARG_WITH(dbm-includedir, + [ --with-dbm-includedir Location of dbm headers], + dbm_includedir=$withval) + +AC_ARG_WITH(dbm-libdir, + [ --with-dbm-libdir Location of dbm libs], + dbm_libdir=$withval) + +if test "$dbm_prefix"; then + if test -z "$dbm_libdir"; then + dbm_libdir="$dbm_prefix/lib" + fi + if test -z "$dbm_includedir"; then + dbm_includedir="$dbm_prefix/include" + fi +fi + +if test "$dbm_libdir"; then + DBM_LIBS="$dbm_libdir/libdbm.a" +else + DBM_LIBS='$(DIST)/lib/libdbm.$(LIB_SUFFIX)' +fi + +if test "$dbm_includedir"; then + DBM_CFLAGS="-I$dbm_includedir" +fi + +AC_SUBST(DBM_LIBS) +AC_SUBST(DBM_CFLAGS) + +AC_ARG_WITH(mozilla, + [ --with-mozilla Compile for Mozilla tree], + [ if test "$withval" = "yes"; then + MOZILLA_CLIENT=1 + else + MOZILLA_CLIENT= + fi]) + +AC_ARG_ENABLE(optimize, + [ --enable-optimize Enable code optimizations], + MOZ_OPTIMIZE=1) + +AC_ARG_ENABLE(debug, + [ --disable-debug Do not compile in debugging symbols], + [ if test "$enableval" = "no"; then + MOZ_DEBUG= + fi]) + +dnl AC_ARG_ENABLE(shared, +dnl [ --disable-shared Do not compile into shared libraries]) + +dnl AC_ARG_ENABLE(target, +dnl [ --enable-target=\$t Turn on features for target \$t when build has multiple targets], +dnl MOZ_TARGET=`echo $enableval | tr a-z A-Z`, +dnl MOZ_TARGET=) + +AC_ARG_ENABLE(cmd, + [ --disable-cmd Don't build command-line tools], + [ if test "$enableval" = "no"; then + ENABLE_CMD= + fi]) + +if test -z "$SKIP_PATH_CHECKS"; then + AC_PATH_PROG(WHOAMI, $WHOAMI whoami, echo not_whoami) +elif test -z "$WHOAMI"; then + WHOAMI=whoami +fi + +if test -n "$MOZ_DEBUG"; then + AC_DEFINE(DEBUG) + AC_DEFINE_UNQUOTED(DEBUG_`$WHOAMI`) + DEFINES="$DEFINES -UNDEBUG" +else + AC_DEFINE(NDEBUG) + DEFINES="$DEFINES -UDEBUG" +fi + +if test -z "$SKIP_COMPILER_CHECKS"; then +dnl ======================================================== +dnl Checks for compilers. +dnl ======================================================== + +if test "$target" != "$host"; then + echo "cross compiling from $host to $target" + cross_compiling=yes + + _SAVE_CC="$CC" + _SAVE_CFLAGS="$CFLAGS" + _SAVE_LDFLAGS="$LDFLAGS" + + AC_MSG_CHECKING([for $host compiler]) + if test -z "$HOST_CC"; then + AC_CHECK_PROGS(HOST_CC, gcc cc /usr/ucb/cc, "") + if test -z "$HOST_CC"; then + AC_MSG_ERROR([no acceptable cc found in \$PATH]) + fi + fi + AC_MSG_RESULT([$HOST_CC]) + if test -z "$HOST_CFLAGS"; then + HOST_CFLAGS="$CFLAGS" + fi + if test -z "$HOST_LDFLAGS"; then + HOST_LDFLAGS="$LDFLAGS" + fi + + CC="$HOST_CC" + CFLAGS="$HOST_CFLAGS" + LDFLAGS="$HOST_LDFLAGS" + + AC_MSG_CHECKING([whether the $host compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works]) + AC_TRY_COMPILE([], [return(0);], + [ac_cv_prog_host_cc_works=1 AC_MSG_RESULT([yes])], + AC_MSG_ERROR([installation or configuration problem: $host compiler $HOST_CC cannot create executables.]) ) + + CC=$_SAVE_CC + CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + + if test -z "$CC"; then + AC_CHECK_PROGS(CC, "${target_alias}-gcc" "${target}-gcc", :) + fi + unset ac_cv_prog_CC + AC_PROG_CC + if test -z "$CXX"; then + AC_CHECK_PROGS(CXX, "${target_alias}-g++" "${target}-g++", :) + fi + unset ac_cv_prog_CXX + AC_PROG_CXX + if test -z "$RANLIB"; then + AC_CHECK_PROGS(RANLIB, "${target_alias}-ranlib" "${target}-ranlib", :) + fi + if test -z "$AR"; then + AC_CHECK_PROGS(AR, "${target_alias}-ar" "${target}-ar", :) + fi + if test -z "$AS"; then + AC_CHECK_PROGS(AS, "${target_alias}-as" "${target}-as", :) + fi + if test -z "$LD"; then + AC_CHECK_PROGS(LD, "${target_alias}-ld" "${target}-ld", :) + fi +dnl if test -z "$STRIP"; then +dnl AC_CHECK_PROGS(STRIP, "${target_alias}-strip" "${target}-strip", :) +dnl fi +dnl if test -z "$DLLTOOL"; then +dnl AC_CHECK_PROGS(DLLTOOL, "${target_alias}-dlltool" "${target}-dlltool", :) +dnl fi +dnl if test -z "$WINDRES"; then +dnl AC_CHECK_PROGS(WINDRES, "${target_alias}-windres" "${target}-windres", :) +dnl fi + +else + AC_PROG_CC + AC_PROG_CXX + AC_PROG_RANLIB + AC_PATH_PROGS(AS, as, $CC) + AC_PATH_PROGS(AR, ar, :) + AC_PATH_PROGS(LD, ld, :) +dnl AC_PATH_PROGS(STRIP, strip, :) +dnl AC_PATH_PROGS(DLLTOOL, dlltool, :) +dnl AC_PATH_PROGS(WINDRES, windres, :) + if test -z "$HOST_CC"; then + HOST_CC="$CC" + fi + if test -z "$HOST_CFLAGS"; then + HOST_CFLAGS="$CFLAGS" + fi +fi + +GNU_CC= +GNU_CXX= + +if test "$GCC" = "yes"; then + GNU_CC=1 +fi +if test "`echo | $AS -V 2>&1 | grep -c GNU`" != "0"; then + GNU_AS=1 +fi +rm -f a.out + +if test "$cross_compiling" = "yes"; then + CROSS_COMPILE=1 +else + CROSS_COMPILE= +fi + +fi # SKIP_COMPILER_CHECKS + +if test -z "$SKIP_PATH_CHECKS"; then +dnl ======================================================== +dnl Checks for programs. +dnl ======================================================== + +AC_PROG_AWK +dnl Be sure the make we use is GNU make. +AC_PATH_PROGS(MAKE, gmake make, :) +_make_try=`$MAKE --version 2>/dev/null` +if test ! "$_make_try" +then + echo + echo "*** $MAKE is not GNU Make. You will not be able to build NSS without GNU Make." + echo + exit 1 +fi +dnl Now warn about version 3.77 if we find it. +_make_vers=`$MAKE --version | grep Make | $AWK '{ print \$4 }' | sed 's/,//' 2>/dev/null` +if test "$_make_vers" = "3.77" +then + echo + echo "*** Found GNU Make 3.77. This version is known to have problems with the" + echo "*** wildcard function in certain circumstances. You may experience infinite" + echo "*** looping while building NSS with 3.77. If this happens, you can" + echo "*** either downgrade to 3.76.1 or try configuring with --disable-md." + echo +fi + +AC_PROG_MAKE_SET +AC_PATH_PROGS(PERL, perl5 perl, :) +if test -z "$PERL" || test "$PERL" = ":"; then + AC_MSG_ERROR([perl not found in \$PATH]) +fi + +AC_PATH_PROG(XARGS, xargs) + +fi # SKIP_PATH_CHECKS + +dnl ======================================================== +dnl Default platform specific options +dnl ======================================================== +OBJ_SUFFIX=o +LIB_SUFFIX=a +DLL_SUFFIX=so +MKSHLIB='$(CC) -shared -Wl,-soname -Wl,$(notdir $@)' +AR_FLAGS='cr $@' +AS='$(CC)' + +OS_TARGET=`uname -s` +OS_ARCH=`uname -s | sed -e 's|/|_|g'` +#OS_RELEASE=`uname -r | awk -F\. '{ print $1 "." $2 }'` +OS_TEST=`uname -m` + +dnl ======================================================== +dnl Architecture fixes +dnl ======================================================== + +# Attempt to differentiate between sparc and x86 Solaris + +if test "${OS_TEST}" = "i86pc"; then + OS_RELEASE=`uname -r`"_${OS_TEST}" +else + OS_RELEASE=`uname -r` +fi + +# Force the IRIX64 machines to use IRIX. + +if test "${OS_ARCH}" = "IRIX64"; then + OS_ARCH=IRIX +fi + +# Force the older BSD/OS versions to use the new arch name. + +if test "${OS_ARCH}" = "BSD_386"; then + OS_ARCH=BSD_OS +fi + +# Catch Deterim if SVR4 is NCR or UNIXWARE + +if test "${OS_ARCH}" = "UNIX_SV"; then + _TEST=`grep NCR /etc/bcheckrc | head -1 2>/dev/null` + if echo "$_TEST" | grep -c NCR 2>/dev/null; then + OS_ARCH=NCR + else + OS_ARCH=UNIXWARE + fi + OS_RELEASE=`uname -v` +fi + +if test "${OS_ARCH}" = "UNIX_System_V"; then + OS_ARCH=NEC +fi + +if test "${OS_ARCH}" = "AIX"; then + OS_RELEASE=`uname -v`.`uname -r` +fi + +# Distinguish between OSF1 V4.0B and V4.0D +if test "${OS_ARCH}${OS_RELEASE}" = "OSF1V4.0"; then + OS_VERSION=`uname -r` + if test "${OS_VERSION}" = "564"; then + OS_RELEASE="V4.0B" + fi + if test "${OS_VERSION}" = "878"; then + OS_RELEASE="V4.0D" + fi +fi + +# SINIX changes name to ReliantUNIX with 5.43 +if test "${OS_ARCH}" = "ReliantUNIX-N"; then + OS_ARCH=ReliantUNIX + OS_RELEASE=5.4 +fi + +if test "${OS_ARCH}" = "SINIX-N"; then + OS_ARCH=ReliantUNIX + OS_RELEASE=5.4 +fi + +# Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3 +if echo ${OS_ARCH} | egrep -c '(Linux|FreeBSD)' >/dev/null; then + OS_RELEASE=`echo ${OS_RELEASE} | sed 's|-.*||'` +fi + +if test "${OS_ARCH}" = "Linux"; then + OS_RELEASE=`basename ${OS_RELEASE}` +fi + +# For OS/2 +if test "${OS_ARCH}" = "OS_2"; then + OS_ARCH=OS2 + OS_RELEASE=`uname -v` +fi + +if echo ${OS_ARCH} | grep -c OpenVMS >/dev/null; then + OS_ARCH=OpenVMS + OS_RELEASE=`uname -v` +fi + +####################################################################### +# Master "Core Components" macros for getting the OS target # +####################################################################### + +# +# Note: OS_TARGET should be specified on the command line for gmake. +# When OS_TARGET=WIN95 is specified, then a Windows 95 target is built. +# The difference between the Win95 target and the WinNT target is that +# the WinNT target uses Windows NT specific features not available +# in Windows 95. The Win95 target will run on Windows NT, but (supposedly) +# at lesser performance (the Win95 target uses threads; the WinNT target +# uses fibers). +# +# If OS_TARGET is not specified, it defaults to $(OS_ARCH), i.e., no +# cross-compilation. +# + +# +# The following hack allows one to build on a WIN95 machine (as if +# s/he were cross-compiling on a WINNT host for a WIN95 target). +# It also accomodates for MKS's uname.exe. If you never intend +# to do development on a WIN95 machine, you don't need this. It doesn't +# work any more anyway. +# +if test "${OS_ARCH}" = "WIN95"; then + OS_ARCH=WINNT + OS_TARGET=WIN95 +fi + +if test "${OS_ARCH}" = "Windows_95"; then + OS_ARCH=Windows_NT + OS_TARGET=WIN95 +fi + +# +# On WIN32, we also define the variable CPU_ARCH. +# + +if test "${OS_ARCH}" = "WINNT"; then + CPU_ARCH=`uname -p` + if test "${CPU_ARCH}" = "I386"; then + CPU_ARCH=x386 + fi +elif test "${OS_ARCH}" = "Windows_NT"; then +# +# If uname -s returns "Windows_NT", we assume that we are using +# the uname.exe in MKS toolkit. +# +# The -r option of MKS uname only returns the major version number. +# So we need to use its -v option to get the minor version number. +# Moreover, it doesn't have the -p option, so we need to use uname -m. +# + OS_ARCH=WINNT + OS_MINOR_RELEASE=`uname -v` + if test "${OS_MINOR_RELEASE}" = "00"; then + OS_MINOR_RELEASE=0 + fi + OS_RELEASE="${OS_RELEASE}.${OS_MINOR_RELEASE}" + CPU_ARCH=`uname -m` + # + # MKS's uname -m returns "586" on a Pentium machine. + # + if echo "${CPU_ARCH}" | grep -c 86 2>/dev/null; then + CPU_ARCH=x386 + fi +elif echo "$OS_ARCH" | grep -c CYGWIN_NT >/dev/null; then +# +# If uname -s returns "CYGWIN_NT-4.0", we assume that we are using +# the uname.exe in the Cygwin tools. +# + OS_RELEASE=`echo $OS_ARCH | sed 's|^CYGWIN_NT-||'` + OS_ARCH=WINNT + CPU_ARCH=`uname -m` + # + # Cygwin's uname -m returns "i686" on a Pentium Pro machine. + # + if echo "$CPU_ARCH" | grep -c 86 >/dev/null; then + CPU_ARCH=x386 + fi +elif test "$OS_ARCH" = "CYGWIN32_NT"; then +# +# Prior to the Beta 20 release, Cygwin was called GNU-Win32. +# If uname -s returns "CYGWIN32/NT", we assume that we are using +# the uname.exe in the GNU-Win32 tools. +# + OS_ARCH=WINNT + CPU_ARCH=`uname -m` + # + # GNU-Win32's uname -m returns "i686" on a Pentium Pro machine. + # + if echo "$CPU_ARCH" | grep -c 86 >/dev/null; then + CPU_ARCH=x386 + fi +fi + +if test -n "$MOZILLA_CLIENT" && test "$OS_ARCH" = "WINNT"; then + OS_TARGET=WIN95 + if test -n "$MOZ_DEBUG"; then + USE_DEBUG_RTL=1 + fi +fi + +if test -z "${OS_TARGET}"; then + OS_TARGET=$OS_ARCH +fi + +if test "${OS_TARGET}" = "WIN95"; then + OS_RELEASE=4.0 +fi + +dnl ======================================================== +dnl Override of system specific host options +dnl ======================================================== + +HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" +HOST_CXXFLAGS="$HOST_CXXFLAGS -DXP_UNIX" + +dnl ======================================================== +dnl Override of system specific target options +dnl ======================================================== +case "$target" in + +*-cygwin*|*-msvc*) + AC_DEFINE(XP_PC) + AC_DEFINE(WIN32) + AC_DEFINE(_WINDOWS) + + if test -n "$MOZILLA_CLIENT"; then + CFLAGS="$CFLAGS -I\$(SOURCE_XP_DIR)/include" + fi + + AWK=awk + PERL=perl + XARGS=xargs + NSPR_CFLAGS='-I$(DIST)/include/nspr' + + CC=cl + CCC=cl + LINK=link + AR='lib -NOLOGO -OUT:"$@"' + RANLIB=echo + BSDECHO=echo + AS=ml.exe + ASFLAGS='-Cp -Sn -Zi -coff $(INCLUDES)' + LIB_SUFFIX=lib + DLL_SUFFIX=dll + RC=rc.exe + DLLFLAGS='-OUT:"$@"' + + if test -n "$MOZ_DEBUG"; then + if test -n "$USE_DEBUG_RTL"; then + CFLAGS="$CFLAGS -MDd" + else + CFLAGS="$CFLAGS -MD" + fi + _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Od -Z7" + DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV" + LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" + else + CFLAGS="$CFLAGS -MD" + _OPTIMIZE_FLAGS=-O2 + fi + ;; + +*-linux*) + USE_PTHREADS=1 + AC_DEFINE(XP_UNIX) + AC_DEFINE(LINUX) + AC_DEFINE(linux) + AC_DEFINE(_POSIX_SOURCE) + AC_DEFINE(_BSD_SOURCE) + AC_DEFINE(HAVE_STRERROR) + AC_DEFINE(LINUX1_2) + CFLAGS="$CFLAGS -ansi -Wall -pipe" + CXXFLAGS="$CXXFLAGS -ansi -Wall -pipe -fno-rtti -fno-exceptions" + DSO_CFLAGS=-fPIC + DSO_LDOPTS=-shared + _OPTIMIZE_FLAGS=-O2 + + if test -n "$USE_PTHREADS"; then + AC_DEFINE(_REENTRANT) + OS_LIBS="-lpthread $OS_LIBS" + fi + + OS_LIBS="$OS_LIBS -ldl -lc" + + case "${target_cpu}" in + alpha) + AC_DEFINE(_ALPHA_) + AC_DEFINE(_XOPEN_SOURCE) + CFLAGS="$CFLAGS -mieee" + CXXFLAGS="$CXXFLAGS -mieee" + CPU_ARCH=alpha + ;; + i?86) + AC_DEFINE(i386) + AC_DEFINE(_XOPEN_SOURCE) + CPU_ARCH=x86 + ;; + ppc) + AC_DEFINE(MACLINUX) + CPU_ARCH=ppc + ;; + *) + ;; + esac + + case "$OS_RELEASE" in + 2.0) + AC_DEFINE(LINUX2_0) + ;; + 2.1) + AC_DEFINE(LINUX2_1) + ;; + 2.2) + AC_DEFINE(LINUX2_1) + ;; + 2.4) + AC_DEFINE(LINUX2_1) + ;; + esac + ;; + +*-solaris*) + USE_PTHREADS= + LOCAL_THREADS_ONLY=1 + AC_DEFINE(XP_UNIX) + AC_DEFINE(SVR4) + AC_DEFINE(SYSV) + AC_DEFINE(__svr4) + AC_DEFINE(__svr4__) + AC_DEFINE(SOLARIS) + MKSHLIB='$(LD) $(DSO_LDOPTS)' + DSO_LDOPTS='-G -h $(notdir $@)' + if test -n "$GNU_CC"; then + DSO_CFLAGS=-fPIC + CFLAGS="$CFLAGS -Wall -Wno-format" + CXXFLAGS="$CXXFLAGS -Wall -Wno-format" + ASFLAGS="$ASFLAGS -x assembler-with-cpp" + else + DSO_CFLAGS=-KPIC + fi + if test -z "$GNU_AS"; then + ASFLAGS="$ASFLAGS -Wa,-P" + fi + if test -n "$MOZ_DEBUG"; then + CFLAGS="$CFLAGS -xs" + fi + if test -n "$USE_64"; then + if test -n "$GNU_CC"; then + ARCHFLAG=UNKNOWN + else + ARCHFLAG='-xarch=v9' + fi + LD=/usr/ccs/bin/ld + else + if test -n "$GNU_CC"; then + if test -n "$USE_HYBRID"; then + ARCHFLAG='-mcpu=v9 -Wa,-xarch=v8plus' + else + ARCHFLAG='-mcpu=v8' + fi + else + if test -n "$USE_HYBRID"; then + ARCHFLAG='-xarch=v8plus' + else + ARCHFLAG='-xarch=v8' + fi + fi + fi + case "${target_cpu}" in + sparc) + CPU_ARCH=sparc + ;; + esac + + case "${target_os}" in + solaris2.5*) + AC_DEFINE(SOLARIS2_5) + ;; + solaris2.6*) + AC_DEFINE(_SVID_GETTOD) + AC_DEFINE(SOLARIS2_6) + ;; + solaris2.7*) + AC_DEFINE(_SVID_GETTOD) + AC_DEFINE(SOLARIS2_7) + ;; + solaris2.8*) + AC_DEFINE(_SVID_GETTOD) + AC_DEFINE(SOLARIS2_8) + ;; + *) + ;; + esac + + if test -z "$LOCAL_THREADS_ONLY"; then + AC_DEFINE(_REENTRANT) + fi + + CFLAGS="$CFLAGS $ARCHFLAG -I/usr/dt/include -I/usr/openwin/include" + OS_LIBS="$OS_LIBS -lthread -lnsl -lsocket -lposix4 -ldl -lc" + ;; + +esac + +dnl ======================================================== +dnl Check for system libraries +dnl ======================================================== + +dnl ======================================================== +dnl Check for system header files. +dnl ======================================================== + +dnl ======================================================== +dnl Check for typedefs and structs +dnl ======================================================== + +if test -z "$SKIP_LIBRARY_CHECKS"; then +dnl ======================================================== +dnl Checks for library functions. +dnl ======================================================== + +dnl ======================================================== +dnl Check options +dnl ======================================================== +dnl ======================================================== +dnl = +dnl = If NSPR was not detected in the system, +dnl = use the one in the source tree (mozilla/nsprpub) +dnl = +dnl ======================================================== + +AM_PATH_NSPR(4.0.0, [MOZ_NATIVE_NSPR=1], [MOZ_NATIVE_NSPR=]) + +if test -z "$MOZ_NATIVE_NSPR"; then + AC_MSG_WARN(nspr-config not found. building local copy of NSPR) + NSPR_CFLAGS='`$(MOD_DEPTH)/../../nsprpub/config/nspr-config --prefix=$(DIST) --cflags`' + case "$target" in + *-*-os2_vacpp) + NSPR_LIBS='$(DIST)/lib/nspr'$NSPR_VERSION'.lib $(DIST)/lib/plc'$NSPR_VERSION'.lib $(DIST)/lib/plds'$NSPR_VERSION'.lib '$_PTHREAD_LDFLAGS'' + ;; + *) + NSPR_LIBS='`$(MOD_DEPTH)/../../nsprpub/config/nspr-config --prefix=$(DIST) --libs`' + ;; + esac +fi + +fi # SKIP_LIBRARY_CHECKS + + +_cpp_md_flag= +AC_ARG_ENABLE(md, +[ --disable-md Do not use compiler-based dependencies ],[], + [dnl Default is to turn on -MD if using GNU-compatible compilers + dnl XXX make this check GNU_CXX when that test is hooked up + if test "$GNU_CC"; then + _cpp_md_flag=1 + fi]) +if test "$_cpp_md_flag"; then + COMPILER_DEPEND=1 + MDDEPDIR='.deps' + _DEPEND_CFLAGS='$(filter-out %/.pp,-Wp,-MD,$(MDDEPDIR)/$(*F).pp)' +fi + +if test -n "$MOZ_OPTIMIZE"; then + CFLAGS="$CFLAGS $_OPTIMIZE_FLAGS" +fi + +if test -n "$MOZ_DEBUG"; then + CFLAGS="$CFLAGS $_DEBUG_FLAGS" +fi + +CFLAGS=`echo \ + $_DEPEND_CFLAGS \ + $CFLAGS` + +dnl ======================================================== +dnl Substitution of found variables. +dnl ======================================================== + +dnl Build options +AC_SUBST(MOZILLA_CLIENT) +AC_SUBST(ENABLE_CMD) +AC_SUBST(CORECONF_SOURCE) + +dnl Program locations +AC_SUBST(HOST_CC) +AC_SUBST(AS) +AC_SUBST(AR) +AC_SUBST(LD) + +dnl Compiler characteristics/flags +AC_SUBST(CFLAGS) +AC_SUBST(CXXFLAGS) +AC_SUBST(HOST_CFLAGS) +AC_SUBST(COMPILER_DEPEND) +AC_SUBST(MDDEPDIR) +AC_SUBST(ASFLAGS) +AC_SUBST(DEFINES) +AC_SUBST(DEFS) +AC_SUBST(GNU_CC) +AC_SUBST(GNU_CXX) + +dnl Linker characteristics/flags +AC_SUBST(LDFLAGS) +AC_SUBST(MKSHLIB) +AC_SUBST(DSO_CFLAGS) +AC_SUBST(DSO_LDOPTS) +AC_SUBST(AR_FLAGS) +AC_SUBST(OS_LIBS) +AC_SUBST(RC) +AC_SUBST(DLLFLAGS) +AC_SUBST(WINDRES) + +dnl Implementation options +AC_SUBST(USE_PTHREADS) + +dnl System characteristics +AC_SUBST(OS_TARGET) +AC_SUBST(OS_ARCH) +AC_SUBST(OS_RELEASE) +AC_SUBST(OS_TEST) +AC_SUBST(CPU_ARCH) +AC_SUBST(LIB_SUFFIX) +AC_SUBST(DLL_SUFFIX) +dnl AC_SUBST(OBJ_SUFFIX) + +dnl ======================================================== +dnl Generate output files. +dnl ======================================================== +. ${srcdir}/secmakefiles.sh + +echo $MAKEFILES | $PERL $srcdir/build/autoconf/acoutput-fast.pl > conftest.sh +. ./conftest.sh +rm conftest.sh + +dnl ======================================================== +dnl Remove :template files from MAKEFILES +dnl ======================================================== +echo $MAKEFILES | $PERL -e 'while (<STDIN>) { chomp; foreach $f (split(/\s+/)) { $f =~ s/:.*//; print "$f "; } } print "\n";' > unallmakefiles + +AC_OUTPUT($MAKEFILES) diff --git a/security/nss/gmakefile.win b/security/nss/gmakefile.win new file mode 100755 index 000000000..11eb3cc3b --- /dev/null +++ b/security/nss/gmakefile.win @@ -0,0 +1,90 @@ +#!gmake +# -*- Mode: Makefile -*- +# +# The contents of this file are subject to the Mozilla Public License +# Version 1.1 (the "MPL"); you may not use this file except in +# compliance with the MPL. You may obtain a copy of the MPL at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the MPL is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the MPL +# for the specific language governing rights and limitations under the +# NPL. +# +# The Initial Developer of this code under the MPL is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 2001 Netscape Communications Corporation. All Rights +# Reserved. +# + + +ifndef MOZ_SRC_FLIPPED +$(error MOZ_SRC_FLIPPED is not set) +endif + +ifndef MOZ_TOP +MOZ_TOP=mozilla +endif + +MOZ_DIST_FLIPPED = $(MOZ_SRC_FLIPPED)/mozilla/dist + +ifdef MOZ_DEBUG +MOZ_OBJDIR = WIN32_D.OBJ +else +MOZ_OBJDIR = WIN32_O.OBJ +endif + +# +# The Client's debug build uses MSVC's debug runtime library (/MDd). +# + +ifdef MOZ_DEBUG +ifndef MOZ_NO_DEBUG_RTL +USE_DEBUG_RTL=1 +endif +endif + +NSS_CONFIGURE := ../configure \ + --with-mozilla \ + --disable-cmd \ + --with-dist-prefix=$(MOZ_DIST_FLIPPED) \ + --with-dist-bindir=$(MOZ_DIST_FLIPPED)/$(MOZ_OBJDIR)/bin \ + --with-dist-libdir=$(MOZ_DIST_FLIPPED)/$(MOZ_OBJDIR)/lib + +ifeq (,$(MOZ_DEBUG)) +NSS_CONFIGURE := $(NSS_CONFIGURE) --enable-optimize --disable-debug +endif + +define MAKE_OBJDIR +if test ! -d $(@D) ; then rm -rf $(@D) ; nsinstall -D $(@D) ; fi +endef + + +all:: export libs install + +# Argh. nmake keeps the cwd from cmd to cmd and gmake does not +# Furthermore, shmsdos doesn't support '&&' so there's a chance the +# 'cd' could fail and configure would be run in the wrong dir +# +$(MOZ_OBJDIR)/config.status: configure configure.in + @$(MAKE_OBJDIR) + cd $(MOZ_OBJDIR)/ ; \ + sh $(NSS_CONFIGURE) + +export:: $(MOZ_OBJDIR)/config.status + gmake $(GMAKE_FLAGS) -C $(MOZ_OBJDIR)/lib $@ +libs:: $(MOZ_OBJDIR)/config.status + gmake $(GMAKE_FLAGS) -C $(MOZ_OBJDIR)/lib $@ +install:: $(MOZ_OBJDIR)/config.status + gmake $(GMAKE_FLAGS) -C $(MOZ_OBJDIR)/lib $@ +clean:: $(MOZ_OBJDIR)/config.status + gmake $(GMAKE_FLAGS) -C $(MOZ_OBJDIR)/lib $@ +clobber:: $(MOZ_OBJDIR)/config.status + gmake $(GMAKE_FLAGS) -C $(MOZ_OBJDIR)/lib $@ +clobber_all:: $(MOZ_OBJDIR)/config.status + gmake $(GMAKE_FLAGS) -C $(MOZ_OBJDIR)/lib $@ + +###export libs install clobber clobber_all clean:: +distclean: + rm -rf WIN32_D.OBJ WIN32_O.OBJ + diff --git a/security/nss/lib/.cvsignore b/security/nss/lib/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/Makefile b/security/nss/lib/Makefile deleted file mode 100644 index 92aa6ff63..000000000 --- a/security/nss/lib/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - - - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - -ifdef MOZILLA_SECURITY_BUILD -FILES=$(shell ls -d $(CORE_DEPTH)/../../ns/security/lib/crypto/*) - -export:: - if test -d $(CORE_DEPTH)/../../ns/security/lib/crypto; then \ - $(NSINSTALL) -D crypto; \ - for file in $(FILES) ; do \ - if test -f $$file; then \ - $(INSTALL) -m 444 $$file crypto; \ - fi; \ - done; \ - $(INSTALL) -m 444 freebl/sha_fast.c crypto; \ - $(INSTALL) -m 444 freebl/sha_fast.h crypto; \ - fi -endif diff --git a/security/dbm/include/Makefile b/security/nss/lib/Makefile.in index 51b7b62d7..401213f46 100644 --- a/security/dbm/include/Makefile +++ b/security/nss/lib/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = .. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -60,7 +71,7 @@ include $(CORE_DEPTH)/coreconf/config.mk # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -72,25 +83,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -CPORLN = ln -s -ifeq ($(OS_ARCH),WINNT) -CPORLN = cp -endif - -DBM_SRCS = $(EXPORTS) $(PRIVATE_EXPORTS) watcomfx.h - -ALL_TRASH += $(DBM_SRCS) - -$(DBM_SRCS) : % : $(CORE_DEPTH)/../dbm/include/% - -$(CPORLN) $< . - -export:: $(DBM_SRCS) - -libs:: $(DBM_SRCS) - -program:: $(DBM_SRCS) -private_export:: $(DBM_SRCS) -echo:: - echo "$(DBM_SRCS)" diff --git a/security/nss/lib/asn1/Makefile b/security/nss/lib/asn1/Makefile index 03e1fb4c6..258614602 100644 --- a/security/nss/lib/asn1/Makefile +++ b/security/nss/lib/asn1/Makefile @@ -34,5 +34,5 @@ MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" include manifest.mn include config.mk -include $(CORE_DEPTH)/coreconf/config.mk -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/rules.mk diff --git a/security/nss/lib/asn1/manifest.mn b/security/nss/lib/asn1/manifest.mn index 658266d8e..b07c8cd20 100644 --- a/security/nss/lib/asn1/manifest.mn +++ b/security/nss/lib/asn1/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. PRIVATE_EXPORTS = \ asn1t.h \ diff --git a/security/nss/lib/base/.cvsignore b/security/nss/lib/base/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/base/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/base/Makefile b/security/nss/lib/base/Makefile deleted file mode 100644 index 4cbbfed70..000000000 --- a/security/nss/lib/base/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# -MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" - -include manifest.mn -include $(CORE_DEPTH)/coreconf/config.mk -include config.mk -include $(CORE_DEPTH)/coreconf/rules.mk - -export:: private_export diff --git a/security/nss/lib/crmf/Makefile b/security/nss/lib/base/Makefile.in index a376529c7..bf7a0289b 100644 --- a/security/nss/lib/crmf/Makefile +++ b/security/nss/lib/base/Makefile.in @@ -30,20 +30,30 @@ # the GPL. If you do not delete the provisions above, a recipient # may use your version of this file under either the MPL or the # GPL. -# +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -55,13 +65,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -73,5 +83,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - export:: private_export diff --git a/security/nss/lib/base/manifest.mn b/security/nss/lib/base/manifest.mn index 89e64f938..2c551ac2d 100644 --- a/security/nss/lib/base/manifest.mn +++ b/security/nss/lib/base/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. PRIVATE_EXPORTS = \ baset.h \ diff --git a/security/nss/lib/certdb/.cvsignore b/security/nss/lib/certdb/.cvsignore index ec60123e5..f3c7a7c5d 100644 --- a/security/nss/lib/certdb/.cvsignore +++ b/security/nss/lib/certdb/.cvsignore @@ -1 +1 @@ -nscertinit.c +Makefile diff --git a/security/nss/lib/certdb/Makefile b/security/nss/lib/certdb/Makefile deleted file mode 100644 index 12eff17ab..000000000 --- a/security/nss/lib/certdb/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include config.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - -export:: private_export - diff --git a/security/nss/lib/fortcrypt/swfort/Makefile b/security/nss/lib/certdb/Makefile.in index 80b91c768..4143690e7 100644 --- a/security/nss/lib/fortcrypt/swfort/Makefile +++ b/security/nss/lib/certdb/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -54,13 +65,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -72,11 +83,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - -nslib.c:: swflib.c nsmap.h - rm -f nslib.c - cat nsmap.h swflib.c > nslib.c - export:: private_export - - diff --git a/security/nss/lib/certdb/cert.h b/security/nss/lib/certdb/cert.h index da12103f9..59b4031be 100644 --- a/security/nss/lib/certdb/cert.h +++ b/security/nss/lib/certdb/cert.h @@ -1076,6 +1076,14 @@ CERT_AddCertToListTail(CERTCertList *certs, CERTCertificate *cert); SECStatus CERT_AddCertToListHead(CERTCertList *certs, CERTCertificate *cert); +SECStatus +CERT_AddCertToListTailWithData(CERTCertList *certs, CERTCertificate *cert, + void *appData); + +SECStatus +CERT_AddCertToListHeadWithData(CERTCertList *certs, CERTCertificate *cert, + void *appData); + typedef PRBool (* CERTSortCallback)(CERTCertificate *certa, CERTCertificate *certb, void *arg); diff --git a/security/nss/lib/certdb/certdb.c b/security/nss/lib/certdb/certdb.c index e626581ac..3d35b9673 100644 --- a/security/nss/lib/certdb/certdb.c +++ b/security/nss/lib/certdb/certdb.c @@ -2019,8 +2019,10 @@ CERT_RemoveCertListNode(CERTCertListNode *node) return; } + SECStatus -CERT_AddCertToListTail(CERTCertList *certs, CERTCertificate *cert) +CERT_AddCertToListTailWithData(CERTCertList *certs, + CERTCertificate *cert, void *appData) { CERTCertListNode *node; @@ -2033,6 +2035,7 @@ CERT_AddCertToListTail(CERTCertList *certs, CERTCertificate *cert) PR_INSERT_BEFORE(&node->links, &certs->list); /* certs->count++; */ node->cert = cert; + node->appData = appData; return(SECSuccess); loser: @@ -2040,7 +2043,14 @@ loser: } SECStatus -CERT_AddCertToListHead(CERTCertList *certs, CERTCertificate *cert) +CERT_AddCertToListTail(CERTCertList *certs, CERTCertificate *cert) +{ + CERT_AddCertToListTailWithData(certs, cert, NULL); +} + +SECStatus +CERT_AddCertToListHeadWithData(CERTCertList *certs, + CERTCertificate *cert, void *appData) { CERTCertListNode *node; CERTCertListNode *head; @@ -2058,12 +2068,19 @@ CERT_AddCertToListHead(CERTCertList *certs, CERTCertificate *cert) PR_INSERT_BEFORE(&node->links, &head->links); /* certs->count++; */ node->cert = cert; + node->appData = appData; return(SECSuccess); loser: return(SECFailure); } +SECStatus +CERT_AddCertToListHead(CERTCertList *certs, CERTCertificate *cert) +{ + return CERT_AddCertToListHeadWithData(certs, cert, NULL); +} + /* * Sort callback function to determine if cert a is newer than cert b. * Not valid certs are considered older than valid certs. diff --git a/security/nss/lib/certdb/manifest.mn b/security/nss/lib/certdb/manifest.mn index 1cb6ff4b7..21e46a2b0 100644 --- a/security/nss/lib/certdb/manifest.mn +++ b/security/nss/lib/certdb/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ cert.h \ diff --git a/security/nss/lib/certdb/pcertdb.c b/security/nss/lib/certdb/pcertdb.c index 611a9b5c6..f4f6d3483 100644 --- a/security/nss/lib/certdb/pcertdb.c +++ b/security/nss/lib/certdb/pcertdb.c @@ -3988,8 +3988,6 @@ UpdateV5DB(CERTCertDBHandle *handle, DB *updatedb) (* updatedb->close)(updatedb); return(SECSuccess); - - return(rv); } static PRBool @@ -4720,7 +4718,7 @@ cert_parseNickname(char *nickname) for (cp=nickname; *cp && *cp != ':'; cp++); - if (*cp == ':') return cp++; + if (*cp == ':') return cp+1; return nickname; } diff --git a/security/nss/lib/certhigh/.cvsignore b/security/nss/lib/certhigh/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/certhigh/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/certhigh/Makefile b/security/nss/lib/certhigh/Makefile deleted file mode 100644 index 08b7137d5..000000000 --- a/security/nss/lib/certhigh/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - --include config.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - -export:: private_export - diff --git a/security/nss/lib/nss/Makefile b/security/nss/lib/certhigh/Makefile.in index 2eeeaef56..4143690e7 100644 --- a/security/nss/lib/nss/Makefile +++ b/security/nss/lib/certhigh/Makefile.in @@ -33,18 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/arch.mk - -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -55,14 +64,14 @@ include $(CORE_DEPTH)/coreconf/config.mk ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -75,4 +84,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### export:: private_export - diff --git a/security/nss/lib/certhigh/manifest.mn b/security/nss/lib/certhigh/manifest.mn index d7d0a2247..c7ca58d51 100644 --- a/security/nss/lib/certhigh/manifest.mn +++ b/security/nss/lib/certhigh/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ ocsp.h \ diff --git a/security/nss/lib/ckfw/.cvsignore b/security/nss/lib/ckfw/.cvsignore index 988228d5a..592067e13 100644 --- a/security/nss/lib/ckfw/.cvsignore +++ b/security/nss/lib/ckfw/.cvsignore @@ -2,3 +2,4 @@ nssckepv.h nssckg.h nssckft.h nssck.api +Makefile diff --git a/security/nss/lib/ckfw/Makefile b/security/nss/lib/ckfw/Makefile deleted file mode 100644 index 34b225db3..000000000 --- a/security/nss/lib/ckfw/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# -MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" - -include manifest.mn -include $(CORE_DEPTH)/coreconf/config.mk -include config.mk -include $(CORE_DEPTH)/coreconf/rules.mk - -# This'll need some help from a build person. - -nssckepv.h: ck.api ckapi.perl -nssckft.h: ck.api ckapi.perl -nssckg.h: ck.api ckapi.perl -nssck.api: ck.api ckapi.perl - perl ckapi.perl ck.api - -export:: private_export - diff --git a/security/nss/lib/ckfw/Makefile.in b/security/nss/lib/ckfw/Makefile.in new file mode 100644 index 000000000..d4426ca46 --- /dev/null +++ b/security/nss/lib/ckfw/Makefile.in @@ -0,0 +1,92 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +nssckepv.h: ck.api ckapi.perl +nssckft.h: ck.api ckapi.perl +nssckg.h: ck.api ckapi.perl +nssck.api: ck.api ckapi.perl + perl $(srcdir)/ckapi.perl $(srcdir)/ck.api + +export:: private_export diff --git a/security/nss/lib/ckfw/builtins/.cvsignore b/security/nss/lib/ckfw/builtins/.cvsignore index ccbbcce86..f3c7a7c5d 100644 --- a/security/nss/lib/ckfw/builtins/.cvsignore +++ b/security/nss/lib/ckfw/builtins/.cvsignore @@ -1 +1 @@ -certdata.c +Makefile diff --git a/security/nss/lib/ckfw/builtins/Makefile b/security/nss/lib/ckfw/builtins/Makefile deleted file mode 100644 index 3ab0e9dcf..000000000 --- a/security/nss/lib/ckfw/builtins/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# -MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" - -include manifest.mn -include $(CORE_DEPTH)/coreconf/config.mk -include config.mk -# can't do this in manifest.mn because OS_ARCH isn't defined there. -ifeq ($(OS_ARCH), WINNT) - -EXTRA_LIBS = \ - $(DIST)/lib/nssckfw.lib \ - $(DIST)/lib/nssb.lib \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ - $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ - wsock32.lib \ - winmm.lib \ - $(NULL) - -else - -ifeq ($(OS_ARCH), OS2) -PLC_STATIC_LIB = $(DIST)/lib/plc4.$(LIB_SUFFIX) -PLDS_STATIC_LIB = $(DIST)/lib/plds4.$(LIB_SUFFIX) -else -PLC_STATIC_LIB = $(DIST)/lib/libplc4.$(LIB_SUFFIX) -PLDS_STATIC_LIB = $(DIST)/lib/libplds4.$(LIB_SUFFIX) -endif - -EXTRA_LIBS += \ - $(DIST)/lib/libnssckfw.$(LIB_SUFFIX) \ - $(DIST)/lib/libnssb.$(LIB_SUFFIX) \ - $(PLC_STATIC_LIB) \ - $(PLDS_STATIC_LIB) \ - $(NULL) - -endif - - - -include $(CORE_DEPTH)/coreconf/rules.mk - -certdata.c: certdata.txt certdata.perl - perl certdata.perl < certdata.txt - -# This'll need some help from a build person. - - -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) -DSO_LDOPTS = -bM:SRE -bh:4 -bnoentry -EXTRA_DSO_LDOPTS = -lc -MKSHLIB = xlC $(DSO_LDOPTS) - -$(SHARED_LIBRARY): $(OBJS) - @$(MAKE_OBJDIR) - rm -f $@ - $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DSO_LDOPTS) - chmod +x $@ - -endif - -ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2) -LD += -G -endif - - diff --git a/security/nss/lib/ckfw/builtins/Makefile.in b/security/nss/lib/ckfw/builtins/Makefile.in new file mode 100644 index 000000000..c59c8b711 --- /dev/null +++ b/security/nss/lib/ckfw/builtins/Makefile.in @@ -0,0 +1,140 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +INCLUDES += -I$(srcdir) + +ifeq ($(OS_ARCH), WINNT) + +EXTRA_LIBS = \ + $(DIST)/lib/nssckfw.lib \ + $(DIST)/lib/nssb.lib \ + $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ + $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ + wsock32.lib \ + winmm.lib \ + $(NULL) + +else + +# OSF 1 linker is very agressive. It includes the entire archive, +# not just the .o's that we need from that archive. +# +ifneq ($(OS_ARCH), OSF1) + +EXTRA_LIBS += \ + $(DIST)/lib/libnssckfw.a \ + $(DIST)/lib/libnssb.a \ + $(NULL) + +EXTRA_SHARED_LIBS = $(NSPR_LIBS) + +endif +endif + + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +certdata.c: certdata.txt certdata.perl + perl $(srcdir)/certdata.perl < $(srcdir)/certdata.txt + +# This'll need some help from a build person. + + +ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) +DSO_LDOPTS = -bM:SRE -bh:4 -bnoentry +EXTRA_DSO_LDOPTS = -lc +MKSHLIB = xlC $(DSO_LDOPTS) + +$(SHARED_LIBRARY): $(OBJS) + rm -f $@ + $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DSO_LDOPTS) + chmod +x $@ + +endif + +ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2) +LD += -G +endif + +install:: + $(INSTALL) $(SHARED_LIBRARY) $(DIST)/bin diff --git a/security/nss/lib/ckfw/builtins/manifest.mn b/security/nss/lib/ckfw/builtins/manifest.mn index 43375f873..2520c5b23 100644 --- a/security/nss/lib/ckfw/builtins/manifest.mn +++ b/security/nss/lib/ckfw/builtins/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. MODULE = security diff --git a/security/nss/lib/ckfw/dbm/Makefile b/security/nss/lib/ckfw/dbm/Makefile index 03e1fb4c6..258614602 100644 --- a/security/nss/lib/ckfw/dbm/Makefile +++ b/security/nss/lib/ckfw/dbm/Makefile @@ -34,5 +34,5 @@ MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" include manifest.mn include config.mk -include $(CORE_DEPTH)/coreconf/config.mk -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/rules.mk diff --git a/security/nss/lib/ckfw/dbm/manifest.mn b/security/nss/lib/ckfw/dbm/manifest.mn index 193e46bef..97c288d11 100644 --- a/security/nss/lib/ckfw/dbm/manifest.mn +++ b/security/nss/lib/ckfw/dbm/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. MODULE = security diff --git a/security/nss/lib/ckfw/manifest.mn b/security/nss/lib/ckfw/manifest.mn index d228e12ab..3baa364a3 100644 --- a/security/nss/lib/ckfw/manifest.mn +++ b/security/nss/lib/ckfw/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. DIRS = builtins diff --git a/security/nss/lib/crmf/.cvsignore b/security/nss/lib/crmf/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/crmf/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/crmf/Makefile.in b/security/nss/lib/crmf/Makefile.in new file mode 100644 index 000000000..bf7a0289b --- /dev/null +++ b/security/nss/lib/crmf/Makefile.in @@ -0,0 +1,86 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +export:: private_export diff --git a/security/nss/lib/crmf/manifest.mn b/security/nss/lib/crmf/manifest.mn index 67e145d09..7fca37e20 100644 --- a/security/nss/lib/crmf/manifest.mn +++ b/security/nss/lib/crmf/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/lib/cryptohi/.cvsignore b/security/nss/lib/cryptohi/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/cryptohi/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/ssl/Makefile b/security/nss/lib/cryptohi/Makefile.in index fff62966e..4143690e7 100644 --- a/security/nss/lib/ssl/Makefile +++ b/security/nss/lib/cryptohi/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -54,24 +65,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk - -ifeq ($(OS_ARCH),WINNT) -CSRCS += win32err.c -DEFINES += -DIN_LIBSSL -else -ifeq ($(OS_ARCH),OS2) -CSRCS += os2_err.c -else -CSRCS += unix_err.c -endif -endif +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -84,4 +84,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk ####################################################################### export:: private_export - diff --git a/security/nss/lib/cryptohi/manifest.mn b/security/nss/lib/cryptohi/manifest.mn index a4a76a7df..e1c08368b 100644 --- a/security/nss/lib/cryptohi/manifest.mn +++ b/security/nss/lib/cryptohi/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/lib/fortcrypt/.cvsignore b/security/nss/lib/fortcrypt/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/fortcrypt/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/fortcrypt/Makefile b/security/nss/lib/fortcrypt/Makefile.in index 9c047fa7f..9f622e9b1 100644 --- a/security/nss/lib/fortcrypt/Makefile +++ b/security/nss/lib/fortcrypt/Makefile.in @@ -32,9 +32,38 @@ # GPL. # -include manifest.mn -include $(CORE_DEPTH)/coreconf/config.mk -include config.mk +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + CILIB = $(OBJDIR)/cilib.$(LIB_SUFFIX) ORIG_CILIB = libci/$(OS_CONFIG).$(LIB_SUFFIX) @@ -68,7 +97,7 @@ LIBCI_JAR = $(OBJDIR)/libfort.jar LIBCI_JAR_SRC = $(INST_JS) $(SHARED_LIBRARY) ifneq ($(OS_TARGET), WIN16) -TARGETS : $(LIBCI_JAR) +TARGETS : $(LIBCI_JAR) endif ifeq ($(OS_TARGET), WIN16) @@ -82,10 +111,9 @@ boot export install libs program release: all endif -$(SHARED_LIBRARY): $(CILIB) $(DIRS) +$(SHARED_LIBRARY): $(CILIB) $(CILIB): - @$(MAKE_OBJDIR) @if test -f $(ORIG_CILIB); then \ echo "Copying $(ORIG_CILIB) to $@"; \ cp $(ORIG_CILIB) $@; \ @@ -95,12 +123,11 @@ $(CILIB): fi @$(RANLIB) $@ -$(STUBLIB): $(OBJDIR)/maci$(OBJ_SUFFIX) - @$(MAKE_OBJDIR) +$(STUBLIB): maci$(OBJ_SUFFIX) ifeq ($(OS_ARCH), WINNT) $(MAKE) $(STUBDLL) else - $(AR) $< + $(AR) $(AR_FLAGS) $< endif cp $@ $(CILIB) @@ -127,10 +154,10 @@ $(OBJDIR)/replace: replace.c $(LIBCI_JAR): $(DIRS) $(LIBCI_JAR_SRC) @echo +++ building $@ from $(LIBCI_JAR_SRC) @rm -f $@ - zip -5qj $@ $(LIBCI_JAR_SRC) + zip -5qj $@ $(LIBCI_JAR_SRC) force: - (cd swfort ; $(MAKE)) + (cd swfort ; gmake) MD_FILES += $(LIBCI_JAR) @@ -145,7 +172,6 @@ EXTRA_DSO_LDOPTS = -lc MKSHLIB = svld $(DSO_LDOPTS) $(SHARED_LIBRARY): $(OBJS) - @$(MAKE_OBJDIR) rm -f $@ $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DSO_LDOPTS) chmod +x $@ @@ -153,13 +179,26 @@ endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2) LD += -G -endif +endif +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### ifneq ($(OS_TARGET), WIN16) -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk endif -export:: private_export +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +export:: private_export + +ALL_TRASH += maci$(OBJ_SUFFIX) diff --git a/security/nss/lib/fortcrypt/manifest.mn b/security/nss/lib/fortcrypt/manifest.mn index 6dc9019c4..0e0777a10 100644 --- a/security/nss/lib/fortcrypt/manifest.mn +++ b/security/nss/lib/fortcrypt/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security LIBRARY_NAME = fort diff --git a/security/nss/lib/fortcrypt/swfort/.cvsignore b/security/nss/lib/fortcrypt/swfort/.cvsignore index 46d9697ae..16bc9fdc9 100644 --- a/security/nss/lib/fortcrypt/swfort/.cvsignore +++ b/security/nss/lib/fortcrypt/swfort/.cvsignore @@ -1 +1,2 @@ nslib.c +Makefile diff --git a/security/nss/lib/fortcrypt/swfort/Makefile.in b/security/nss/lib/fortcrypt/swfort/Makefile.in new file mode 100644 index 000000000..5f9253e92 --- /dev/null +++ b/security/nss/lib/fortcrypt/swfort/Makefile.in @@ -0,0 +1,90 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +nslib.c:: $(srcdir)/swflib.c $(srcdir)/nsmap.h + rm -f nslib.c + cat $(srcdir)/nsmap.h $(srcdir)/swflib.c > nslib.c + +export:: private_export diff --git a/security/nss/lib/fortcrypt/swfort/manifest.mn b/security/nss/lib/fortcrypt/swfort/manifest.mn index 5445af13b..85994a16e 100644 --- a/security/nss/lib/fortcrypt/swfort/manifest.mn +++ b/security/nss/lib/fortcrypt/swfort/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../../.. +MOD_DEPTH = ../../.. MODULE = security LIBRARY_NAME = swfci diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/.cvsignore b/security/nss/lib/fortcrypt/swfort/pkcs11/.cvsignore index 6532d294d..f3c7a7c5d 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/.cvsignore +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/.cvsignore @@ -1,15 +1 @@ -forsock.c -cryptint.h -fmutex.h -fortsock.h -fpkcs11.h -fpkcs11f.h -fpkcs11i.h -fpkcs11t.h -fpkmem.h -fpkstrs.h -genci.h -maci.h -fortpk11.c -fmutex.c - +Makefile diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in index fff915e74..0a2205165 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile.in @@ -32,31 +32,58 @@ # GPL. # -include manifest.mn -include $(CORE_DEPTH)/coreconf/config.mk -include config.mk +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### +MOD_DEPTH = ../../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@:@srcdir@/../.. -#SWCILIB = ../$(OBJDIR)/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +#SWCILIB = ../$(OBJDIR)/$(LIB_PREFIX)swfci.$(LIB_SUFFIX) # can't do this in manifest.mn because OS_ARCH isn't defined there. ifeq ($(OS_ARCH), WINNT) -CRYPTO_LIB = $(DIST)/lib/freebl.lib +CRYPTO_LIBS = $(DIST)/lib/freebl.lib ifdef MOZILLA_SECURITY_BUILD -CRYPTO_LIB = $(DIST)/lib/crypto.lib +CRYPTO_LIBS += $(DIST)/lib/crypto.lib endif ifdef MOZILLA_BSAFE_BUILD -CRYPTO_LIB += $(DIST)/lib/bsafe$(BSAFEVER).lib -CRYPTO_LIB += $(DIST)/lib/freebl.lib +CRYPTO_LIBS += $(DIST)/lib/bsafe41.lib endif -# $(DIST)/lib/dbm.lib -# $(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib +# $(DIST)/lib/dbm.lib +# $(DIST)/lib/$(NSPR31_LIB_PREFIX)nspr4.lib EXTRA_LIBS = \ $(DIST)/lib/swfci.lib \ $(DIST)/lib/softoken.lib \ - $(CRYPTO_LIB) \ + $(CRYPTO_LIBS) \ $(DIST)/lib/secutil.lib \ $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \ $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \ @@ -66,13 +93,17 @@ EXTRA_LIBS = \ else -# $(DIST)/lib/libdbm.a -# $(DIST)/lib/libnspr3.a +# $(DIST)/lib/libdbm.a +# $(DIST)/lib/libnspr3.a +# OSF 1 linker is very agressive. It includes the entire archive, +# not just the .o's that we need from that archive. # -CRYPTO_LIB = $(DIST)/lib/libfreebl.$(LIB_SUFFIX) - +ifneq ($(OS_ARCH), OSF1) + +CRYPTO_LIB = $(DIST)/lib/libfreebl.$(LIB_SUFFIX) + ifdef MOZILLA_SECURITY_BUILD -CRYPTO_LIB = $(DIST)/lib/libcrypto.$(LIB_SUFFIX) +CRYPTO_LIB += $(DIST)/lib/libcrypto.$(LIB_SUFFIX) endif ifdef MOZILLA_BSAFE_BUILD CRYPTO_LIB += $(DIST)/lib/libbsafe.$(LIB_SUFFIX) @@ -92,10 +123,11 @@ EXTRA_LIBS += \ $(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \ $(CRYPTO_LIB) \ $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ - $(PLC_STATIC_LIB) \ - $(PLDS_STATIC_LIB) \ $(NULL) +EXTRA_SHARED_LIBS += $(NSPR_LIBS) + +endif endif #ifeq ($(OS_TARGET), WIN16) @@ -107,7 +139,7 @@ endif INST_JS = inst.js LIBCI_JAR = $(OBJDIR)/lib$(LIBRARY_NAME).jar LIBCI_JAR_SRC = $(INST_JS) pk11inst $(SHARED_LIBRARY) - + ifneq ($(OS_TARGET), WIN16) TARGETS : $(LIBCI_JAR) endif @@ -125,23 +157,13 @@ endif #$(SHARED_LIBRARY): $(SWCILIB) -forsock.c: ../../forsock.c $(CP_INCLUDES) - cp ../../forsock.c $(CP_INCLUDES) . - -fortpk11.c: ../../fortpk11.c - cp ../../fortpk11.c . - -fmutex.c: ../../fmutex.c - cp ../../fmutex.c . - - # # The following rules packages the shared library into a JAR, # ready to be signed # $(OBJDIR)/replace: replace.c $(CC) -o $@ $< - + # ZIP options: # -5 means medium compression # -q means quiet @@ -150,12 +172,12 @@ $(OBJDIR)/replace: replace.c $(LIBCI_JAR): $(LIBCI_JAR_SRC) @echo +++ building $@ from $(LIBCI_JAR_SRC) @rm -f $@ - zip -5qj $@ $(LIBCI_JAR_SRC) + zip -5qj $@ $(LIBCI_JAR_SRC) $(LIBSWCI_JAR): $(LIBSWCI_JAR_SRC) @echo +++ building $@ from $(LIBSWCI_JAR_SRC) @rm -f $@ - zip -5qj $@ $(LIBSWCI_JAR_SRC) + zip -5qj $@ $(LIBSWCI_JAR_SRC) MD_FILES += $(LIBCI_JAR) $(LIBSWCI_JAR) @@ -165,14 +187,13 @@ MD_FILES += $(LIBCI_JAR) $(LIBSWCI_JAR) # library the way config used to. # - + ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.1) DSO_LDOPTS = -bM:SRE -bh:4 -bnoentry EXTRA_DSO_LDOPTS = -lc MKSHLIB = xlC $(DSO_LDOPTS) - + $(SHARED_LIBRARY): $(OBJS) - @$(MAKE_OBJDIR) rm -f $@ $(MKSHLIB) -o $@ $(OBJS) $(EXTRA_LIBS) $(EXTRA_DSO_LDOPTS) chmod +x $@ @@ -181,9 +202,25 @@ endif ifeq ($(OS_ARCH)$(OS_RELEASE), AIX4.2) LD += -G -endif +endif + +INCLUDES += -I$(srcdir)/../.. + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### ifneq ($(OS_TARGET), WIN16) -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk endif +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + diff --git a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn index eca9b5ab3..fd26a415d 100644 --- a/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn +++ b/security/nss/lib/fortcrypt/swfort/pkcs11/manifest.mn @@ -31,11 +31,12 @@ # GPL. # -CORE_DEPTH = ../../../../.. +MOD_DEPTH = ../../../.. MODULE = security LIBRARY_NAME = swft -#LIBRARY_VERSION = 32 +PROG_PREFIX = C_ +MDDEPDIR := $(MDDEPDIR)_C COPIED_CSRCS = forsock.c \ fortpk11.c \ diff --git a/security/nss/lib/freebl/.cvsignore b/security/nss/lib/freebl/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/freebl/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile.in index 9c963bc98..5620861ed 100644 --- a/security/nss/lib/freebl/Makefile +++ b/security/nss/lib/freebl/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@:@srcdir@/mpi + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -54,9 +65,7 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### --include config.mk - -CPORLN = ln -s +include $(srcdir)/config.mk ifdef USE_64 DEFINES += -DNSS_USE_64 @@ -66,16 +75,15 @@ ifdef USE_HYBRID DEFINES += -DNSS_USE_HYBRID endif -# des.c wants _X86_ defined for intel CPUs. +# des.c wants _X86_ defined for intel CPUs. # coreconf does this for windows, but not for Linux, FreeBSD, etc. ifeq ($(CPU_ARCH),x86) ifneq ($(OS_ARCH),WINNT) - OS_REL_CFLAGS += -D_X86_ + OS_CFLAGS += -D_X86_ endif endif ifeq ($(OS_ARCH),WINNT) -CPORLN = cp ifneq ($(OS_TARGET),WIN16) ASFILES = mpi_x86.asm DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D @@ -86,9 +94,8 @@ endif ifeq ($(OS_ARCH),IRIX) ifeq ($(USE_N32),1) ASFILES = mpi_mips.s - ASFLAGS = -O -OPT:Olimit=4000 -dollar -fullwarn -xansi -n32 -mips3 - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE - DEFINES += -DMP_USE_UINT_DIGIT + ASFLAGS = -O -OPT:Olimit=4000 -dollar -fullwarn -xansi -n32 -mips3 + DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_USE_UINT_DIGIT else endif endif @@ -115,15 +122,15 @@ ifdef USE_PURE_32 DEFINES += -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD else ifdef USE_64 -# this builds for DA2.0W (HP PA 2.0 Wide), the LP64 ABI, using 32-bit digits - MPI_SRCS += mpi_hp.c - ASFILES += hpma512.s hppa20.s - DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE +# this builds for DA2.0W (HP PA 2.0 Wide), the LP64 ABI, using 32-bit digits + MPI_SRCS += mpi_hp.c + ASFILES += hpma512.s hppa20.s + DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE else -# this builds for DA2.0 (HP PA 2.0 Narrow) hybrid model +# this builds for DA2.0 (HP PA 2.0 Narrow) hybrid model # (the 32-bit ABI with 64-bit registers) using 32-bit digits - MPI_SRCS += mpi_hp.c - ASFILES += hpma512.s hppa20.s + MPI_SRCS += mpi_hp.c + ASFILES += hpma512.s hppa20.s DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE # This is done in coreconf by defining USE_LONG_LONGS # OS_CFLAGS += -Aa +e +DA2.0 +DS2.0 @@ -135,7 +142,7 @@ endif # Note: -xarch=v8 or v9 is now done in coreconf ifeq ($(OS_TARGET),SunOS) ifeq ($(CPU_ARCH),sparc) -ifndef NS_USE_GCC +ifndef GNU_CC ifndef USE_PURE_32 OS_CFLAGS += -xchip=ultra2 endif @@ -154,7 +161,12 @@ ifeq ($(OS_RELEASE),5.8) endif ifeq ($(SYSV_SPARC),1) SOLARIS_AS = /usr/ccs/bin/as +ifdef GNU_CC +LD = gcc +DSO_LDOPTS += -shared -Wl,-B,symbolic,-z,defs,-z,now,-z,text,-M,mapfile.Solaris +else MKSHLIB += -B symbolic -z defs -z now -z text -M mapfile.Solaris +endif ifdef USE_PURE_32 # this builds for Sparc v8 pure 32-bit architecture DEFINES += -DMP_USE_LONG_LONG_MULTIPLY -DMP_USE_UINT_DIGIT -DMP_NO_MP_WORD @@ -164,8 +176,8 @@ ifdef USE_64 MPI_SRCS += mpi_sparc.c ASFILES = mpv_sparcv9.s montmulfv9.s DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_USING_MONT_MULF - DEFINES += -DMP_USE_UINT_DIGIT -# MPI_SRCS += mpv_sparc.c + DEFINES += -DMP_USE_UINT_DIGIT +# MPI_SRCS += mpv_sparc.c # removed -xdepend from the following line SOLARIS_FLAGS = -fast -xO5 -xrestrict=%all -xchip=ultra -xarch=v9a -KPIC -mt SOLARIS_AS_FLAGS = -xarch=v9a -K PIC @@ -174,7 +186,7 @@ else MPI_SRCS += mpi_sparc.c ASFILES = mpv_sparcv8.s montmulfv8.s DEFINES += -DMP_NO_MP_WORD -DMP_ASSEMBLY_MULTIPLY -DMP_USING_MONT_MULF - DEFINES += -DMP_USE_UINT_DIGIT + DEFINES += -DMP_USE_UINT_DIGIT SOLARIS_AS_FLAGS = -xarch=v8plusa -K PIC # ASM_SUFFIX = .S endif @@ -184,18 +196,18 @@ endif endif +INCLUDES += -I$(srcdir)/mpi + ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # ####################################################################### - - ####################################################################### # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### @@ -203,96 +215,29 @@ include $(CORE_DEPTH)/coreconf/rules.mk export:: private_export rijndael_tables: - $(CC) -o $(OBJDIR)/make_rijndael_tab rijndael_tables.c \ - $(DEFINES) $(INCLUDES) $(OBJDIR)/libfreebl.a - $(OBJDIR)/make_rijndael_tab - -ifdef MOZILLA_BSAFE_BUILD - -private_export:: -ifeq ($(OS_ARCH), WINNT) - rm -f $(DIST)/lib/bsafe$(BSAFEVER).lib -endif - $(NSINSTALL) -R $(BSAFEPATH) $(DIST)/lib -endif - -mp%.h : mpi/mp%.h - -$(CPORLN) $< . - -mp%.c : mpi/mp%.c - -$(CPORLN) $< . - -mp%.S : mpi/mp%.S - -$(CPORLN) $< . - -mp%.s : mpi/mp%.s - -$(CPORLN) $< . - -mp%.asm : mpi/mp%.asm - -$(CPORLN) $< . - -logtab.h : mpi/logtab.h - -$(CPORLN) $< . - -primes.c : mpi/primes.c - -$(CPORLN) $< . - -vis%.il : mpi/vis%.il - -$(CPORLN) $< . - -vis%.h : mpi/vis%.h - -$(CPORLN) $< . - -mont% : mpi/mont% - -$(CPORLN) $< . - -hp%.s : mpi/hp%.s - -$(CPORLN) $< . - -.PRECIOUS : $(MPI_SRCS) $(MPI_HDRS) $(ASFILES) - -ALL_TRASH += $(MPI_SRCS) $(MPI_HDRS) $(ASFILES) primes.c mont* + $(CC) -o make_rijndael_tab $(srcdir)/rijndael_tables.c \ + $(DEFINES) $(INCLUDES) ./libfreebl.$(LIB_SUFFIX) + ./make_rijndael_tab DEFINES += -DMP_API_COMPATIBLE -MPI_USERS = dh.c pqg.c dsa.c rsa.c - -MPI_OBJS = $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_SRCS:.c=$(OBJ_SUFFIX))) -MPI_OBJS += $(addprefix $(OBJDIR)/$(PROG_PREFIX), $(MPI_USERS:.c=$(OBJ_SUFFIX))) - -$(MPI_OBJS): $(MPI_HDRS) primes.c - ifeq ($(SYSV_SPARC),1) -SPARCFIX = $(OBJDIR)/sparcfix +SPARCFIX = ./sparcfix $(SPARCFIX): sparcfix.c - @$(MAKE_OBJDIR) $(CC) -o $@ -O sparcfix.c -lelf -$(OBJDIR)/mpv_sparcv8.o $(OBJDIR)/montmulfv8.o : $(OBJDIR)/%.o : %.s $(SPARCFIX) - @$(MAKE_OBJDIR) +mpv_sparcv8.o montmulfv8.o : %.s $(SPARCFIX) $(SOLARIS_AS) -o $@ $(SOLARIS_AS_FLAGS) $*.s - $(SPARCFIX) $@ +# $(SPARCFIX) $@ -$(OBJDIR)/mpv_sparcv9.o $(OBJDIR)/montmulfv9.o : $(OBJDIR)/%.o : %.s - @$(MAKE_OBJDIR) +mpv_sparcv9.o montmulfv9.o : %.s $(SOLARIS_AS) -o $@ $(SOLARIS_AS_FLAGS) $*.s -# $(SPARCFIX) $@ -$(OBJDIR)/mpv_sparc.o: vis_64.il vis_proto.h mpv_sparc.c - @$(MAKE_OBJDIR) +mpv_sparc.o: vis_64.il vis_proto.h mpv_sparc.c $(CC) -o $@ $(SOLARIS_FLAGS) -c vis_64.il mpv_sparc.c -# $(SPARCFIX) $@ - -$(OBJDIR)/mpmontg.o: mpmontg.c montmulf.h endif -ifeq ($(OS_ARCH), HP-UX) -$(OBJDIR)/mpmontg.o: mpmontg.c montmulf.h -endif - -$(OBJDIR)/ldvector.o $(OBJDIR)/loader.o : loader.h - ifdef FREEBL_EXTENDED_BUILD PURE32DIR = $(OS_ARCH)pure32 @@ -303,7 +248,7 @@ FILES2LN = \ $(ALL_CSRCS) \ $(wildcard *.tab) \ $(wildcard mapfile.*) \ - Makefile manifest.mn config.mk + Makefile manifest.mn config.mk LINKEDFILES = $(addprefix $(PURE32DIR)/, $(FILES2LN)) @@ -311,17 +256,18 @@ $(PURE32DIR): -mkdir $(PURE32DIR) -ln -s ../mpi $(PURE32DIR) -$(LINKEDFILES) : $(PURE32DIR)/% : % +$(LINKEDFILES) : $(PURE32DIR)/% : % ln -s ../$* $(PURE32DIR) -libs:: +libs:: $(MAKE) FREEBL_RECURSIVE_BUILD=1 USE_HYBRID=1 libs - + libs:: $(PURE32DIR) $(LINKEDFILES) cd $(PURE32DIR) && $(MAKE) FREEBL_RECURSIVE_BUILD=1 USE_PURE_32=1 libs - + release_md:: $(MAKE) FREEBL_RECURSIVE_BUILD=1 USE_HYBRID=1 $@ cd $(PURE32DIR) && $(MAKE) FREEBL_RECURSIVE_BUILD=1 USE_PURE_32=1 $@ endif + diff --git a/security/nss/lib/freebl/manifest.mn b/security/nss/lib/freebl/manifest.mn index 53f5a883b..bb4352cf9 100644 --- a/security/nss/lib/freebl/manifest.mn +++ b/security/nss/lib/freebl/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security @@ -38,7 +38,7 @@ ifndef FREEBL_RECURSIVE_BUILD LIBRARY_NAME = freebl else ifdef USE_PURE_32 - CORE_DEPTH = ../../../.. + MOD_DEPTH = ../../../.. LIBRARY_NAME = freebl_pure32 else LIBRARY_NAME = freebl_hybrid diff --git a/security/nss/lib/jar/.cvsignore b/security/nss/lib/jar/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/jar/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/cmd/checkcert/Makefile b/security/nss/lib/jar/Makefile.in index 573c12cac..4fdf8c609 100644 --- a/security/nss/cmd/checkcert/Makefile +++ b/security/nss/lib/jar/Makefile.in @@ -33,32 +33,45 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # ####################################################################### + + ####################################################################### # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include ../platlibs.mk +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -70,7 +83,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - - -include ../platrules.mk - diff --git a/security/nss/lib/jar/manifest.mn b/security/nss/lib/jar/manifest.mn index 9a47b1558..945d29259 100644 --- a/security/nss/lib/jar/manifest.mn +++ b/security/nss/lib/jar/manifest.mn @@ -33,7 +33,7 @@ MODULE = security LIBRARY_NAME = jar -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. CSRCS = \ jarver.c \ @@ -50,4 +50,4 @@ REQUIRES = security dbm EXPORTS = jar.h jar-ds.h jarfile.h -DEFINES = -DMOZILLA_CLIENT=1 +DEFINES += -DMOZILLA_CLIENT=1 diff --git a/security/nss/lib/manifest.mn b/security/nss/lib/manifest.mn index cc8dfc1d0..b46b20ecc 100644 --- a/security/nss/lib/manifest.mn +++ b/security/nss/lib/manifest.mn @@ -30,12 +30,12 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../.. +MOD_DEPTH = .. DEPTH = ../.. DIRS = crmf jar \ certhigh pk11wrap cryptohi \ - softoken certdb crypto \ + softoken certdb \ util freebl nss pkcs12 fortcrypt \ base ckfw pkcs7 smime ssl # diff --git a/security/nss/lib/nss/.cvsignore b/security/nss/lib/nss/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/nss/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/cryptohi/Makefile b/security/nss/lib/nss/Makefile.in index ced902117..4143690e7 100644 --- a/security/nss/lib/cryptohi/Makefile +++ b/security/nss/lib/nss/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -54,13 +65,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### --include config.mk +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -72,6 +83,4 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - export:: private_export - diff --git a/security/nss/lib/nss/config.mk b/security/nss/lib/nss/config.mk index aa35a3775..4f2355659 100644 --- a/security/nss/lib/nss/config.mk +++ b/security/nss/lib/nss/config.mk @@ -118,7 +118,7 @@ SHARED_LIBRARY_LIBS = \ $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ $(NULL) EXTRA_LIBS += \ - $(DIST)/lib/libdbm.$(LIB_SUFFIX) \ + $(DBM_LIBS) \ $(NULL) ifdef MOZILLA_BSAFE_BUILD EXTRA_LIBS+=$(DIST)/lib/libbsafe.$(LIB_SUFFIX) @@ -136,10 +136,7 @@ SHARED_LIBRARY_DIRS = \ # $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS) # $(EXTRA_SHARED_LIBS) come before $(OS_LIBS), except on AIX. EXTRA_SHARED_LIBS += \ - -L$(DIST)/lib/ \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ + $(NSPR_LIBS) \ $(NULL) endif @@ -181,5 +178,4 @@ MKSHLIB += -Wl,--version-script,$(MAPFILE) endif - diff --git a/security/nss/lib/nss/manifest.mn b/security/nss/lib/nss/manifest.mn index 5d822c170..dc98f4cab 100644 --- a/security/nss/lib/nss/manifest.mn +++ b/security/nss/lib/nss/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. PRIVATE_EXPORTS = \ nssrenam.h \ diff --git a/security/nss/lib/nss/nss.def b/security/nss/lib/nss/nss.def index 755fec374..bedb16f27 100644 --- a/security/nss/lib/nss/nss.def +++ b/security/nss/lib/nss/nss.def @@ -447,3 +447,12 @@ PK11_NeedUserInit; ;+ local: ;+ *; ;+}; +;+NSS_3.2.1 { # NSS 3.2 release +;+ global: +CERT_AddRDN; +CERT_CreateRDN; +CERT_CreateAVA; +CERT_CreateName; +;+ local: +;+ *; +;+}; diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index 1be4ad8f0..db55cd159 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -49,10 +49,10 @@ SEC_BEGIN_PROTOS * The format of the version string should be * "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define NSS_VERSION "3.2" +#define NSS_VERSION "3.2.1" #define NSS_VMAJOR 3 #define NSS_VMINOR 2 -#define NSS_VPATCH 0 +#define NSS_VPATCH 1 #define NSS_BETA PR_FALSE diff --git a/security/nss/lib/pk11wrap/.cvsignore b/security/nss/lib/pk11wrap/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/pk11wrap/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/pk11wrap/Makefile b/security/nss/lib/pk11wrap/Makefile.in index 4810efd29..dca415c02 100644 --- a/security/nss/lib/pk11wrap/Makefile +++ b/security/nss/lib/pk11wrap/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -54,13 +65,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### --include config.mk +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -81,10 +92,10 @@ ifeq ($(OS_ARCH),AIX) ifeq ($(OS_RELEASE),4.3) ifeq ($(USE_64),1) ifndef BUILD_OPT -$(OBJDIR)/pk11slot.o: pk11slot.c - @$(MAKE_OBJDIR) +pk11slot.o: pk11slot.c $(CC) -o $@ -c -O2 $(CFLAGS) $< endif endif endif endif + diff --git a/security/nss/lib/pk11wrap/manifest.mn b/security/nss/lib/pk11wrap/manifest.mn index 0eddc6696..c6ce97aa9 100644 --- a/security/nss/lib/pk11wrap/manifest.mn +++ b/security/nss/lib/pk11wrap/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ secmod.h \ diff --git a/security/nss/lib/pk11wrap/pk11cert.c b/security/nss/lib/pk11wrap/pk11cert.c index bcf6b16e6..2306a3eee 100644 --- a/security/nss/lib/pk11wrap/pk11cert.c +++ b/security/nss/lib/pk11wrap/pk11cert.c @@ -2570,7 +2570,17 @@ pk11ListCertCallback(CERTCertificate *cert, SECItem *derCert, void *arg) PK11CertListType type = listCertP->type; CERTCertList *certList = listCertP->certList; CERTCertTrust *trust; + PRBool isUnique = PR_FALSE; + char *nickname = NULL; + + if ((type == PK11CertListUnique) || (type == PK11CertListRootUnique)) { + isUnique = PR_TRUE; + } + /* at this point the nickname is correct for the cert. save it for later */ + if (!isUnique) { + nickname = PORT_ArenaStrdup(listCertP->certList->arena,cert->nickname); + } if (derCert == NULL) { newCert=CERT_DupCertificate(cert); } else { @@ -2583,16 +2593,24 @@ pk11ListCertCallback(CERTCertificate *cert, SECItem *derCert, void *arg) /* if we want user certs and we don't have one skip this cert */ if ((type == PK11CertListUser) && - ( (cert->slot == NULL) || - (trust == NULL) || (((trust->sslFlags & CERTDB_USER == 0) && - ((trust->emailFlags & CERTDB_USER) == 0))) ) ) { + ((trust == NULL) || + ( ((trust->sslFlags & CERTDB_USER) == 0) && + ((trust->emailFlags & CERTDB_USER) == 0) )) ) { + CERT_DestroyCertificate(newCert); + return SECSuccess; + } + + /* if we want root certs, skip the user certs */ + if ((type == PK11CertListRootUnique) && + ((trust) && (((trust->sslFlags & CERTDB_USER ) || + (trust->emailFlags & CERTDB_USER))) ) ) { CERT_DestroyCertificate(newCert); return SECSuccess; } /* if we want Unique certs and we already have it on our list, skip it */ - if ((type == PK11CertListUnique) && (isOnList(certList,newCert))) { + if ( isUnique && isOnList(certList,newCert) ) { CERT_DestroyCertificate(newCert); return SECSuccess; } @@ -2600,9 +2618,9 @@ pk11ListCertCallback(CERTCertificate *cert, SECItem *derCert, void *arg) /* put slot certs at the end */ if (newCert->slot && !PK11_IsInternal(newCert->slot)) { - CERT_AddCertToListTail(certList,newCert); + CERT_AddCertToListTailWithData(certList,newCert,nickname); } else { - CERT_AddCertToListHead(certList,newCert); + CERT_AddCertToListHeadWithData(certList,newCert,nickname); } return SECSuccess; } @@ -2618,7 +2636,8 @@ PK11_ListCerts(PK11CertListType type, void *pwarg) listCerts.type = type; listCerts.certList = certList; - SEC_TraversePermCerts(CERT_GetDefaultCertDB(),pk11ListCertCallback,&listCerts); + SEC_TraversePermCerts(CERT_GetDefaultCertDB(),pk11ListCertCallback, + &listCerts); PK11_TraverseSlotCerts(pk11ListCertCallback,&listCerts,pwarg); diff --git a/security/nss/lib/pk11wrap/pk11slot.c b/security/nss/lib/pk11wrap/pk11slot.c index 571177438..3f3f453cd 100644 --- a/security/nss/lib/pk11wrap/pk11slot.c +++ b/security/nss/lib/pk11wrap/pk11slot.c @@ -1666,7 +1666,7 @@ PK11_InitToken(PK11SlotInfo *slot, PRBool loadCerts) /* initialize the maxKeyCount value */ if (tokenInfo.ulMaxSessionCount == 0) { - slot->maxKeyCount = 300; /* should be #define or a config param */ + slot->maxKeyCount = 800; /* should be #define or a config param */ } else if (tokenInfo.ulMaxSessionCount < 20) { /* don't have enough sessions to keep that many keys around */ slot->maxKeyCount = 0; diff --git a/security/nss/lib/pk11wrap/secmodt.h b/security/nss/lib/pk11wrap/secmodt.h index 949edee26..b2d401e24 100644 --- a/security/nss/lib/pk11wrap/secmodt.h +++ b/security/nss/lib/pk11wrap/secmodt.h @@ -97,8 +97,9 @@ struct PK11RSAGenParamsStr { }; typedef enum { - PK11CertListUnique = 0, - PK11CertListUser = 1 + PK11CertListUnique = 0, + PK11CertListUser = 1, + PK11CertListRootUnique = 2 } PK11CertListType; /* diff --git a/security/nss/lib/pkcs12/.cvsignore b/security/nss/lib/pkcs12/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/pkcs12/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/pkcs12/Makefile b/security/nss/lib/pkcs12/Makefile.in index 5742208b5..abf4b0fa9 100644 --- a/security/nss/lib/pkcs12/Makefile +++ b/security/nss/lib/pkcs12/Makefile.in @@ -32,18 +32,28 @@ # GPL. # +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk ####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -55,13 +65,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -73,5 +83,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### - - diff --git a/security/nss/lib/pkcs12/manifest.mn b/security/nss/lib/pkcs12/manifest.mn index c8b4981d3..1531befd0 100644 --- a/security/nss/lib/pkcs12/manifest.mn +++ b/security/nss/lib/pkcs12/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ pkcs12t.h \ diff --git a/security/nss/lib/pkcs12/p12d.c b/security/nss/lib/pkcs12/p12d.c index f822a7778..9abae13c8 100644 --- a/security/nss/lib/pkcs12/p12d.c +++ b/security/nss/lib/pkcs12/p12d.c @@ -703,6 +703,9 @@ sec_pkcs12_decoder_safe_contents_callback(void *arg, const char *buf, /* update the decoder */ rv = SEC_ASN1DecoderUpdate(safeContentsCtx->safeContentsDcx, buf, len); if(rv != SECSuccess) { + /* if we fail while trying to decode a 'safe', it's probably because + * we didn't have the correct password. */ + PORT_SetError(SEC_ERROR_BAD_PASSWORD); p12dcx->errorValue = SEC_ERROR_PKCS12_CORRUPT_PFX_STRUCTURE; goto loser; } diff --git a/security/nss/lib/pkcs7/.cvsignore b/security/nss/lib/pkcs7/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/pkcs7/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/pkcs7/Makefile b/security/nss/lib/pkcs7/Makefile deleted file mode 100644 index cb85677bc..000000000 --- a/security/nss/lib/pkcs7/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include config.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - - diff --git a/security/nss/lib/pkcs7/Makefile.in b/security/nss/lib/pkcs7/Makefile.in new file mode 100644 index 000000000..aac1abec3 --- /dev/null +++ b/security/nss/lib/pkcs7/Makefile.in @@ -0,0 +1,87 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + + + diff --git a/security/nss/lib/pkcs7/manifest.mn b/security/nss/lib/pkcs7/manifest.mn index 64cc3e05f..e95e6ccff 100644 --- a/security/nss/lib/pkcs7/manifest.mn +++ b/security/nss/lib/pkcs7/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ secmime.h \ diff --git a/security/nss/lib/pki1/Makefile b/security/nss/lib/pki1/Makefile index 03e1fb4c6..258614602 100644 --- a/security/nss/lib/pki1/Makefile +++ b/security/nss/lib/pki1/Makefile @@ -34,5 +34,5 @@ MAKEFILE_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" include manifest.mn include config.mk -include $(CORE_DEPTH)/coreconf/config.mk -include $(CORE_DEPTH)/coreconf/rules.mk +include $(MOD_DEPTH)/coreconf/config.mk +include $(MOD_DEPTH)/coreconf/rules.mk diff --git a/security/nss/lib/pki1/manifest.mn b/security/nss/lib/pki1/manifest.mn index 8e032d974..cf9459d26 100644 --- a/security/nss/lib/pki1/manifest.mn +++ b/security/nss/lib/pki1/manifest.mn @@ -32,7 +32,7 @@ # MANIFEST_CVS_ID = "@(#) $RCSfile$ $Revision$ $Date$ $Name$" -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. PRIVATE_EXPORTS = \ pki1.h \ diff --git a/security/nss/lib/smime/.cvsignore b/security/nss/lib/smime/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/smime/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/smime/Makefile b/security/nss/lib/smime/Makefile deleted file mode 100644 index cb85677bc..000000000 --- a/security/nss/lib/smime/Makefile +++ /dev/null @@ -1,76 +0,0 @@ -#! gmake -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape security libraries. -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1994-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -####################################################################### -# (1) Include initial platform-independent assignments (MANDATORY). # -####################################################################### - -include manifest.mn - -####################################################################### -# (2) Include "global" configuration information. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/config.mk - -####################################################################### -# (3) Include "component" configuration information. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (4) Include "local" platform-dependent assignments (OPTIONAL). # -####################################################################### - -include config.mk - -####################################################################### -# (5) Execute "global" rules. (OPTIONAL) # -####################################################################### - -include $(CORE_DEPTH)/coreconf/rules.mk - -####################################################################### -# (6) Execute "component" rules. (OPTIONAL) # -####################################################################### - - - -####################################################################### -# (7) Execute "local" rules. (OPTIONAL). # -####################################################################### - - - diff --git a/security/dbm/Makefile b/security/nss/lib/smime/Makefile.in index 34cd6d899..035d25f0e 100644 --- a/security/dbm/Makefile +++ b/security/nss/lib/smime/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -54,13 +65,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### - +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -72,9 +83,3 @@ include $(CORE_DEPTH)/coreconf/rules.mk # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### -coreconf_hack: - cd ../coreconf; gmake - gmake import - -RelEng_bld: coreconf_hack - gmake diff --git a/security/nss/lib/smime/config.mk b/security/nss/lib/smime/config.mk index 2d483a789..6edae0217 100644 --- a/security/nss/lib/smime/config.mk +++ b/security/nss/lib/smime/config.mk @@ -87,9 +87,7 @@ SHARED_LIBRARY_DIRS = \ EXTRA_SHARED_LIBS += \ -L$(DIST)/lib/ \ -lnss3 \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ + $(NSPR_LIBS) \ $(NULL) endif diff --git a/security/nss/lib/smime/manifest.mn b/security/nss/lib/smime/manifest.mn index 6e526dfb4..8494e809d 100644 --- a/security/nss/lib/smime/manifest.mn +++ b/security/nss/lib/smime/manifest.mn @@ -31,7 +31,7 @@ # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ cms.h \ diff --git a/security/nss/lib/smime/smime.def b/security/nss/lib/smime/smime.def index f1c0f293d..31bf8d4ae 100644 --- a/security/nss/lib/smime/smime.def +++ b/security/nss/lib/smime/smime.def @@ -169,3 +169,9 @@ SEC_PKCS12SetPreferredCipher; ;+ local: ;+ *; ;+}; +;+NSS_3.2.1 { # NSS 3.2.1 release +;+ global: +NSSSMIME_VersionCheck; +;+ local: +;+ *; +;+}; diff --git a/security/nss/lib/smime/smimeutil.c b/security/nss/lib/smime/smimeutil.c index 1a4d4073e..b76a58883 100644 --- a/security/nss/lib/smime/smimeutil.c +++ b/security/nss/lib/smime/smimeutil.c @@ -715,3 +715,28 @@ loser: return cert; } + +extern const char __nss_smime_rcsid[]; +extern const char __nss_smime_sccsid[]; + +PRBool +NSSSMIME_VersionCheck(const char *importedVersion) +{ + /* + * This is the secret handshake algorithm. + * + * This release has a simple version compatibility + * check algorithm. This release is not backward + * compatible with previous major releases. It is + * not compatible with future major, minor, or + * patch releases. + */ + int vmajor = 0, vminor = 0, vpatch = 0; + const char *ptr = importedVersion; + volatile char c; /* force a reference that won't get optimized away */ + + c = __nss_smime_rcsid[0] + __nss_smime_sccsid[0]; + + return NSS_VersionCheck(importedVersion); +} + diff --git a/security/nss/lib/softoken/.cvsignore b/security/nss/lib/softoken/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/softoken/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/softoken/Makefile b/security/nss/lib/softoken/Makefile.in index 653bbb7ab..126c465f7 100644 --- a/security/nss/lib/softoken/Makefile +++ b/security/nss/lib/softoken/Makefile.in @@ -33,16 +33,27 @@ # ####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### # (1) Include initial platform-independent assignments (MANDATORY). # ####################################################################### -include manifest.mn +include $(srcdir)/manifest.mn ####################################################################### # (2) Include "global" configuration information. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/config.mk +include $(CORECONF_SOURCE)/config.mk ####################################################################### # (3) Include "component" configuration information. (OPTIONAL) # @@ -54,13 +65,13 @@ include $(CORE_DEPTH)/coreconf/config.mk # (4) Include "local" platform-dependent assignments (OPTIONAL). # ####################################################################### -include config.mk +include $(srcdir)/config.mk ####################################################################### # (5) Execute "global" rules. (OPTIONAL) # ####################################################################### -include $(CORE_DEPTH)/coreconf/rules.mk +include $(CORECONF_SOURCE)/rules.mk ####################################################################### # (6) Execute "component" rules. (OPTIONAL) # @@ -81,8 +92,7 @@ ifeq ($(OS_ARCH),AIX) ifeq ($(OS_RELEASE),4.3) ifeq ($(USE_64),1) ifndef BUILD_OPT -$(OBJDIR)/pkcs11c.o: pkcs11c.c - @$(MAKE_OBJDIR) +pkcs11c.o: pkcs11c.c $(CC) -o $@ -c -O2 $(CFLAGS) $< endif endif diff --git a/security/nss/lib/softoken/manifest.mn b/security/nss/lib/softoken/manifest.mn index 75d5e9fc2..d34e5f7b6 100644 --- a/security/nss/lib/softoken/manifest.mn +++ b/security/nss/lib/softoken/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. MODULE = security diff --git a/security/nss/lib/ssl/.cvsignore b/security/nss/lib/ssl/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/ssl/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/ssl/Makefile.in b/security/nss/lib/ssl/Makefile.in new file mode 100644 index 000000000..4b377c143 --- /dev/null +++ b/security/nss/lib/ssl/Makefile.in @@ -0,0 +1,98 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +ifeq ($(OS_ARCH),WINNT) +CSRCS += win32err.c +DEFINES += -DIN_LIBSSL +else +ifeq ($(OS_ARCH),OS2) +CSRCS += os2_err.c +else +CSRCS += unix_err.c +endif +endif + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +export:: private_export + diff --git a/security/nss/lib/ssl/config.mk b/security/nss/lib/ssl/config.mk index 5fffdaa72..ca2907cc2 100644 --- a/security/nss/lib/ssl/config.mk +++ b/security/nss/lib/ssl/config.mk @@ -65,9 +65,7 @@ else EXTRA_SHARED_LIBS += \ -L$(DIST)/lib/ \ -lnss3 \ - -lplc4 \ - -lplds4 \ - -lnspr4 \ + $(NSPR_LIBS) \ $(NULL) endif diff --git a/security/nss/lib/ssl/manifest.mn b/security/nss/lib/ssl/manifest.mn index e76c516f1..1e9a6fd4f 100644 --- a/security/nss/lib/ssl/manifest.mn +++ b/security/nss/lib/ssl/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. # DEFINES = -DTRACE diff --git a/security/nss/lib/ssl/ssl.def b/security/nss/lib/ssl/ssl.def index c0a23f923..0fee478ba 100644 --- a/security/nss/lib/ssl/ssl.def +++ b/security/nss/lib/ssl/ssl.def @@ -99,3 +99,9 @@ SSL_SetURL; ;+ local: ;+*; ;+}; +;+NSS_3.2.1 { # NSS 3.2.1 release +;+ global: +NSSSSL_VersionCheck; +;+ local: +;+*; +;+}; diff --git a/security/nss/lib/ssl/sslcon.c b/security/nss/lib/ssl/sslcon.c index 05d5ed744..dc57e73f5 100644 --- a/security/nss/lib/ssl/sslcon.c +++ b/security/nss/lib/ssl/sslcon.c @@ -3684,3 +3684,25 @@ loser: return SECFailure; } +extern const char __nss_ssl_rcsid[]; +extern const char __nss_ssl_sccsid[]; + +PRBool +NSSSSL_VersionCheck(const char *importedVersion) +{ + /* + * This is the secret handshake algorithm. + * + * This release has a simple version compatibility + * check algorithm. This release is not backward + * compatible with previous major releases. It is + * not compatible with future major, minor, or + * patch releases. + */ + int vmajor = 0, vminor = 0, vpatch = 0; + const char *ptr = importedVersion; + volatile char c; /* force a reference that won't get optimized away */ + + c = __nss_ssl_rcsid[0] + __nss_ssl_sccsid[0]; + return NSS_VersionCheck(importedVersion); +} diff --git a/security/nss/lib/util/.cvsignore b/security/nss/lib/util/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/security/nss/lib/util/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/security/nss/lib/util/Makefile.in b/security/nss/lib/util/Makefile.in new file mode 100644 index 000000000..58ed84d4b --- /dev/null +++ b/security/nss/lib/util/Makefile.in @@ -0,0 +1,93 @@ +#! gmake +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# + +####################################################################### +# (0) Initialize autoconf variables # +####################################################################### + +MOD_DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(MOD_DEPTH)/coreconf/autoconf.mk + +####################################################################### +# (1) Include initial platform-independent assignments (MANDATORY). # +####################################################################### + +include $(srcdir)/manifest.mn + +####################################################################### +# (2) Include "global" configuration information. (OPTIONAL) # +####################################################################### + +ifeq ($(OS_ARCH),HP-UX) + ASFILES += ret_cr16.s +endif + +include $(CORECONF_SOURCE)/config.mk + +####################################################################### +# (3) Include "component" configuration information. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (4) Include "local" platform-dependent assignments (OPTIONAL). # +####################################################################### + +include $(srcdir)/config.mk + +####################################################################### +# (5) Execute "global" rules. (OPTIONAL) # +####################################################################### + +include $(CORECONF_SOURCE)/rules.mk + +####################################################################### +# (6) Execute "component" rules. (OPTIONAL) # +####################################################################### + + + +####################################################################### +# (7) Execute "local" rules. (OPTIONAL). # +####################################################################### + +tests:: $(OBJDIR)/test_utf8 + +$(OBJDIR)/test_utf8: utf8.c + $(CCF) -o $(OBJDIR)/test_utf8 -DTEST_UTF8 utf8.c $(OS_LIBS) diff --git a/security/nss/lib/util/manifest.mn b/security/nss/lib/util/manifest.mn index 3e89b483e..1700aa5a0 100644 --- a/security/nss/lib/util/manifest.mn +++ b/security/nss/lib/util/manifest.mn @@ -30,7 +30,7 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = ../../.. +MOD_DEPTH = ../.. EXPORTS = \ base64.h \ diff --git a/security/nss/lib/util/secport.c b/security/nss/lib/util/secport.c index e8a394401..6f9c510c9 100644 --- a/security/nss/lib/util/secport.c +++ b/security/nss/lib/util/secport.c @@ -49,6 +49,7 @@ #include "prmon.h" #include "nsslocks.h" #include "secport.h" +#include "prvrsion.h" #ifdef DEBUG #define THREADMARK @@ -72,15 +73,21 @@ typedef struct threadmark_mark_str { void *mark; } threadmark_mark; -typedef struct threadmark_arena_str { +#endif /* THREADMARK */ + +/* The value of this magic must change each time PORTArenaPool changes. */ +#define ARENAPOOL_MAGIC 0xB8AC9BDF + +typedef struct PORTArenaPool_str { PLArenaPool arena; - PRUint32 magic; + PRUint32 magic; + PRLock * lock; +#ifdef THREADMARK PRThread *marking_thread; threadmark_mark *first_mark; -} threadmark_arena; +#endif +} PORTArenaPool; -#define THREADMARK_MAGIC 0xB8AC9BDD /* In honor of nelsonb */ -#endif /* THREADMARK */ /* count of allocation failures. */ unsigned long port_allocFailures; @@ -182,50 +189,24 @@ PORT_GetError(void) /********************* Arena code follows *****************************/ -PZMonitor * arenaMonitor; - -static void -getArenaLock(void) -{ - if (!arenaMonitor) { - nss_InitMonitor(&arenaMonitor, nssILockArena); - } - if (arenaMonitor) - PZ_EnterMonitor(arenaMonitor); -} - -static void -releaseArenaLock(void) -{ - if (arenaMonitor) - PZ_ExitMonitor(arenaMonitor); -} - PLArenaPool * PORT_NewArena(unsigned long chunksize) { - PLArenaPool *arena; + PORTArenaPool *pool; - getArenaLock(); -#ifdef THREADMARK - { - threadmark_arena *tarena = (threadmark_arena *) - PORT_ZAlloc(sizeof(threadmark_arena)); - if( (threadmark_arena *)NULL != tarena ) { - arena = &tarena->arena; - tarena->magic = THREADMARK_MAGIC; - } else { - arena = (PLArenaPool *)NULL; - } + pool = PORT_ZNew(PORTArenaPool); + if (!pool) { + return NULL; } -#else /* THREADMARK */ - arena = (PLArenaPool*)PORT_ZAlloc(sizeof(PLArenaPool)); -#endif /* THREADMARK */ - if ( arena != NULL ) { - PL_InitArenaPool(arena, "security", chunksize, sizeof(double)); + pool->magic = ARENAPOOL_MAGIC; + pool->lock = PZ_NewLock(nssILockArena); + if (!pool->lock) { + ++port_allocFailures; + PORT_Free(pool); + return NULL; } - releaseArenaLock(); - return(arena); + PL_InitArenaPool(&pool->arena, "security", chunksize, sizeof(double)); + return(&pool->arena); } void * @@ -233,33 +214,29 @@ PORT_ArenaAlloc(PLArenaPool *arena, size_t size) { void *p; - getArenaLock(); + PORTArenaPool *pool = (PORTArenaPool *)arena; + + /* Is it one of ours? Assume so and check the magic */ + if (ARENAPOOL_MAGIC == pool->magic ) { + PZ_Lock(pool->lock); #ifdef THREADMARK - { - /* Is it one of ours? Assume so and check the magic */ - threadmark_arena *tarena = (threadmark_arena *)arena; - if( THREADMARK_MAGIC == tarena->magic ) { /* Most likely one of ours. Is there a thread id? */ - if( (PRThread *)NULL != tarena->marking_thread ) { - /* Yes. Has this arena been marked by this thread? */ - if( tarena->marking_thread == PR_GetCurrentThread() ) { - /* Yup. Everything's okay. */ - ; - } else { - /* Nope. BZZT! error */ - releaseArenaLock(); - PORT_SetError(SEC_ERROR_NO_MEMORY); - PORT_Assert(0); - return (void *)NULL; - } - } /* tid != null */ - } /* tarena */ - } /* scope */ + if (pool->marking_thread && + pool->marking_thread != PR_GetCurrentThread() ) { + /* Another thread holds a mark in this arena */ + PZ_Unlock(pool->lock); + PORT_SetError(SEC_ERROR_NO_MEMORY); + PORT_Assert(0); + return NULL; + } /* tid != null */ #endif /* THREADMARK */ + PL_ARENA_ALLOCATE(p, arena, size); + PZ_Unlock(pool->lock); + } else { + PL_ARENA_ALLOCATE(p, arena, size); + } - PL_ARENA_ALLOCATE(p, arena, size); - releaseArenaLock(); - if (p == NULL) { + if (!p) { ++port_allocFailures; PORT_SetError(SEC_ERROR_NO_MEMORY); } @@ -270,38 +247,9 @@ PORT_ArenaAlloc(PLArenaPool *arena, size_t size) void * PORT_ArenaZAlloc(PLArenaPool *arena, size_t size) { - void *p; - - getArenaLock(); -#ifdef THREADMARK - { - /* Is it one of ours? Assume so and check the magic */ - threadmark_arena *tarena = (threadmark_arena *)arena; - if( THREADMARK_MAGIC == tarena->magic ) { - /* Most likely one of ours. Is there a thread id? */ - if( (PRThread *)NULL != tarena->marking_thread ) { - /* Yes. Has this arena been marked by this thread? */ - if( tarena->marking_thread == PR_GetCurrentThread() ) { - /* Yup. Everything's okay. */ - ; - } else { - /* No, it was a different thread BZZT! error */ - releaseArenaLock(); - PORT_SetError(SEC_ERROR_NO_MEMORY); - PORT_Assert(0); - return (void *)NULL; - } - } /* tid != null */ - } /* tarena */ - } /* scope */ -#endif /* THREADMARK */ + void *p = PORT_ArenaAlloc(arena, size); - PL_ARENA_ALLOCATE(p, arena, size); - releaseArenaLock(); - if (p == NULL) { - ++port_allocFailures; - PORT_SetError(SEC_ERROR_NO_MEMORY); - } else { + if (p) { PORT_Memset(p, 0, size); } @@ -312,21 +260,51 @@ PORT_ArenaZAlloc(PLArenaPool *arena, size_t size) void PORT_FreeArena(PLArenaPool *arena, PRBool zero) { - getArenaLock(); + PORTArenaPool *pool = (PORTArenaPool *)arena; + PRLock * lock = (PRLock *)0; + size_t len = sizeof *arena; + extern const PRVersionDescription * libVersionPoint(void); + static const PRVersionDescription * pvd; + static PRBool doFreeArenaPool; + + if (ARENAPOOL_MAGIC == pool->magic ) { + len = sizeof *pool; + lock = pool->lock; + PZ_Lock(lock); + } + if (!pvd) { + /* no need for thread protection here */ + pvd = libVersionPoint(); + if ((pvd->vMajor > 4) || + (pvd->vMajor == 4 && pvd->vMinor > 1) || + (pvd->vMajor == 4 && pvd->vMinor == 1 && pvd->vPatch >= 1)) { + doFreeArenaPool = PR_TRUE; + } + } + if (doFreeArenaPool) + PL_FreeArenaPool(arena); PL_FinishArenaPool(arena); - PORT_Free(arena); - releaseArenaLock(); + PORT_ZFree(arena, len); + if (lock) { + PZ_Unlock(lock); + PZ_DestroyLock(lock); + } } void * PORT_ArenaGrow(PLArenaPool *arena, void *ptr, size_t oldsize, size_t newsize) { + PORTArenaPool *pool = (PORTArenaPool *)arena; PORT_Assert(newsize >= oldsize); - getArenaLock(); - /* Do we do a THREADMARK check here? */ - PL_ARENA_GROW(ptr, arena, oldsize, ( newsize - oldsize ) ); - releaseArenaLock(); + if (ARENAPOOL_MAGIC == pool->magic ) { + PZ_Lock(pool->lock); + /* Do we do a THREADMARK check here? */ + PL_ARENA_GROW(ptr, arena, oldsize, ( newsize - oldsize ) ); + PZ_Unlock(pool->lock); + } else { + PL_ARENA_GROW(ptr, arena, oldsize, ( newsize - oldsize ) ); + } return(ptr); } @@ -336,144 +314,140 @@ PORT_ArenaMark(PLArenaPool *arena) { void * result; - getArenaLock(); + PORTArenaPool *pool = (PORTArenaPool *)arena; + if (ARENAPOOL_MAGIC == pool->magic ) { + PZ_Lock(pool->lock); #ifdef THREADMARK - { - threadmark_mark *tm, **pw; - - threadmark_arena *tarena = (threadmark_arena *)arena; - if( THREADMARK_MAGIC == tarena->magic ) { - /* one of ours */ - if( (PRThread *)NULL == tarena->marking_thread ) { - /* First mark */ - tarena->marking_thread = PR_GetCurrentThread(); - } else { - if( PR_GetCurrentThread() != tarena->marking_thread ) { - releaseArenaLock(); - PORT_SetError(SEC_ERROR_NO_MEMORY); - PORT_Assert(0); - return (void *)NULL; - } - } - - result = PL_ARENA_MARK(arena); - PL_ARENA_ALLOCATE(tm, arena, sizeof(threadmark_mark)); - if( (threadmark_mark *)NULL == tm ) { - releaseArenaLock(); - PORT_SetError(SEC_ERROR_NO_MEMORY); - return (void *)NULL; - } - - tm->mark = result; - tm->next = (threadmark_mark *)NULL; - - pw = &tarena->first_mark; - while( (threadmark_mark *)NULL != *pw ) { - pw = &(*pw)->next; - } - - *pw = tm; - } else { - /* a "pure" NSPR arena */ - result = PL_ARENA_MARK(arena); - } - } + { + threadmark_mark *tm, **pw; + PRThread * currentThread = PR_GetCurrentThread(); + + if (! pool->marking_thread ) { + /* First mark */ + pool->marking_thread = currentThread; + } else if (currentThread != pool->marking_thread ) { + PZ_Unlock(pool->lock); + PORT_SetError(SEC_ERROR_NO_MEMORY); + PORT_Assert(0); + return NULL; + } + + result = PL_ARENA_MARK(arena); + PL_ARENA_ALLOCATE(tm, arena, sizeof(threadmark_mark)); + if (!tm) { + PZ_Unlock(pool->lock); + PORT_SetError(SEC_ERROR_NO_MEMORY); + return NULL; + } + + tm->mark = result; + tm->next = (threadmark_mark *)NULL; + + pw = &pool->first_mark; + while( *pw ) { + pw = &(*pw)->next; + } + + *pw = tm; + } #else /* THREADMARK */ - result = PL_ARENA_MARK(arena); + result = PL_ARENA_MARK(arena); #endif /* THREADMARK */ - releaseArenaLock(); + PZ_Unlock(pool->lock); + } else { + /* a "pure" NSPR arena */ + result = PL_ARENA_MARK(arena); + } return result; } void PORT_ArenaRelease(PLArenaPool *arena, void *mark) { - getArenaLock(); + PORTArenaPool *pool = (PORTArenaPool *)arena; + if (ARENAPOOL_MAGIC == pool->magic ) { + PZ_Lock(pool->lock); #ifdef THREADMARK - { - threadmark_arena *tarena = (threadmark_arena *)arena; - if( THREADMARK_MAGIC == tarena->magic ) { - threadmark_mark **pw, *tm; - - if( PR_GetCurrentThread() != tarena->marking_thread ) { - releaseArenaLock(); - PORT_SetError(SEC_ERROR_NO_MEMORY); - PORT_Assert(0); - return /* no error indication available */ ; - } - - pw = &tarena->first_mark; - while( ((threadmark_mark *)NULL != *pw) && (mark != (*pw)->mark) ) { - pw = &(*pw)->next; - } - - if( (threadmark_mark *)NULL == *pw ) { - /* bad mark */ - releaseArenaLock(); - PORT_SetError(SEC_ERROR_NO_MEMORY); - PORT_Assert(0); - return /* no error indication available */ ; - } - - tm = *pw; - *pw = (threadmark_mark *)NULL; - - PL_ARENA_RELEASE(arena, mark); - - if( (threadmark_mark *)NULL == tarena->first_mark ) { - tarena->marking_thread = (PRThread *)NULL; - } - } else { - PL_ARENA_RELEASE(arena, mark); - } - } + { + threadmark_mark **pw, *tm; + + if (PR_GetCurrentThread() != pool->marking_thread ) { + PZ_Unlock(pool->lock); + PORT_SetError(SEC_ERROR_NO_MEMORY); + PORT_Assert(0); + return /* no error indication available */ ; + } + + pw = &pool->first_mark; + while( *pw && (mark != (*pw)->mark) ) { + pw = &(*pw)->next; + } + + if (! *pw ) { + /* bad mark */ + PZ_Unlock(pool->lock); + PORT_SetError(SEC_ERROR_NO_MEMORY); + PORT_Assert(0); + return /* no error indication available */ ; + } + + tm = *pw; + *pw = (threadmark_mark *)NULL; + + PL_ARENA_RELEASE(arena, mark); + + if (! pool->first_mark ) { + pool->marking_thread = (PRThread *)NULL; + } + } #else /* THREADMARK */ - PL_ARENA_RELEASE(arena, mark); + PL_ARENA_RELEASE(arena, mark); #endif /* THREADMARK */ - releaseArenaLock(); + PZ_Unlock(pool->lock); + } else { + PL_ARENA_RELEASE(arena, mark); + } } void PORT_ArenaUnmark(PLArenaPool *arena, void *mark) { #ifdef THREADMARK - getArenaLock(); - { - threadmark_arena *tarena = (threadmark_arena *)arena; - if( THREADMARK_MAGIC == tarena->magic ) { - threadmark_mark **pw, *tm; - - if( PR_GetCurrentThread() != tarena->marking_thread ) { - releaseArenaLock(); - PORT_SetError(SEC_ERROR_NO_MEMORY); - PORT_Assert(0); - return /* no error indication available */ ; - } - - pw = &tarena->first_mark; - while( ((threadmark_mark *)NULL != *pw) && (mark != (*pw)->mark) ) { - pw = &(*pw)->next; - } - - if( (threadmark_mark *)NULL == *pw ) { - /* bad mark */ - releaseArenaLock(); - PORT_SetError(SEC_ERROR_NO_MEMORY); - PORT_Assert(0); - return /* no error indication available */ ; - } - - tm = *pw; - *pw = (threadmark_mark *)NULL; - - if( (threadmark_mark *)NULL == tarena->first_mark ) { - tarena->marking_thread = (PRThread *)NULL; - } - } else { - PL_ARENA_RELEASE(arena, mark); - } + PORTArenaPool *pool = (PORTArenaPool *)arena; + if (ARENAPOOL_MAGIC == pool->magic ) { + threadmark_mark **pw, *tm; + + PZ_Lock(pool->lock); + + if (PR_GetCurrentThread() != pool->marking_thread ) { + PZ_Unlock(pool->lock); + PORT_SetError(SEC_ERROR_NO_MEMORY); + PORT_Assert(0); + return /* no error indication available */ ; + } + + pw = &pool->first_mark; + while( ((threadmark_mark *)NULL != *pw) && (mark != (*pw)->mark) ) { + pw = &(*pw)->next; + } + + if ((threadmark_mark *)NULL == *pw ) { + /* bad mark */ + PZ_Unlock(pool->lock); + PORT_SetError(SEC_ERROR_NO_MEMORY); + PORT_Assert(0); + return /* no error indication available */ ; + } + + tm = *pw; + *pw = (threadmark_mark *)NULL; + + if (! pool->first_mark ) { + pool->marking_thread = (PRThread *)NULL; + } + + PZ_Unlock(pool->lock); } - releaseArenaLock(); #endif /* THREADMARK */ } @@ -482,9 +456,7 @@ PORT_ArenaStrdup(PLArenaPool *arena, char *str) { int len = PORT_Strlen(str)+1; char *newstr; - getArenaLock(); newstr = (char*)PORT_ArenaAlloc(arena,len); - releaseArenaLock(); if (newstr) { PORT_Memcpy(newstr,str,len); } diff --git a/security/nss/macbuild/NSS.mcp b/security/nss/macbuild/NSS.mcp Binary files differindex 1d2a0c84a..3307eb25f 100755 --- a/security/nss/macbuild/NSS.mcp +++ b/security/nss/macbuild/NSS.mcp diff --git a/security/nss/makefile.win b/security/nss/makefile.win index 943edd461..3d5ba790a 100644 --- a/security/nss/makefile.win +++ b/security/nss/makefile.win @@ -42,30 +42,9 @@ include <$(DEPTH)\config\config.mak> GMAKE = gmake.exe -GMAKE_FLAGS = OBJDIR_NAME=$(OBJDIR) MOZILLA_CLIENT=1 +MOZ_SRC_FLIPPED = $(MOZ_SRC:\=/) # -# The Client's debug build uses MSVC's debug runtime library (/MDd). -# - -!ifndef MOZ_DEBUG -GMAKE_FLAGS = $(GMAKE_FLAGS) BUILD_OPT=1 -!endif - -!if "$(MOZ_BITS)" == "16" -GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN16 -!else - -GMAKE_FLAGS = $(GMAKE_FLAGS) OS_TARGET=WIN95 -!ifdef MOZ_DEBUG -!ifndef MOZ_NO_DEBUG_RTL -GMAKE_FLAGS = $(GMAKE_FLAGS) USE_DEBUG_RTL=1 -!endif -!endif - -!endif - -# # The rules. Simply invoke gmake with the same target. # The default target is 'all'. For Win16, set up the # environment to use the Watcom compiler, Watcom headers, @@ -79,17 +58,7 @@ install:: moz_import install_roots depend:: export libs install clobber clobber_all clean:: -!if "$(MOZ_BITS)" == "16" - set PATH=%WATCPATH% - set INCLUDE=%WATC_INC% - set LIB=%WATC_LIB% -!endif - $(GMAKE) -C lib $(GMAKE_FLAGS) $@ -!if "$(MOZ_BITS)" == "16" - set PATH=%MSVCPATH% - set INCLUDE=%MSVC_INC% - set LIB=%MSVC_LIB% -!endif + $(GMAKE) -f gmakefile.win $@ MOZ_SRC_FLIPPED=$(MOZ_SRC_FLIPPED) moz_import:: copy $(DIST)\lib\dbm32.lib $(DIST)\lib\dbm.lib diff --git a/security/nss/makefiles b/security/nss/makefiles new file mode 100644 index 000000000..744234a39 --- /dev/null +++ b/security/nss/makefiles @@ -0,0 +1,61 @@ +Makefile +cmd/Makefile +cmd/SSLsample/Makefile +cmd/atob/Makefile +cmd/bltest/Makefile +cmd/btoa/Makefile +cmd/certcgi/Makefile +cmd/certutil/Makefile +cmd/checkcert/Makefile +cmd/crlutil/Makefile +cmd/crmf-cgi/Makefile +cmd/crmftest/Makefile +cmd/dbck/Makefile +cmd/derdump/Makefile +cmd/digest/Makefile +cmd/keyutil/Makefile +cmd/lib/Makefile +cmd/makepqg/Makefile +cmd/modutil/Makefile +cmd/ocspclnt/Makefile +cmd/oidcalc/Makefile +cmd/p7content/Makefile +cmd/p7env/Makefile +cmd/p7sign/Makefile +cmd/p7verify/Makefile +cmd/pk12util/Makefile +cmd/pp/Makefile +cmd/sdrtest/Makefile +cmd/selfserv/Makefile +cmd/signtool/Makefile +cmd/signver/Makefile +cmd/smimetools/Makefile +cmd/sslstrength/Makefile +cmd/ssltap/Makefile +cmd/strsclnt/Makefile +cmd/swfort/Makefile +cmd/swfort/instinit/Makefile +cmd/swfort/newuser/Makefile +cmd/tstclnt/Makefile +cmd/zlib/Makefile +lib/Makefile +lib/base/Makefile +lib/certdb/Makefile +lib/certhigh/Makefile +lib/ckfw/Makefile +lib/ckfw/builtins/Makefile +lib/crmf/Makefile +lib/cryptohi/Makefile +lib/fortcrypt/Makefile +lib/fortcrypt/swfort/Makefile +lib/fortcrypt/swfort/pkcs11/Makefile +lib/freebl/Makefile +lib/jar/Makefile +lib/nss/Makefile +lib/pk11wrap/Makefile +lib/pkcs12/Makefile +lib/pkcs7/Makefile +lib/smime/Makefile +lib/softoken/Makefile +lib/ssl/Makefile +lib/util/Makefile diff --git a/security/nss/manifest.mn b/security/nss/manifest.mn index 3a015d503..1bdd76124 100644 --- a/security/nss/manifest.mn +++ b/security/nss/manifest.mn @@ -30,15 +30,17 @@ # may use your version of this file under either the MPL or the # GPL. # -CORE_DEPTH = .. -DEPTH = .. +MOD_DEPTH = . +DEPTH = . IMPORTS = nspr20/$(NSPR_IMPORT_VERSION) \ - dbm/DBM_1_54 \ + dbm/DBM_1_55 \ $(NULL) RELEASE = security -DIRS = lib cmd - +DIRS = coreconf lib +ifdef ENABLE_CMD +DIRS += cmd +endif diff --git a/security/nss/secmakefiles.sh b/security/nss/secmakefiles.sh new file mode 100755 index 000000000..578ca7332 --- /dev/null +++ b/security/nss/secmakefiles.sh @@ -0,0 +1,59 @@ +#! /bin/sh +# +# The contents of this file are subject to the Netscape Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/NPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1999 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# + +# allmakefiles.sh - List of all makefiles. +# Appends the list of makefiles to the variable, MAKEFILES. +# There is no need to rerun autoconf after adding makefiles. +# You only need to run configure. +# +# Please keep the modules in this file in sync with those in +# mozilla/build/unix/modules.mk +# + +MAKEFILES="" + +# add_makefiles - Shell function to add makefiles to MAKEFILES +add_makefiles() { + MAKEFILES="$MAKEFILES $*" +} + +if [ "$srcdir" = "" ]; then + srcdir=. +fi + +# +# Common makefiles used by everyone +# + +MAKEFILES_coreconf=" +coreconf/autoconf.mk:../coreconf/autoconf.mk.in +coreconf/Makefile:../coreconf/Makefile.in +coreconf/mkdepend/Makefile:../coreconf/mkdepend/Makefile.in +coreconf/nsinstall/Makefile:../coreconf/nsinstall/Makefile.in +" + +MAKEFILES_nss=`cat ${srcdir}/makefiles` + +add_makefiles " +$MAKEFILES_coreconf +$MAKEFILES_nss +" diff --git a/security/nss/tests/cert/cert.sh b/security/nss/tests/cert/cert.sh index aa378f24e..c8ff11986 100755 --- a/security/nss/tests/cert/cert.sh +++ b/security/nss/tests/cert/cert.sh @@ -154,10 +154,7 @@ cert_init_cert() # local shell function to create client certs # initialize DB, import # root cert -# generate request -# sign request -# import Cert -# +# add cert to DB ######################################################################## cert_create_cert() { @@ -175,6 +172,19 @@ cert_create_cert() if [ "$RET" -ne 0 ]; then return $RET fi + cert_add_cert + return $? +} + +############################# cert_add_cert ############################ +# local shell function to add client certs to an existing CERT DB +# generate request +# sign request +# import Cert +# +######################################################################## +cert_add_cert() +{ CU_ACTION="Generate Cert Request for $CERTNAME" CU_SUBJECT="CN=$CERTNAME, E=${CERTNAME}@bogus.com, O=BOGUS NSS, L=Mountain View, ST=California, C=US" @@ -323,8 +333,8 @@ cert_ssl() cert_create_cert ${CLIENTDIR} "TestUser" 6 echo "$SCRIPTNAME: Creating Server CA Issued Certificate for \\" - echo " ${HOST}.${DOMSUF} ------------------------------------" - cert_init_cert ${SERVERDIR} "${HOST}.${DOMSUF}" 1 + echo " ${HOSTADDR} ------------------------------------" + cert_init_cert ${SERVERDIR} "${HOSTADDR}" 1 cp ${CADIR}/*.db . CU_ACTION="Creating ${CERTNAME}'s Server Cert" CU_SUBJECT="CN=${CERTNAME}, O=BOGUS Netscape, L=Mountain View, ST=California, C=US" @@ -341,6 +351,37 @@ cert_ssl() cert_log "SUCCESS: SSL passed" fi } +############################## cert_stresscerts ################################ +# local shell function to create client certs for SSL stresstest +######################################################################## +cert_stresscerts() +{ + + ############### Creating Certs for SSL stress test ####################### + # + CERTDIR="$CLIENTDIR" + cd "${CERTDIR}" + + CERTFAILED=0 + echo "$SCRIPTNAME: Creating Client CA Issued Certificates ===============" + + CONTINUE=$GLOB_MAX_CERT + CERTSERIAL=10 + + while [ $CONTINUE -ge $GLOB_MIN_CERT ] + do + CERTNAME="TestUser$CONTINUE" + cert_add_cert ${CLIENTDIR} "TestUser$CONTINUE" $CERTSERIAL + CERTSERIAL=`expr $CERTSERIAL + 1 ` + CONTINUE=`expr $CONTINUE - 1 ` + done + if [ "$CERTFAILED" != 0 ] ; then + cert_log "ERROR: StressCert failed $RET" + else + cert_log "SUCCESS: StressCert passed" + fi +} + ############################## cert_cleanup ############################ # local shell function to finish this script (no exit since it might be @@ -356,8 +397,15 @@ cert_cleanup() ################## main ################################################# -cert_init -cert_CA -cert_smime_client -cert_ssl +cert_init +cert_CA +cert_ssl +cert_smime_client +if [ -n "$DO_DIST_ST" -a "$DO_DIST_ST" = "TRUE" ] ; then + cert_stresscerts + #following lines to be used when databases are to be reused + #cp -r /u/sonmi/tmp/stress/kentuckyderby.13/* $HOSTDIR + #cp -r $HOSTDIR/../clio.8/* $HOSTDIR + +fi cert_cleanup diff --git a/security/nss/tests/common/init.sh b/security/nss/tests/common/init.sh index f7d07f9ef..78db19ffb 100644 --- a/security/nss/tests/common/init.sh +++ b/security/nss/tests/common/init.sh @@ -149,17 +149,19 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then OS_ARCH=`(cd $COMMON; gmake os_arch)` OS_NAME=`uname -s | sed -e "s/-[0-9]*\.[0-9]*//"` - if [ "${OS_ARCH}" = "WINNT" -a "$OS_NAME" != "CYGWIN_NT" ]; then - PATH=${DIST}/${OBJDIR}/bin\;${DIST}/${OBJDIR}/lib\;$PATH - PATH=`perl ../path_uniq -d ';' "$PATH"` - else - PATH=${DIST}/${OBJDIR}/bin:${DIST}/${OBJDIR}/lib:$PATH - PATH=`perl ../path_uniq -d ':' "$PATH"` - fi + if [ -z "${DON_T_SET_PATHS}" -o "${DON_T_SET_PATHS}" != "TRUE" ] ; then + if [ "${OS_ARCH}" = "WINNT" -a "$OS_NAME" != "CYGWIN_NT" ]; then + PATH=${DIST}/${OBJDIR}/bin\;${DIST}/${OBJDIR}/lib\;$PATH + PATH=`perl ../path_uniq -d ';' "$PATH"` + else + PATH=${DIST}/${OBJDIR}/bin:${DIST}/${OBJDIR}/lib:$PATH + PATH=`perl ../path_uniq -d ':' "$PATH"` + fi - LD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib - SHLIB_PATH=${DIST}/${OBJDIR}/lib - LIBPATH=${DIST}/${OBJDIR}/lib + LD_LIBRARY_PATH=${DIST}/${OBJDIR}/lib + SHLIB_PATH=${DIST}/${OBJDIR}/lib + LIBPATH=${DIST}/${OBJDIR}/lib + fi if [ ! -d "${TESTDIR}" ]; then echo "$SCRIPTNAME init: Creating ${TESTDIR}" @@ -173,7 +175,7 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then ?*) ;; *) - echo "$SCRIPTNAME: HOST environment variable is not defined." + echo "$SCRIPTNAME: Fatal HOST environment variable is not defined." exit 1 #does not need to be Exit, very early in script ;; esac @@ -181,16 +183,36 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then if [ -z "${DOMSUF}" ]; then DOMSUF=`domainname` if [ -z "${DOMSUF}" ]; then - echo "$SCRIPTNAME: DOMSUF environment variable is not defined." + echo "$SCRIPTNAME: Fatal DOMSUF env. variable is not defined." exit 1 #does not need to be Exit, very early in script fi fi + if [ -z "$USE_IP" -o "$USE_IP" != "TRUE" ] ; then + HOSTADDR=${HOST}.${DOMSUF} + else + HOSTADDR=${IP_ADDRESS} + fi -#NOTE - this HOSTDIR migh not be set at the time of this test!!! -# the original had a -s maybe meant -z???? - first replaced it with -d -#which worked, but resulted in [ ! -d "" ] which doesn't make a lot of sense + #if running remote side of the distributed stress test we need to use the files that + #the server side gives us... + if [ -n "$DO_REM_ST" -a "$DO_REM_ST" = "TRUE" ] ; then + for w in `ls -rtd ${TESTDIR}/${HOST}.[0-9]* 2>/dev/null | + sed -e "s/.*${HOST}.//"` ; do + version=$w + done + HOSTDIR=${TESTDIR}/${HOST}.$version + echo "$SCRIPTNAME init: HOSTDIR $HOSTDIR" + echo $HOSTDIR + if [ ! -d $HOSTDIR ] ; then + echo "$SCRIPTNAME: Fatal: Remote side of dist. stress test " + echo " - server HOSTDIR $HOSTDIR does not exist" + exit 1 #does not need to be Exit, very early in script + fi + fi - if [ -z "${HOSTDIR}" ]; then + if [ -n "${HOSTDIR}" ]; then + version=`echo $HOSTDIR | sed -e "s/.*${HOST}.//"` + else if [ -f "${TESTDIR}/${HOST}" ]; then version=`cat ${TESTDIR}/${HOST}` else @@ -213,6 +235,12 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then mkdir -p ${HOSTDIR} fi + if [ -z "${LOGFILE}" ]; then + LOGFILE=${HOSTDIR}/output.log + fi + if [ ! -f "${LOGFILE}" ]; then + touch ${LOGFILE} + fi if [ -z "${RESULTS}" ]; then RESULTS=${HOSTDIR}/results.html fi @@ -220,21 +248,28 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then cp ${COMMON}/results_header.html ${RESULTS} html "<H4>Platform: ${OBJDIR}<BR>" html "Test Run: ${HOST}.$version</H4>" + html "${BC_ACTION}" html "<HR><BR>" html "<HTML><BODY>" - echo "********************************************" - echo " Platform: ${OBJDIR}" - echo " Results: ${HOST}.$version" - echo "********************************************" - fi - if [ -z "${LOGFILE}" ]; then - LOGFILE=${HOSTDIR}/output.log - fi - if [ ! -f "${LOGFILE}" ]; then - touch ${LOGFILE} + echo "********************************************" | tee ${LOGFILE} + echo " Platform: ${OBJDIR}" | tee ${LOGFILE} + echo " Results: ${HOST}.$version" | tee ${LOGFILE} + echo "********************************************" | tee ${LOGFILE} + echo "$BC_ACTION" | tee ${LOGFILE} + #if running remote side of the distributed stress test let the user know who it is... + elif [ -n "$DO_REM_ST" -a "$DO_REM_ST" = "TRUE" ] ; then + echo "********************************************" | tee ${LOGFILE} + echo " Platform: ${OBJDIR}" | tee ${LOGFILE} + echo " Results: ${HOST}.$version" | tee ${LOGFILE} + echo " remote side of distributed stress test " | tee ${LOGFILE} + echo " `uname -n -s`" | tee ${LOGFILE} + echo "********************************************" | tee ${LOGFILE} fi + echo "$SCRIPTNAME init: Testing PATH $PATH against LIB $LD_LIBRARY_PATH" | + tee ${LOGFILE} + KILL="kill" if [ "${OS_ARCH}" = "Linux" ]; then SLEEP="sleep 30" @@ -244,6 +279,16 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then else PS="ps" fi + #found 3 rsh's so far that do not work as expected - cygnus mks6 (restricted sh) and mks 7 + if [ -z "$RSH" ]; then + if [ "${OS_ARCH}" = "WINNT" -a "$OS_NAME" = "CYGWIN_NT" ]; then + RSH=/cygdrive/c/winnt/system32/rsh + elif [ "${OS_ARCH}" = "WINNT" ]; then + RSH=c:/winnt/system32/rsh + else + RSH=rsh + fi + fi CURDIR=`pwd` @@ -289,11 +334,23 @@ if [ -z "${INIT_SOURCED}" -o "${INIT_SOURCED}" != "TRUE" ]; then trap "Exit $0 Signal_caught" 2 3 export PATH LD_LIBRARY_PATH SHLIB_PATH LIBPATH - export DOMSUF + export DOMSUF HOSTADDR export KILL SLEEP PS export MOZILLA_ROOT SECURITY_ROOT DIST TESTDIR OBJDIR HOSTDIR QADIR export LOGFILE SCRIPTNAME + if [ -z "$GLOB_MIN_CERT" ] ; then + GLOB_MIN_CERT=0 + fi + if [ -z "$GLOBMAX_CERT" ] ; then + GLOB_MAX_CERT=200 + fi + if [ -z "$MIN_CERT" ] ; then + MIN_CERT=$GLOB_MIN_CERT + fi + if [ -z "$MAX_CERT" ] ; then + MAX_CERT=$GLOB_MAX_CERT + fi SCRIPTNAME=$0 INIT_SOURCED=TRUE #whatever one does - NEVER export this one please diff --git a/security/nss/tests/header b/security/nss/tests/header index f39bddeb9..47c111ddd 100644 --- a/security/nss/tests/header +++ b/security/nss/tests/header @@ -15,7 +15,7 @@ # # parameters # ---------- -# nssversion (supported: 30b, 31, tip) +# nssversion (supported: 30b, 31, tip 32) # builddate (default - today) # # options @@ -156,6 +156,11 @@ then # want the init to wait forever for directories to WIN_WAIT_FOREVER=OFF fi +if [ -z "$BC_MASTER" ] # master directory for backwardscompatibility testing +then + BC_MASTER="20010212.1.nss32_rtm" +fi + EARLY_EXIT=TRUE #before the report file has been created, causes Exit to #create it @@ -329,7 +334,6 @@ set_files() write_to_tmpfile() { O_CRONFILE=ON - Debug "Writing to the TMPFILE" O_FILE=ON FILENAME=${TMP}/nsstmp.$$ # for now write to the temporary file # since we don't know the hostname yet @@ -414,8 +418,8 @@ eval_opts() NSSVER=$1 if [ -z "$NSSVER" ] then - NSSVER="tip" - Debug "NSS Version: Parameters missing - defaulting to tip!" + NSSVER="32" + Debug "NSS Version: Parameters missing - defaulting to 32!" else BUILDDATE=$2 if [ -z "$BUILDDATE" ] @@ -431,8 +435,6 @@ eval_opts() shift done - Debug "Builddate $BUILDDATE NssVersion $NSSVER" - if [ -z "$BUILDDATE" ] then BUILDDATE=`date +%m%d` @@ -440,8 +442,8 @@ eval_opts() fi if [ -z "$NSSVER" ] then - NSSVER="tip" - Debug "NSS Version: Parameters missing - defaulting to tip!" + NSSVER="32" + Debug "NSS Version: Parameters missing - defaulting to 32!" fi Debug "Builddate $BUILDDATE NssVersion $NSSVER" @@ -580,20 +582,76 @@ set_objdir() #at this point $MASTEBUILD is be either NT or unix LOCALDIST=${D1}/builds/${QAYEAR}${BUILDDATE}.${BUILDNUMBER}/${MASTERBUILD}/mozilla/dist + BCDIST=${D1}/builds/${BC_MASTER}/${MASTERBUILD}/mozilla/dist LOCALDIST_BIN=${LOCALDIST}/${OBJDIR}/bin DIST=$LOCALDIST -#FIXME - test so PATH won't contai it double - PATH=$TESTSCRIPTDIR:$LOCALDIST_BIN:$BASEPATH + if [ -z "${TEST_LEVEL}" ] ; then + TEST_LEVEL=0 + fi + bc ${TEST_LEVEL} #set the path for the backward compatibility test + PATH_CONTAINS_BIN="TRUE" export PATH_CONTAINS_BIN - Debug "Path after set_objdir $PATH" - Debug "PATH $PATH" + export OBJDIR OS_ARCH LOCALDIST LOCALDIST_BIN DIST PATH BCDIST +} - export OBJDIR OS_ARCH LOCALDIST LOCALDIST_BIN DIST PATH +########################### bc ######################################### +# global shell function , sets paths for the backward compatibility test +######################################################################## +bc() +{ + DON_T_SET_PATHS="TRUE" + case $1 in + 0) + if [ "$O_WIN" = "ON" -a "$O_CYGNUS" != ON ] ; then + PATH="$TESTSCRIPTDIR;$LOCALDIST_BIN;$BASEPATH" + else + PATH=$TESTSCRIPTDIR:$LOCALDIST_BIN:$BASEPATH + fi + BC_ACTION="" + DON_T_SET_PATHS="FALSE" #let init.sh override - FIXME - check if necessary + ;; + 1) + BC_ACTION="backward compatibility against shlibs in $BC_MASTER" + LD_LIBRARY_PATH=${BCDIST}/${OBJDIR}/lib + if [ "$O_WIN" = "ON" ] ; then + if [ "$O_CYGNUS" = ON ] ; then + PATH=$TESTSCRIPTDIR:$LOCALDIST_BIN:$BASEPATH:$LD_LIBRARY_PATH + else + PATH="$TESTSCRIPTDIR;$LOCALDIST_BIN;$BASEPATH;$LD_LIBRARY_PATH" + fi + else + PATH=$TESTSCRIPTDIR:$LOCALDIST_BIN:$BASEPATH + fi + Debug "1st stage of backward compatibility test" + ;; + *) + BC_ACTION="forward compatibility of binaries in $BC_MASTER" + BCDIST_BIN=${BCDIST}/${OBJDIR}/bin + LD_LIBRARY_PATH=${LOCALDIST}/${OBJDIR}/lib + if [ "$O_WIN" = "ON" ] ; then + if [ "$O_CYGNUS" = ON ] ; then + PATH=$TESTSCRIPTDIR:$BCDIST_BIN:$BASEPATH:$LD_LIBRARY_PATH + else + PATH="$TESTSCRIPTDIR;$BCDIST_BIN;$BASEPATH;$LD_LIBRARY_PATH" + fi + else + PATH=$TESTSCRIPTDIR:$BCDIST_BIN:$BASEPATH + fi + Debug "2nd stage of backward compatibility test" + ;; + esac + SHLIB_PATH=${LD_LIBRARY_PATH} + LIBPATH=${LD_LIBRARY_PATH} + Debug "PATH $PATH" + Debug "LD_LIBRARY_PATH $LD_LIBRARY_PATH" + export PATH LD_LIBRARY_PATH SHLIB_PATH LIBPATH + export DON_T_SET_PATHS BC_ACTION } + ########################### Ps ######################################### # global shell function , attempts a platform specific ps ######################################################################## @@ -710,7 +768,7 @@ Exit() then cat $FILENAME | rmail $MAILINGLIST fi - rm $FILENAME 2>/dev/null + #rm $FILENAME 2>/dev/null elif [ $O_MAIL = "ON" -a $EARLY_EXIT = TRUE ] then early_exit "$1" diff --git a/security/nss/tests/nssqa b/security/nss/tests/nssqa index 6bac0ce21..979f3d2db 100755 --- a/security/nss/tests/nssqa +++ b/security/nss/tests/nssqa @@ -252,11 +252,21 @@ nssqa_main() } -if [ $O_FILE = ON ] -then - nssqa_main 2>>$FILENAME -else - nssqa_main -fi +#FIXME start TEST_LEVEL with 0 + +TEST_LEVEL=0 + +while [ $TEST_LEVEL -lt 3 ] ; do + unset BUILD_OPT;export BUILD_OPT;Debug "BUILD_OPT $BUILD_OPT" + unset USE_64;export USE_64;Debug "USE_64 $USE_64" + bc $TEST_LEVEL + if [ $O_FILE = ON ] + then + nssqa_main 2>>$FILENAME + else + nssqa_main + fi + TEST_LEVEL=`expr $TEST_LEVEL + 1 ` +done Exit "Done." diff --git a/security/nss/tests/qa_stat b/security/nss/tests/qa_stat index 301479510..8b5b58f58 100755 --- a/security/nss/tests/qa_stat +++ b/security/nss/tests/qa_stat @@ -341,6 +341,18 @@ qa_errorlist() grep -v '0 cache hits; 1 cache misses, 0 cache not reusable' | grep -v '0 cache hits; 0 cache misses, 0 cache not reusable' | grep -v ' cache hits; 1 cache misses, 0 cache not reusable' + grep -i error */output.log | + grep -vi "write to SSL socket" | + grep -vi "HDX PR_Read returned error" | + grep -vi "no error" | + grep -vi "12285" + grep -i failed */output.log | + grep -vi "write to SSL socket" | + grep -vi "peer cannot verify" | + grep -vi "error" | + grep -vi "fatal" | + grep -vi "TCP connection reset" + grep -i fatal */output.log #grep -v '999 cache hits; 1 cache misses, 0 cache not reusable' #if [ "$1" = "1" ] #then diff --git a/security/nss/tests/set_environment b/security/nss/tests/set_environment index 13dedabc4..7489668e5 100644 --- a/security/nss/tests/set_environment +++ b/security/nss/tests/set_environment @@ -20,10 +20,6 @@ then QASCRIPT_DIR=`dirname $0` fi - -#FIXME - where do we need the OLDPATH - -OLDPATH="$PATH" PATH=.:$HOME/bin:/tools/ns/bin:/bin:/usr/bin:/usr/sbin:/usr/ccs/bin:/usr/dist/local/exe:/usr/bin/X11:/usr/audio/bin:/u/sonmi/bin:$PATH CVSROOT=:pserver:svbld@cvsserver:/m/src @@ -119,20 +115,18 @@ then os_name="Windows" O_CYGNUS=ON O_WIN=ON - OLDPATH=`echo "$OLDPATH" | sed -e 's/\\\/\//g'` PATH="`dirname $0`:.:/cygdrive/c/cygwin/bin:/cygdrive/z/nstools/bin:/cygdrive/z/nstools/perl5:/cygdrive/z/bin:/cygdrive/c/WINNT/System32:/cygdrive/c/WINNT" -#:$OLDPATH: RM=/cygdrive/c/cygwin/bin/rm.exe #FIXME - in case we cant cporrect #these with the PATH alone PATH=`perl $QASCRIPT_DIR/path_uniq "$PATH"` + RSH=/cygdrive/c/winnt/system32/rsh elif [ "$os_name" = "Windows_95" -o \ "$os_name" = "Windows_NT" -o \ "$os_name" = "WINNT" -o \ + "$os_name" = "Windows" -o \ "$os_name" = "Windows_98" ] then #FIXME net use, mount the neccessary pnetwork drives and partitiones first - #OLDPATH=`echo "$OLDPATH" | sed -e 's/\\\/\//g'` FIXME - MKS shell - # interprets \bin as <backspace>in... PATH=`echo $SHELL | sed -e "s/.ksh.exe//g" -e "s/.sh.exe//g"` PATH="Z:/nstools/bin;Z:/nstools/perl5;z:/bin;$PATH" @@ -149,6 +143,7 @@ then os_name="Windows" O_MKS=ON O_WIN=ON + RSH=c:/winnt/system32/rsh else EDITOR=vi @@ -158,6 +153,7 @@ else XMCD_LIBDIR=/usr/local/lib/xmcd DISPLAY=:0.0 PATH=`perl $QASCRIPT_DIR/path_uniq "$PATH"` + RSH=rsh fi BASEPATH=$PATH # in case we we set and reset DIST directories the PATH diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh index 399334db9..7d0539ea4 100755 --- a/security/nss/tests/ssl/ssl.sh +++ b/security/nss/tests/ssl/ssl.sh @@ -94,6 +94,7 @@ ssl_init() #fileout=1 #verbose="-v" #FIXME - see where this is usefull cd ${CLIENTDIR} + } ########################### is_selfserv_alive ########################## @@ -157,15 +158,15 @@ start_selfserv() echo "$SCRIPTNAME: $testname ----" fi sparam=`echo $sparam | sed -e 's;_; ;g'` - echo "selfserv -p ${PORT} -d ${R_SERVERDIR} -n ${HOST}.${DOMSUF} \\" + echo "selfserv -p ${PORT} -d ${R_SERVERDIR} -n ${HOSTADDR} \\" echo " -w nss ${sparam} -i ${R_SERVERPID} $verbose &" echo "selfserv started at `date`" if [ ${fileout} -eq 1 ]; then - selfserv -p ${PORT} -d ${R_SERVERDIR} -n ${HOST}.${DOMSUF} \ + selfserv -p ${PORT} -d ${R_SERVERDIR} -n ${HOSTADDR} \ -w nss ${sparam} -i ${R_SERVERPID} $verbose \ > ${SERVEROUTFILE} 2>&1 & else - selfserv -p ${PORT} -d ${R_SERVERDIR} -n ${HOST}.${DOMSUF} \ + selfserv -p ${PORT} -d ${R_SERVERDIR} -n ${HOSTADDR} \ -w nss ${sparam} -i ${R_SERVERPID} $verbose & fi wait_for_selfserv @@ -258,9 +259,9 @@ ssl_stress() start_selfserv echo "strsclnt -p ${PORT} -d . -w nss $cparam $verbose \\" - echo " ${HOST}.${DOMSUF}" + echo " ${HOSTADDR}" echo "strsclnt started at `date`" - strsclnt -p ${PORT} -d . -w nss $cparam $verbose ${HOST}.${DOMSUF} + strsclnt -p ${PORT} -d . -w nss $cparam $verbose ${HOSTADDR} echo "strsclnt completed at `date`" html_msg $? $value "${testname}" @@ -271,6 +272,7 @@ ssl_stress() html "</TABLE><BR>" } + ############################## ssl_cleanup ############################# # local shell function to finish this script (no exit since it might be # sourced) @@ -284,8 +286,12 @@ ssl_cleanup() ################## main ################################################# -ssl_init -ssl_cov -ssl_auth -ssl_stress -ssl_cleanup +#this script may be sourced from the distributed stress test - in this case do nothing... + +if [ -z "$DO_REM_ST" -a -z "$DO_DIST_ST" ] ; then + ssl_init + ssl_cov + ssl_auth + ssl_stress + ssl_cleanup +fi diff --git a/security/nss/tests/ssl/ssl_dist_stress.sh b/security/nss/tests/ssl/ssl_dist_stress.sh new file mode 100755 index 000000000..9a5cb63af --- /dev/null +++ b/security/nss/tests/ssl/ssl_dist_stress.sh @@ -0,0 +1,344 @@ +#! /bin/sh +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Netscape security libraries. +# +# The Initial Developer of the Original Code is Netscape +# Communications Corporation. Portions created by Netscape are +# Copyright (C) 1994-2000 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the +# terms of the GNU General Public License Version 2 or later (the +# "GPL"), in which case the provisions of the GPL are applicable +# instead of those above. If you wish to allow use of your +# version of this file only under the terms of the GPL and not to +# allow others to use your version of this file under the MPL, +# indicate your decision by deleting the provisions above and +# replace them with the notice and other provisions required by +# the GPL. If you do not delete the provisions above, a recipient +# may use your version of this file under either the MPL or the +# GPL. +# +# +######################################################################## +# +# mozilla/security/nss/tests/ssl/ssl_dist_stress.sh +# +# Script to test NSS SSL - distributed stresstest - this script needs to +# source the regular ssl.sh (for shellfunctions, certs and variables +# initialisation) +# create certs +# start server +# start itself via rsh on different systems to connect back to the server +# +# +# needs to work on all Unix and Windows platforms +# +# special strings +# --------------- +# FIXME ... known problems, search for this string +# NOTE .... unexpected behavior +# +# FIXME _ don't know yet how long to wait until the server needs to be killed +# especially on NT +# +######################################################################## + +############################## ssl_ds_init ############################# +# local shell function to initialize this script +######################################################################## +ssl_ds_init() +{ + if [ -z "$GLOB_MIN_CERT" ] ; then + GLOB_MIN_CERT=0 + fi + if [ -z "$GLOBMAX_CERT" ] ; then + GLOB_MAX_CERT=200 + fi + IP_PARAM="" + CD_QADIR_SSL="" + + + if [ -n "$1" ] ; then + ssl_ds_eval_opts $* + fi + SCRIPTNAME=ssl_dist_stress.sh # sourced - $0 would point to all.sh + + if [ -z "${CLEANUP}" ] ; then # if nobody else is responsible for + CLEANUP="${SCRIPTNAME}" # cleaning this script will do it + fi + + ssl_init # let some other script do the hard work (initialize, generate certs, ... + + SCRIPTNAME=ssl_dist_stress.sh + echo "$SCRIPTNAME: SSL distributed stress tests ===============================" + +} + +######################### ssl_ds_usage ################################# +# local shell function to explain the usage +######################################################################## +ssl_ds_usage() +{ + echo "Usage: `basename $1`" + echo " -host hostname " + echo " ...host who runs the server, for distributed stress test" + echo " -stress " + echo " ...runs the server sider of the distributed stress test" + echo " -dir unixdirectory " + echo " ...lets the server side of the distributed stress test" + echo " know where to find the scritp to start on the remote side" + echo " -certnum start-end" + echo " ... provides the range of certs for distributed stress test" + echo " for example -certnum 10-20 will connect 10 times" + echo " no blanks in the range string (not 10 - 20)" + echo " valid range ${GLOB_MIN_CERT}-${GLOB_MAX_CERT}" + echo " -? ...prints this text" + exit 1 #does not need to be Exit, very early in script +} + +######################### ssl_ds_eval_opts ############################# +# local shell function to deal with options and parameters +######################################################################## +ssl_ds_eval_opts() +{ + #use $0 not $SCRIPTNAM<E, too early, SCRIPTNAME not yet set + + while [ -n "$1" ] + do + case $1 in + -host) + BUILD_OPT=1 + export BUILD_OPT + DO_REM_ST="TRUE" + shift + SERVERHOST=$1 + HOST=$1 + if [ -z $SERVERHOST ] ; then + echo "$0 `uname -n`: -host requires hostname" + ssl_ds_usage + fi + echo "$0 `uname -n`: host $HOST ($1)" + ;; + -certn*) + shift + rangeOK=`echo $1 | sed -e 's/[0-9][0-9]*-[0-9][0-9]*/OK/'` + MIN_CERT=`echo $1 | sed -e 's/-[0-9][0-9]*//' -e 's/^00*//'` + MAX_CERT=`echo $1 | sed -e 's/[0-9][0-9]*-//' -e 's/^00*//'` + if [ -z "$rangeOK" -o "$rangeOK" != "OK" -o \ + -z "$MIN_CERT" -o -z "$MAX_CERT" -o \ + "$MIN_CERT" -gt "$MAX_CERT" -o \ + "$MIN_CERT" -lt "$GLOB_MIN_CERT" -o \ + "$MAX_CERT" -gt "$GLOB_MAX_CERT" ] ; then + echo "$0 `uname -n`: -certn range not valid" + ssl_ds_usage + fi + echo "$0 `uname -n`: will use certs from $MIN_CERT to $MAX_CERT" + ;; + -server|-stress|-dist*st*) + BUILD_OPT=1 + export BUILD_OPT + DO_DIST_ST="TRUE" + ;; + -dir|-unixdir|-uxdir|-qadir) + shift + UX_DIR=$1 + #FIXME - we need a default unixdir + if [ -z "$UX_DIR" ] ; then # -o ! -d "$UX_DIR" ] ; then can't do, Win doesn't know... + echo "$0 `uname -n`: -dir requires directoryname " + ssl_ds_usage + fi + CD_QADIR_SSL="cd $UX_DIR" + ;; + -ip*) + shift + IP_ADDRESS=$1 + if [ -z "$IP_ADDRESS" ] ; then + echo "$0 `uname -n`: -ip requires ip-address " + ssl_ds_usage + fi + USE_IP=TRUE + IP_PARAM="-ip $IP_ADDRESS" + ;; + -h|-help|"-?"|*) + ssl_ds_usage + ;; + esac + shift + done +} + +############################## ssl_ds_rem_stress ####################### +# local shell function to perform the client part of the SSL stress test +######################################################################## + +ssl_ds_rem_stress() +{ + testname="SSL remote part of Stress test (`uname -n`)" + echo "$SCRIPTNAME `uname -n`: $testname" + + #cp -r "${CLIENTDIR}" /tmp/ssl_ds.$$ #FIXME + #cd /tmp/ssl_ds.$$ + #verbose="-v" + + cd ${CLIENTDIR} + + CONTINUE=$MAX_CERT + while [ $CONTINUE -ge $MIN_CERT ] + do + echo "strsclnt -D -p ${PORT} -d . -w nss -c 1 $verbose " + echo " -n TestUser$CONTINUE ${HOSTADDR} #`uname -n`" + strsclnt -D -p ${PORT} -d . -w nss -c 1 $verbose \ + -n "TestUser$CONTINUE" ${HOSTADDR} & + #${HOSTADDR} & + CONTINUE=`expr $CONTINUE - 1 ` + #sleep 4 #give process time to start up + done + + html_msg 0 0 "${testname}" #FIXME +} + +######################### ssl_ds_dist_stress ########################### +# local shell function to perform the server part of the new, distributed +# SSL stress test +######################################################################## + +ssl_ds_dist_stress() +{ + max_clientlist=" + box-200 + washer-200 + dryer-200 + hornet-50 + shabadoo-50 + y2sun2-10 + galileo-10 + shame-10 + axilla-10 + columbus-10 + smarch-10 + nugget-10 + charm-10 + hp64-10 + biggayal-10 + orville-10 + kwyjibo-10 + hbombaix-10 + raven-10 + jordan-10 + phaedrus-10 + louie-10 + trex-10 + compaqtor-10" + + #clientlist=" box-200 washer-50 charm-10 jordan-10 louie-10 smarch-10 phaedrus-10 charm-10 hbombaix-20 box-200 washer-50 " + #clientlist=" box-200 washer-50 louie-10 hbombaix-10 charm-10 trex-20 jordan-10 box-200 compaqtor-10 " + #clientlist=" box-2 washer-5" #FIXME ADJUST + clientlist=" box-200 charm-10 jordan-10 louie-10 smarch-10 phaedrus-10 charm-10 " + + html_head "SSL Distributed Stress Test" + + testname="SSL distributed Stress test" + + echo cd "${CLIENTDIR}" + cd "${CLIENTDIR}" + if [ -z "CD_QADIR_SSL" ] ; then + CD_QADIR_SSL="cd $QADIR/ssl" + else + cp -r $HOSTDIR $HOSTDIR/../../../../../y2sun2_Solaris8/mozilla/tests_results/security + fi + + #sparam=" -t 128 -D -r " + sparam=" -t 16 -D -r -r " + start_selfserv + + for c in $clientlist + do + client=`echo $c | sed -e "s/-.*//"` + number=`echo $c | sed -e "s/.*-//"` + CLIENT_OK="TRUE" + echo $client + ping $client >/dev/null || CLIENT_OK="FALSE" + if [ "$CLIENT_OK" = "FALSE" ] ; then + echo "$SCRIPTNAME `uname -n`: $client can't be reached - skipping" + else + get_certrange $number + echo "$SCRIPTNAME `uname -n`: $RSH $client -l svbld \\ " + echo " \" $CD_QADIR_SSL ;ssl_dist_stress.sh \\" + echo " -host $HOST -certnum $CERTRANGE $IP_PARAM \" " + $RSH $client -l svbld \ + " $CD_QADIR_SSL;ssl_dist_stress.sh -host $HOST -certnum $CERTRANGE $IP_PARAM " & + fi + done + + echo cd "${CLIENTDIR}" + cd "${CLIENTDIR}" + + sleep 300 # give the clients time to finish #FIXME ADJUST + + echo "GET /stop HTTP/1.0\n\n" > stdin.txt #check to make sure it has /r/n + echo "tstclnt -h clio.red.iplanet.com -p 8443 -d ${CLIENTDIR} -n TestUser0 " + echo " -w nss -f < stdin.txt" + tstclnt -h clio.red.iplanet.com -p 8443 -d ${CLIENTDIR} -n TestUser0 \ + -w nss -f < stdin.txt + + html_msg 0 0 "${testname}" + html "</TABLE><BR>" +} + +############################ get_certrange ############################# +# local shell function to find the range of certs that the next remote +# client is supposed to use (only for server side of the dist stress test +######################################################################## +get_certrange() +{ + rangeOK=`echo $1 | sed -e 's/[0-9][0-9]*/OK/'` + if [ -z "$rangeOK" -o "$rangeOK" != "OK" -o $1 = "OK" ] ; then + range=10 + echo "$SCRIPTNAME `uname -n`: $1 is not a valid number of certs " + echo " defaulting to 10 for $client" + else + range=$1 + if [ $range -gt $GLOB_MAX_CERT ] ; then + range=$GLOB_MAX_CERT + fi + fi + if [ -z "$FROM_CERT" ] ; then # start new on top of the cert stack + FROM_CERT=$GLOB_MAX_CERT + elif [ `expr $FROM_CERT - $range + 1 ` -lt 0 ] ; then + FROM_CERT=$GLOB_MAX_CERT # dont let it fall below 0 on the TO_CERT + + fi + TO_CERT=`expr $FROM_CERT - $range + 1 ` + if [ $TO_CERT -lt 0 ] ; then # it's not that I'm bad in math, I just + TO_CERT=0 # don't trust expr... + fi + CERTRANGE="${TO_CERT}-${FROM_CERT}" + FROM_CERT=`expr ${TO_CERT} - 1 ` #start the next client one below +} + + +################## main ################################################# + +DO_DIST_ST="TRUE" +. ssl.sh +ssl_ds_init $* +if [ -n "$DO_REM_ST" -a "$DO_REM_ST" = "TRUE" ] ; then + ssl_ds_rem_stress + exit 0 #no cleanup on purpose +elif [ -n "$DO_DIST_ST" -a "$DO_DIST_ST" = "TRUE" ] ; then + ssl_ds_dist_stress +fi +ssl_cleanup diff --git a/security/nss/tests/tools/tools.sh b/security/nss/tests/tools/tools.sh index 25b42866b..34dc76145 100644 --- a/security/nss/tests/tools/tools.sh +++ b/security/nss/tests/tools/tools.sh @@ -158,7 +158,17 @@ tools_cleanup() ################## main ################################################# tools_init -tools_p12 + +#FIXME - tmp workaround for tests that do not work in 3.2 RTM +#echo $BC_ACTION | grep "forward compatibility" && RUN_TOOLS_P12="FALSE" +echo $BC_ACTION | grep "compatibility" && RUN_TOOLS_P12="FALSE" +if [ -n "${RUN_TOOLS_P12}" -a "${RUN_TOOLS_P12}" = "FALSE" ] ; then + html_msg 0 0 "Can't run pk12util tests for NSS 3.2 (pk12util -i)" + html_msg 0 0 "Can't run pk12util tests for NSS 3.2 (pk12util -o)" +else + tools_p12 +fi + tools_sign tools_cleanup |