diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2001-05-21 14:12:32 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2001-05-21 14:12:32 +0000 |
| commit | 286760b72041a0708bfb246e52ee9f13e5614388 (patch) | |
| tree | b5c9bd3046d224f486d991ae84301d9d51aa998f /security/heimdal | |
| parent | Add guppi. (diff) | |
configure was generating bogus `-R' and `-L' flags for the linker when
Kerberos IV libs were not present.
PR: ports/27490
Notes
Notes:
svn path=/head/; revision=42855
Diffstat (limited to 'security/heimdal')
| -rw-r--r-- | security/heimdal/files/patch-cb | 16 | ||||
| -rw-r--r-- | security/heimdal/files/patch-cc | 14 |
2 files changed, 27 insertions, 3 deletions
diff --git a/security/heimdal/files/patch-cb b/security/heimdal/files/patch-cb index e040ef85fb64..6b2335177ce8 100644 --- a/security/heimdal/files/patch-cb +++ b/security/heimdal/files/patch-cb @@ -1,5 +1,5 @@ ---- configure.in.orig Mon Feb 5 08:26:49 2001 -+++ configure.in Mon Feb 5 08:28:07 2001 +--- configure.in.orig Mon Feb 5 01:58:05 2001 ++++ configure.in Mon May 21 08:12:54 2001 @@ -83,6 +83,10 @@ LIB_openldap="-R $openldap_libdir $LIB_openldap" fi @@ -11,3 +11,15 @@ AC_TEST_PACKAGE_NEW(krb4,[#include <krb.h>],-lkrb,-ldes,/usr/athena, KRB4) LIB_kdb= +@@ -566,7 +570,10 @@ + "$ac_cv_func_SHA1_Init" = "yes" -a \ + "$ac_cv_func_RC4" = "yes"; then + DIR_des='' +- LIB_des="-R $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4_Init" ++ LIB_des="$ac_cv_funclib_MD4_Init" ++ if test "$krb4_libdir"; then ++ LIB_des="-R $krb4_libdir -L$krb4_libdir $LIB_des" ++ fi + LIB_des_appl="$LIB_des" + else + DIR_des='des' diff --git a/security/heimdal/files/patch-cc b/security/heimdal/files/patch-cc index cd78e505a2ed..0ff51ecc1de9 100644 --- a/security/heimdal/files/patch-cc +++ b/security/heimdal/files/patch-cc @@ -1,5 +1,5 @@ --- configure.orig Mon Feb 5 02:03:23 2001 -+++ configure Mon Feb 5 08:29:21 2001 ++++ configure Mon May 21 08:14:53 2001 @@ -11827,6 +11827,10 @@ LIB_openldap="-R $openldap_libdir $LIB_openldap" fi @@ -11,3 +11,15 @@ # Check whether --with-krb4 or --without-krb4 was given. if test "${with_krb4+set}" = set; then withval="$with_krb4" +@@ -21344,7 +21348,10 @@ + "$ac_cv_func_SHA1_Init" = "yes" -a \ + "$ac_cv_func_RC4" = "yes"; then + DIR_des='' +- LIB_des="-R $krb4_libdir -L$krb4_libdir $ac_cv_funclib_MD4_Init" ++ LIB_des="$ac_cv_funclib_MD4_Init" ++ if test "$krb4_libdir"; then ++ LIB_des="-R $krb4_libdir -L$krb4_libdir $LIB_des" ++ fi + LIB_des_appl="$LIB_des" + else + DIR_des='des' |