From: Ken Raeburn <raeburn@mit.edu>
Date: Sun, 3 Apr 2011 23:21:59 +0000 (+0000)
Subject: CoreFoundation is no longer used for UCS2 conversions
X-Git-Tag: krb5-1.10-alpha1~489
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=879ba1536cf860b2e02c2019b5f0ba5dbead1ef2;p=krb5.git

CoreFoundation is no longer used for UCS2 conversions

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24834 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/configure.in b/src/configure.in
index d1f7ee5fa..b85bc911a 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1023,13 +1023,6 @@ case $krb5_cv_host in
 esac
 AC_SUBST(SUPPORTLIB_MAJOR)
 
-# 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)
-
 
 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 4d4fe942f..6098f911e 100644
--- a/src/lib/crypto/Makefile.in
+++ b/src/lib/crypto/Makefile.in
@@ -37,10 +37,9 @@ SUBDIROBJLISTS=$(CRYPTO_IMPL)/enc_provider/OBJS.ST			\
 # No dependencies.  Record places to find this shared object if the target
 # link editor and loader support it.
 DEPLIBS=
-CRYPTO_LIBS=@CRYPTO_LIBS@
 CRYPTO_IMPL_LIBS=@CRYPTO_IMPL_LIBS@
 SHLIB_DIRS=-L$(TOPLIBD)
-SHLIB_EXPLIBS= $(SUPPORT_LIB) $(CRYPTO_LIBS) $(CRYPTO_IMPL_LIBS) $(LIBS)
+SHLIB_EXPLIBS= $(SUPPORT_LIB) $(CRYPTO_IMPL_LIBS) $(LIBS)
 SHLIB_EXPDEPLIBS= $(SUPPORT_DEPLIB)
 SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@
 SHLIB_LIBDIRS= @SHLIB_LIBDIRS@
diff --git a/src/util/collected-client-lib/Makefile.in b/src/util/collected-client-lib/Makefile.in
index 1f7d31012..d814c5499 100644
--- a/src/util/collected-client-lib/Makefile.in
+++ b/src/util/collected-client-lib/Makefile.in
@@ -66,7 +66,7 @@ SHLIB_EXPDEPS =
 
 LIBS_UTILS=-lresolv
 # Add -lm if dumping thread stats, for sqrt.
-SHLIB_EXPLIBS= @CRYPTO_LIBS@ $(LIBS) $(DL_LIB) $(LIBS_UTILS)
+SHLIB_EXPLIBS= $(LIBS) $(DL_LIB) $(LIBS_UTILS)
 SHLIB_DIRS=
 SHLIB_RDIRS=