From bf2336f478aed4e4a179bc7868217b91af1324ca Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 21 Apr 2005 00:46:28 +0000 Subject: [PATCH] Don't use standard kerberos library locations in MK1MF builds. Fix typo in mk1mf.pl --- Configure | 4 ++-- util/mk1mf.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Configure b/Configure index 1cf439d849..ce0e718ef3 100755 --- a/Configure +++ b/Configure @@ -995,7 +995,7 @@ if (!$no_krb5) if $withargs{"krb5-dir"} eq ""; $withargs{"krb5-lib"} = "-L".$withargs{"krb5-dir"}. "/lib -lgssapi -lkrb5 -lcom_err" - if $withargs{"krb5-lib"} eq ""; + if $withargs{"krb5-lib"} eq "" && !$IsMK1MF; $cflags="-DKRB5_HEIMDAL $cflags"; } if ($withargs{"krb5-flavor"} =~ /^[Mm][Ii][Tt]/) @@ -1004,7 +1004,7 @@ if (!$no_krb5) if $withargs{"krb5-dir"} eq ""; $withargs{"krb5-lib"} = "-L".$withargs{"krb5-dir"}. "/lib -lgssapi_krb5 -lkrb5 -lcom_err -lk5crypto" - if $withargs{"krb5-lib"} eq ""; + if $withargs{"krb5-lib"} eq "" && !$IsMK1MF; $cflags="-DKRB5_MIT $cflags"; $withargs{"krb5-flavor"} =~ s/^[Mm][Ii][Tt][._-]*//; if ($withargs{"krb5-flavor"} =~ /^1[._-]*[01]/) diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 2a4c8c34ce..3f4ffadc5c 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -975,7 +975,7 @@ sub read_options "debug" => \$debug, "profile" => \$profile, "shlib" => \$shlib, - "dll" => \$dll, + "dll" => \$shlib, "shared" => 0, "no-gmp" => 0, "no-shared" => 0, -- 2.25.1