From e286dfe6edc23fd189e6ee8370440cd79b551961 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 19 Dec 2002 22:10:20 +0000 Subject: [PATCH] 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... --- CHANGES | 5 +++++ Configure | 5 ++--- Makefile.org | 1 - apps/Makefile.ssl | 1 - ssl/Makefile.ssl | 1 - 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index e5abe9116a..afefb21303 100644 --- a/CHANGES +++ b/CHANGES @@ -4,6 +4,11 @@ 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 diff --git a/Configure b/Configure index 11d20e029e..9b99b0436e 100755 --- a/Configure +++ b/Configure @@ -1020,6 +1020,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 @@ -1238,7 +1240,6 @@ while () 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); @@ -1286,8 +1287,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; diff --git a/Makefile.org b/Makefile.org index 72a8abfcf7..c229268562 100644 --- a/Makefile.org +++ b/Makefile.org @@ -159,7 +159,6 @@ RMD160_ASM_OBJ= asm/rm86-out.o # KRB5 stuff KRB5_INCLUDES= -LIBKRB5= # When we're prepared to use shared libraries in the programs we link here # we might set SHLIB_MARK to '$(SHARED_LIBS)'. diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl index 04c4b79a39..b442b7cd74 100644 --- a/apps/Makefile.ssl +++ b/apps/Makefile.ssl @@ -18,7 +18,6 @@ PERL= perl RM= rm -f # KRB5 stuff KRB5_INCLUDES= -LIBKRB5= PEX_LIBS= EX_LIBS= diff --git a/ssl/Makefile.ssl b/ssl/Makefile.ssl index db24293ac4..e36a79b2d6 100644 --- a/ssl/Makefile.ssl +++ b/ssl/Makefile.ssl @@ -17,7 +17,6 @@ MAKEFILE= Makefile.ssl AR= ar r # KRB5 stuff KRB5_INCLUDES= -LIBKRB5= CFLAGS= $(INCLUDES) $(CFLAG) -- 2.25.1