svn rev #24834: trunk/src/ lib/crypto/ util/collected-client-lib/

[raeburn@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24834
Commit By: raeburn
Log Message:
CoreFoundation is no longer used for UCS2 conversions.


Changed Files:
U   trunk/src/configure.in
U   trunk/src/lib/crypto/Makefile.in
U   trunk/src/util/collected-client-lib/Makefile.in
Modified: trunk/src/configure.in
===================================================================
--- trunk/src/configure.in	2011-04-03 23:21:56 UTC (rev 24833)
+++ trunk/src/configure.in	2011-04-03 23:21:59 UTC (rev 24834)
@@ -1023,14 +1023,7 @@
 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)
 fi

Modified: trunk/src/lib/crypto/Makefile.in
===================================================================
--- trunk/src/lib/crypto/Makefile.in	2011-04-03 23:21:56 UTC (rev 24833)
+++ trunk/src/lib/crypto/Makefile.in	2011-04-03 23:21:59 UTC (rev 24834)
@@ -37,10 +37,9 @@
 # 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@

Modified: trunk/src/util/collected-client-lib/Makefile.in
===================================================================
--- trunk/src/util/collected-client-lib/Makefile.in	2011-04-03 23:21:56 UTC (rev 24833)
+++ trunk/src/util/collected-client-lib/Makefile.in	2011-04-03 23:21:59 UTC (rev 24834)
@@ -66,7 +66,7 @@
 
 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=