summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornelson%bolyard.com <devnull@localhost>2008-06-30 20:33:40 +0000
committernelson%bolyard.com <devnull@localhost>2008-06-30 20:33:40 +0000
commit4c40e0722fc2dd7ffd4064530a1812da97ac6cc3 (patch)
treea5a7eedfcde13eb60f07d23be0ba4528e213ff94
parent196243de7c99c5d1db9cb38120f29c84b4cc0dad (diff)
downloadnss-hg-4c40e0722fc2dd7ffd4064530a1812da97ac6cc3.tar.gz
Restore USE_STATIC_LIBS = 1 to manifest.mn to get signtool building on
Windows again. This is a partial backout of the previous checkin for manifest.mn. Also, don't include unnecessary private header files. Related to bug 438876. Sheriff Nelson
-rw-r--r--security/nss/cmd/signtool/manifest.mn4
-rw-r--r--security/nss/cmd/signtool/signtool.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/security/nss/cmd/signtool/manifest.mn b/security/nss/cmd/signtool/manifest.mn
index 497cf714c..5688f5dc5 100644
--- a/security/nss/cmd/signtool/manifest.mn
+++ b/security/nss/cmd/signtool/manifest.mn
@@ -52,8 +52,8 @@ CSRCS = signtool.c \
PROGRAM = signtool
-REQUIRES = dbm seccmd
+REQUIRES = seccmd
-DEFINES += -DNSPR20
+USE_STATIC_LIBS = 1
EXTRA_LIBS = $(JAR_LIBS)
diff --git a/security/nss/cmd/signtool/signtool.h b/security/nss/cmd/signtool/signtool.h
index 5f84cb43c..282bd98ec 100644
--- a/security/nss/cmd/signtool/signtool.h
+++ b/security/nss/cmd/signtool/signtool.h
@@ -52,7 +52,6 @@
#include "secpkcs7.h"
#include "pk11func.h"
#include "secmod.h"
-#include "secmodi.h"
#include "plhash.h"
#include "nss.h"