Commit d07692cd authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Make no-gost work properly.

parent 82ae5713

Configure

+1 −0
Changes for Configure: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -1432,6 +1432,7 @@ while (<IN>) 
		}

	$sdirs = 0 unless /\\$/;

        s/engines // if (/^DIRS=/ && $disabled{"engine"});

	s/ccgost// if (/^ENGDIRS=/ && $disabled{"gost"});

	s/^VERSION=.*/VERSION=$version/;

	s/^MAJOR=.*/MAJOR=$major/;

	s/^MINOR=.*/MINOR=$minor/;

Makefile.org

+2 −1
Changes for Makefile.org: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ ZLIB_INCLUDE= 
LIBZLIB=



DIRS=   crypto ssl engines apps test tools

ENGDIRS= ccgost

SHLIBDIRS= crypto ssl



# dirs in crypto to build
@@ -179,7 +180,7 @@ BUILDENV= PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)' \ 
		AS='$(CC)' ASFLAG='$(CFLAG) -c'			\

		AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)'	\

		CROSS_COMPILE_PREFIX='$(CROSS_COMPILE_PREFIX)'	\

		PERL='$(PERL)'					\

		PERL='$(PERL)' ENGDIRS='$(ENGDIRS)'		\

		SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/lib'	\

		INSTALL_PREFIX='$(INSTALL_PREFIX)'		\

		INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)'	\

engines/Makefile

+2 −2
Changes for engines/Makefile: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ INCLUDES= -I../include 
CFLAG=-g

MAKEFILE=	Makefile

AR=		ar r

EDIRS= ccgost

ENGDIRS= ccgost



RECURSIVE_MAKE=	[ -n "$(EDIRS)" ] && for i in $(EDIRS) ; do \

RECURSIVE_MAKE=	[ -z "$(ENGDIRS)" ] || for i in $(ENGDIRS) ; do \

		    (cd $$i && echo "making $$target in $(DIR)/$$i..." && \

		    $(MAKE) -e TOP=../.. DIR=$$i $$target ) || exit 1; \

		done;