]>
Commit | Line | Data |
---|---|---|
0fb65667 | 1 | diff -Nur nss-3.3.1/mozilla/security/coreconf/Linux.mk nss-3.3.1.new/mozilla/security/coreconf/Linux.mk |
2 | --- nss-3.3.1/mozilla/security/coreconf/Linux.mk Thu Dec 13 13:47:56 2001 | |
3 | +++ nss-3.3.1.new/mozilla/security/coreconf/Linux.mk Thu Dec 13 14:16:18 2001 | |
4 | @@ -106,5 +106,5 @@ | |
5 | DSO_LDOPTS = -shared | |
6 | DSO_LDFLAGS = | |
7 | ||
8 | -# INCLUDES += -I/usr/include -Y/usr/include/linux | |
9 | G++INCLUDES = -I/usr/include/g++ | |
10 | +INCLUDES += -I/usr/include -I/usr/include/nspr | |
11 | diff -Nur nss-3.3.1/mozilla/security/nss/cmd/modutil/manifest.mn nss-3.3.1.new/mozilla/security/nss/cmd/modutil/manifest.mn | |
12 | --- nss-3.3.1/mozilla/security/nss/cmd/modutil/manifest.mn Thu Dec 13 13:47:50 2001 | |
13 | +++ nss-3.3.1.new/mozilla/security/nss/cmd/modutil/manifest.mn Thu Dec 13 14:16:18 2001 | |
14 | @@ -54,6 +54,6 @@ | |
15 | ||
16 | DEFINES = -DNSPR20 | |
17 | ||
18 | -INCLUDES = | |
19 | +INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss | |
20 | ||
21 | USE_STATIC_LIBS = 1 | |
22 | diff -Nur nss-3.3.1/mozilla/security/nss/lib/ckfw/builtins/Makefile nss-3.3.1.new/mozilla/security/nss/lib/ckfw/builtins/Makefile | |
23 | --- nss-3.3.1/mozilla/security/nss/lib/ckfw/builtins/Makefile Thu Dec 13 13:47:51 2001 | |
24 | +++ nss-3.3.1.new/mozilla/security/nss/lib/ckfw/builtins/Makefile Thu Dec 13 14:16:18 2001 | |
25 | @@ -60,8 +60,8 @@ | |
26 | EXTRA_LIBS += \ | |
27 | $(DIST)/lib/libnssckfw.$(LIB_SUFFIX) \ | |
28 | $(DIST)/lib/libnssb.$(LIB_SUFFIX) \ | |
29 | - $(PLC_STATIC_LIB) \ | |
30 | - $(PLDS_STATIC_LIB) \ | |
31 | + -lplc4 \ | |
32 | + -lplds4 \ | |
33 | $(NULL) | |
34 | ||
35 | endif | |
36 | diff -Nur nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile nss-3.3.1.new/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile | |
37 | --- nss-3.3.1/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Thu Dec 13 13:47:55 2001 | |
38 | +++ nss-3.3.1.new/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile Thu Dec 13 14:16:18 2001 | |
39 | @@ -92,8 +92,8 @@ | |
40 | $(DIST)/lib/libsoftoken.$(LIB_SUFFIX) \ | |
41 | $(CRYPTO_LIB) \ | |
42 | $(DIST)/lib/libsecutil.$(LIB_SUFFIX) \ | |
43 | - $(PLC_STATIC_LIB) \ | |
44 | - $(PLDS_STATIC_LIB) \ | |
45 | + -lplc4 \ | |
46 | + -lplds4 \ | |
47 | $(NULL) | |
48 | ||
49 | endif | |
50 | diff -Nur nss-3.3.1/mozilla/security/nss/lib/smime/manifest.mn nss-3.3.1.new/mozilla/security/nss/lib/smime/manifest.mn | |
51 | --- nss-3.3.1/mozilla/security/nss/lib/smime/manifest.mn Thu Dec 13 13:47:54 2001 | |
52 | +++ nss-3.3.1.new/mozilla/security/nss/lib/smime/manifest.mn Thu Dec 13 14:17:55 2001 | |
53 | @@ -70,6 +70,8 @@ | |
54 | smimever.c \ | |
55 | $(NULL) | |
56 | ||
57 | +INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss | |
58 | + | |
59 | REQUIRES = security dbm | |
60 | ||
61 | LIBRARY_NAME = smime | |
62 | diff -Nur nss-3.3.1/mozilla/security/nss/lib/ssl/manifest.mn nss-3.3.1.new/mozilla/security/nss/lib/ssl/manifest.mn | |
63 | --- nss-3.3.1/mozilla/security/nss/lib/ssl/manifest.mn Thu Dec 13 13:47:51 2001 | |
64 | +++ nss-3.3.1.new/mozilla/security/nss/lib/ssl/manifest.mn Thu Dec 13 14:18:41 2001 | |
65 | @@ -72,6 +72,8 @@ | |
66 | nsskea.c \ | |
67 | $(NULL) | |
68 | ||
69 | +INCLUDES = -I$(CORE_DEPTH)/nss/lib/nss | |
70 | + | |
71 | REQUIRES = security dbm | |
72 | ||
73 | LIBRARY_NAME = ssl |