Commit 9cd16b1d authored by Richard Levitte's avatar Richard Levitte
Browse files

We stupidly had a separate LIBKRB5 variable for KRB5 library dependencies, 

and then didn't support it very well.  And that when there already is a
useful variable for exactly this kind of thing; EX_LIBS...
parent 12cd2825

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -352,6 +352,11 @@ TODO: bug: pad x with leading zeros if necessary 
 

 Changes between 0.9.6h and 0.9.7  [XX xxx 2002]



  *) Change the declaration of needed Kerberos libraries to use EX_LIBS

     instead of the special (and badly supported) LIBKRB5.  LIBKRB5 is

     removed entirely.

     [Richard Levitte]



  *) The hw_ncipher.c engine requires dynamic locks.  Unfortunately, it

     seems that in spite of existing for more than a year, many application

     author have done nothing to provide the necessary callbacks, which

Configure

+2 −3
Original line number Diff line number Diff line
@@ -1041,6 +1041,8 @@ 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
@@ -1272,7 +1274,6 @@ 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);
@@ -1320,8 +1321,6 @@ print "ARFLAGS =$arflags\n"; 
print "PERL          =$perl\n";

print "KRB5_INCLUDES =",$withargs{"krb5-include"},"\n"

	if $withargs{"krb5-include"} ne "";

print "LIBKRB5       =",$withargs{"krb5-lib"},"\n"

	if $withargs{"krb5-lib"} ne "";



my $des_ptr=0;

my $des_risc1=0;

Makefile.org

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


# KRB5 stuff

KRB5_INCLUDES=

LIBKRB5=



DIRS=   crypto ssl engines apps test tools

SHLIBDIRS= crypto ssl

apps/Makefile.ssl

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

# KRB5 stuff

KRB5_INCLUDES=

LIBKRB5=



PEX_LIBS=

EX_LIBS=

ssl/Makefile.ssl

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ MAKEFILE= Makefile.ssl 
AR=		ar r

# KRB5 stuff

KRB5_INCLUDES=

LIBKRB5=



CFLAGS= $(INCLUDES) $(CFLAG)