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...

diff --git a/CHANGES b/CHANGES
index b760f49c1886c674290f97f4609e5c27d259230e..0922acb089f9ae40f409eacfbe26b7e0f1c3bacb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/Configure b/Configure
index 59a6d0846da4df7c485d029697a70a416ebccae5..c02c26f206a3636475368f72bad994330b8e1fe6 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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;

diff --git a/Makefile.org b/Makefile.org
index b0f76b7a48f997c65b10adc89a18fd68406f284e..ebd688c7bc5ee108ceb3974bb0d3dc5960ebee92 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -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

diff --git a/apps/Makefile.ssl b/apps/Makefile.ssl
index 78192363c41fc57df7b0b17d9d879b0a67fe79a6..6b86302c2ddb38fdd091d921fb561104823223bc 100644 (file)
--- 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 bca85c6abeacf24a2ee83a800c1fc16ccbb9b359..11a19d4de9defcde2cbee48e34327060534388c5 100644 (file)
--- 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)