aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Raeburn <raeburn@mit.edu>2008-03-04 19:25:12 +0000
committerKen Raeburn <raeburn@mit.edu>2008-03-04 19:25:12 +0000
commit110c2045b5fcac8559a6ecabba3850f8ba091601 (patch)
tree58661334f44cf554af714bf781126c806ac045bd
parent55dbf9d7dadf1783665f56b296d7e633afdc6ef1 (diff)
downloadkrb5-110c2045b5fcac8559a6ecabba3850f8ba091601.zip
krb5-110c2045b5fcac8559a6ecabba3850f8ba091601.tar.gz
krb5-110c2045b5fcac8559a6ecabba3850f8ba091601.tar.bz2
Add "-framework CoreFoundation" to crypto library link command in darwin-mode
build on mac. ticket: 5894 status: open git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20253 dc483132-0cff-0310-8789-dd5450dbe970
-rw-r--r--src/configure.in7
-rw-r--r--src/lib/crypto/Makefile.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/configure.in b/src/configure.in
index d010d03..362df04 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1012,6 +1012,13 @@ case $krb5_cv_host in
esac
AC_SUBST(SUPPORTLIB_MAJOR)
dnl
+dnl On the Mac we need CoreFoundation for UCS-2 conversion for RC4.
+case $krb5_cv_host in
+*-*-darwin* | *-*-rhapsody*) CRYPTO_LIBS="-framework CoreFoundation" ;;
+*) CRYPTO_LIBS="" ;;
+esac
+AC_SUBST(CRYPTO_LIBS)
+dnl
dnl
if test "$COM_ERR_VERSION" = k5 ; then
K5_GEN_MAKEFILE(util/et)
diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in
index 12172f9..e0cbf8c 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -168,7 +168,7 @@ SUBDIROBJLISTS=crc32/OBJS.ST des/OBJS.ST dk/OBJS.ST enc_provider/OBJS.ST \
# link editor and loader support it.
DEPLIBS=
SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_EXPLIBS= $(SUPPORT_LIB) $(LIBS)
+SHLIB_EXPLIBS= $(SUPPORT_LIB) @CRYPTO_LIBS@ $(LIBS)
SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
SHLIB_LIBDIRS= @SHLIB_LIBDIRS@