Code to avoid the use of non-standard strptime(). By

[openssl.git] / Configure

diff --git a/Configure b/Configure
index a76f7060d6f61a1c6614f424f4d83c73b1140eb0..b20e663328e44f40c79dd41b7a77948384c5a7de 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -723,6 +723,7 @@ if ($no_krb5
        }
 else
        {
+       my ($lresolv, $lpath, $lext);
        if ($withargs{"krb5-flavor"} =~ /^[Hh]eimdal$/)
                {
                $withargs{"krb5-dir"} = "/usr/heimdal"
@@ -732,7 +733,7 @@ else
                        if $withargs{"krb5-lib"} eq "";
                $cflags="-DKRB5_HEIMDAL $cflags";
                }
-       if ($withargs{"krb5-flavor"} =~ /^[Mm][Ii][Tt]$/)
+       if ($withargs{"krb5-flavor"} =~ /^[Mm][Ii][Tt]/)
                {
                $withargs{"krb5-dir"} = "/usr/kerberos"
                        if $withargs{"krb5-dir"} eq "";
@@ -740,9 +741,27 @@ else
                        "/lib -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto"
                        if $withargs{"krb5-lib"} eq "";
                $cflags="-DKRB5_MIT $cflags";
+               $withargs{"krb5-flavor"} =~ s/^[Mm][Ii][Tt][._-]*//;
+               if ($withargs{"krb5-flavor"} =~ /^1[._-]*[01]/)
+                       {
+                       $cflags="-DKRB5_MIT_OLD11 $cflags";
+                       }
+               }
+       LRESOLV:
+       foreach $lpath ("/lib", "/usr/lib")
+               {
+               foreach $lext ("a", "so")
+                       {
+                       $lresolv = "$lpath/libresolv.$lext";
+                       last LRESOLV    if (-r "$lresolv");
+                       $lresolv = "";
+                       }
                }
+       $withargs{"krb5-lib"} .= " -lresolv"
+               if ("$lresolv");
        $withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include"
-               if $withargs{"krb5-include"} eq "" && $withargs{"krb5-dir"} ne "";
+               if $withargs{"krb5-include"} eq "" &&
+                  $withargs{"krb5-dir"} ne "";
        }
 
 # The DSO code currently always implements all functions so that no