Changes to compile and link against the required version of Kerberos
(1.9.2) rather than the version shipped with Mac OS X 6 & 7 (1.7 Beta)
Regards
Pete
--
Pete Fotheringham
Codethink Ltd
http://codethink.co.uk
+44 7740 351755
From ba1bf8932411110846e3e2d7ad8a83188acaf7c4 Mon Sep 17 00:00:00 2001
From: Pete Fotheringham <[log in to unmask]>
Date: Mon, 28 Nov 2011 15:06:23 +0000
Subject: [PATCH 1/2] Link against the Kerberos library in /usr/local instead
of the version in /usr
---
moonshot/acinclude.m4 | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/moonshot/acinclude.m4 b/moonshot/acinclude.m4
index 401ad2a..0a356db 100644
--- a/moonshot/acinclude.m4
+++ b/moonshot/acinclude.m4
@@ -17,17 +17,20 @@ AC_ARG_WITH(krb5,
[Use krb5 (in specified installation directory)]),
[check_krb5_dir="$withval"],
[check_krb5_dir=])
-for dir in $check_krb5_dir $prefix /usr /usr/local ; do
+for dir in $check_krb5_dir $prefix /usr/local /usr ; do
krb5dir="$dir"
if test -x "$dir/bin/krb5-config"; then
found_krb5="yes";
if test "x$target_windows" = "xyes"; then
+ printf "found\n"
KRB5_CFLAGS=-I"$check_krb5_dir/include";
+ KRB5_LDFLAGS="-L$check_krb5_dir/lib/";
KRB5_LIBS="-L$check_krb5_dir/lib/ -lkrb5_32 -lgssapi32";
COMPILE_ET="$check_krb5_dir/bin/compile_et";
AC_MSG_RESULT([yes])
else
KRB5_CFLAGS=`$dir/bin/krb5-config gssapi --cflags`;
+ KRB5_LDFLAGS="-L$dir/lib";
KRB5_LIBS=`$dir/bin/krb5-config gssapi --libs`
AC_MSG_RESULT([yes])
AC_PATH_PROG(COMPILE_ET, [compile_et], [compile_et], [$dir/bin$PATH_SEPARATOr])
@@ -49,6 +52,7 @@ else
printf "Kerberos found in $krb5dir\n";
AC_SUBST(KRB5_CFLAGS)
AC_SUBST(KRB5_LIBS)
+ AC_SUBST(KRB5_LDFLAGS)
AC_SUBST(COMPILE_ET)
AC_CHECK_LIB(krb5, GSS_C_NT_COMPOSITE_EXPORT, [AC_DEFINE_UNQUOTED([HAVE_GSS_C_NT_COMPOSITE_EXPORT], 1, [Define if GSS-API library supports recent naming extensions draft])], [], "$KRB5_LIBS")
AC_CHECK_LIB(krb5, gss_inquire_attrs_for_mech, [AC_DEFINE_UNQUOTED([HAVE_GSS_INQUIRE_ATTRS_FOR_MECH], 1, [Define if GSS-API library supports RFC 5587])], [], "$KRB5_LIBS")
--
1.7.5.4
From b9583e299f6e59d5e97ff888d5273657fab972f3 Mon Sep 17 00:00:00 2001
From: Pete Fotheringham <[log in to unmask]>
Date: Mon, 28 Nov 2011 15:10:52 +0000
Subject: [PATCH 2/2] Link against the Kerberos library in /usr/local instead
of the version in /usr
---
moonshot/mech_eap/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/moonshot/mech_eap/Makefile.am b/moonshot/mech_eap/Makefile.am
index a652182..720f79e 100644
--- a/moonshot/mech_eap/Makefile.am
+++ b/moonshot/mech_eap/Makefile.am
@@ -42,7 +42,7 @@ mech_eap_la_CXXFLAGS += \
@TARGET_CFLAGS@ $(EAP_CFLAGS)
mech_eap_la_LDFLAGS = -avoid-version -module \
-export-symbols $(GSSEAP_EXPORTS) -no-undefined \
- @RADSEC_LDFLAGS@ @OPENSSL_LDFLAGS@ @TARGET_LDFLAGS@
+ @KRB5_LDFLAGS@ @RADSEC_LDFLAGS@ @OPENSSL_LDFLAGS@ @TARGET_LDFLAGS@
if TARGET_WINDOWS
mech_eap_la_LDFLAGS += -debug
endif
--
1.7.5.4
|