Make crmfcgi build once again

3 files changed, 14 insertions, 25 deletions

diff --git a/security/nss/cmd/crmf-cgi/Makefile b/security/nss/cmd/crmf-cgi/Makefile
index 29f3357c3..cc2f035d6 100644
--- a/security/nss/cmd/crmf-cgi/Makefile
+++ b/security/nss/cmd/crmf-cgi/Makefile
@@ -35,7 +35,11 @@
 #######################################################################
 # (1) Include initial platform-independent assignments (MANDATORY).   #
 #######################################################################
-
+ifeq ($(OS_ARCH), WINNT)
+EXTRA_LIBS += $(DIST)/lib/crmf.lib
+else
+EXTRA_LIBS += $(DIST)/lib/libcrmf.$(LIB_SUFFIX) 
+endif
 include manifest.mn
 
 #######################################################################
@@ -54,22 +58,6 @@ include $(CORE_DEPTH)/coreconf/config.mk
 # (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
 
 
@@ -89,8 +77,5 @@ include $(CORE_DEPTH)/coreconf/rules.mk
 # (7) Execute "local" rules. (OPTIONAL).                              #
 #######################################################################
 
-
-lame:
-	echo $(CPU_ARCH)
-
 include ../platrules.mk
+
diff --git a/security/nss/cmd/crmf-cgi/crmfcgi.c b/security/nss/cmd/crmf-cgi/crmfcgi.c
index 0cd8b9fcf..c5fd2d451 100644
--- a/security/nss/cmd/crmf-cgi/crmfcgi.c
+++ b/security/nss/cmd/crmf-cgi/crmfcgi.c
@@ -41,7 +41,7 @@
 #include "crmf.h"
 #include "base64.h"
 #include "secasn1.h"
-#include "crypto.h"
+#include "cryptohi.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/security/nss/cmd/crmf-cgi/manifest.mn b/security/nss/cmd/crmf-cgi/manifest.mn
index 98cd2c401..ceaf5a635 100644
--- a/security/nss/cmd/crmf-cgi/manifest.mn
+++ b/security/nss/cmd/crmf-cgi/manifest.mn
@@ -32,8 +32,7 @@
 # 
 
 CORE_DEPTH = ../../..
-DEPTH      = .
-MODULE	= security
+MODULE	= sectools
 
 EXPORTS = \
 	$(NULL)
@@ -43,7 +42,7 @@ CSRCS = \
 	$(NULL)
 
 
-REQUIRES = security dbm
+REQUIRES = security dbm seccmd
 
 ifdef ATTACH_CGI
 DEFINES += -DATTACH_CGI
@@ -55,3 +54,8 @@ endif
 
 PROGRAM  = crmfcgi
 
+USE_STATIC_LIBS = 1
+
+INCLUDES = 
+
+DEFINES = -DNSPR20