Commit c1269c81 authored by Richard Levitte's avatar Richard Levitte
Browse files

Handle krb5 libraries separately and make sure only libssl.so depends 

on it.
parent 794a386a

Configure

+2 −2
Original line number Diff line number Diff line
@@ -650,6 +650,7 @@ my $openssl_thread_defines; 
my $openssl_sys_defines="";

my $openssl_other_defines;

my $libs;

my $libkrb5="";

my $target;

my $options;

my $symlink;
@@ -1037,8 +1038,6 @@ else 
	$withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include"

		if $withargs{"krb5-include"} eq "" &&

		   $withargs{"krb5-dir"} ne "";



	$libs.=$withargs{"krb5-lib"}." " if $withargs{"krb5-lib"} ne "";

	}



# The DSO code currently always implements all functions so that no
@@ -1273,6 +1272,7 @@ while (<IN>) 
	s/^ARFLAGS=.*/ARFLAGS= $arflags/;

	s/^PERL=.*/PERL= $perl/;

	s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/;

	s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;

	s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;

	s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;

	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);

Makefile.org

+5 −1
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o 


# KRB5 stuff

KRB5_INCLUDES=

LIBKRB5=



DIRS=   crypto ssl engines apps test tools

SHLIBDIRS= crypto ssl
@@ -280,6 +281,9 @@ build-shared: do_$(SHLIB_TARGET) link-shared 


do_$(SHLIB_TARGET):

	@ libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \

		if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \

			libs="$(LIBKRB5) $$libs"; \

		fi; \

		$(NEWMAKE) -f Makefile.shared \

			CC="$(CC)" LDFLAGS="$(LDFLAGS)" \

			SHARED_LDFLAGS="$(SHARED_LDFLAGS)" \
@@ -288,7 +292,7 @@ do_$(SHLIB_TARGET): 
			LIBDEPS="$$libs $(EX_LIBS)" \

			LIBRPATH="$(INSTALLTOP)/lib" \

			link_a.$(SHLIB_TARGET); \

		libs="$$libs -l$$i"; \

		libs="-l$$i $$libs"; \

	done



openssl.pc: Makefile.ssl

apps/Makefile.ssl

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ PERL= perl 
RM=		rm -f

# KRB5 stuff

KRB5_INCLUDES=

LIBKRB5=



PEX_LIBS=

EX_LIBS=

test/Makefile.ssl

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ MAKE= $(NEWMAKE) -f $(MAKEFILE) 
MAKEDEPPROG=	makedepend

MAKEDEPEND=	$(TOP)/util/domd $(TOP) -MD $(MAKEDEPPROG)

PERL=		perl

# KRB5 stuff

KRB5_INCLUDES=

LIBKRB5=



PEX_LIBS=

EX_LIBS= #-lnsl -lsocket