diff -c -r src.old/config/shlib.conf src/config/shlib.conf
*** src.old/config/shlib.conf	Tue Jul 22 15:41:44 2003
--- src/config/shlib.conf	Tue Jul 22 15:41:36 2003
***************
*** 212,221 ****
  	SHLIBSEXT='.$(LIBMAJOR).dylib'
  	SHLIB_EXPFLAGS='$(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
  	SHLIBEXT=.dylib
! 	LDCOMBINE='$(CC) -undefined warning -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBVEXT)" $(CFLAGS) $(LDFLAGS)'
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'
  	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  	RUN_ENV='DYLD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export DYLD_LIBRARY_PATH;'
  	;;
  
  *-*-solaris*)
--- 212,225 ----
  	SHLIBSEXT='.$(LIBMAJOR).dylib'
  	SHLIB_EXPFLAGS='$(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
  	SHLIBEXT=.dylib
! 	LDCOMBINE='$(CC) -bind_at_load -dynamiclib -compatibility_version $(LIBMAJOR) -current_version $(LIBMAJOR).$(LIBMINOR) -install_name "$(KRB5_LIBDIR)/lib$(LIB)$(SHLIBVEXT)" $(CFLAGS) $(LDFLAGS)'
  	CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) -dynamic $(CFLAGS) $(LDFLAGS)'
  	CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
  	RUN_ENV='DYLD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export DYLD_LIBRARY_PATH;'
+ 	LDCOMBINE_TAIL="-lCredentialsCache -lKerberosIPC -lKerberosDebug -lKerberos4 -lstdc++ -framework Security -framework CoreFoundation -framework CoreServices"
+ cat >>confdefs.h <<\_ACEOF
+ #define USE_CCAPI 1
+ _ACEOF
  	;;
  
  *-*-solaris*)
diff -c -r src.old/lib/krb4/CCache-glue.c src/lib/krb4/CCache-glue.c
*** src.old/lib/krb4/CCache-glue.c	Tue Jul 22 15:41:45 2003
--- src/lib/krb4/CCache-glue.c	Tue Jul 22 15:41:37 2003
***************
*** 18,24 ****
  #ifdef USE_LOGIN_LIBRARY
  #include <KerberosLoginPrivate.h>
  #endif /* USE_LOGIN_LIBRARY */
! #include <CredentialsCache.h>
  
  #include <string.h>
  #include <stdlib.h>
--- 18,24 ----
  #ifdef USE_LOGIN_LIBRARY
  #include <KerberosLoginPrivate.h>
  #endif /* USE_LOGIN_LIBRARY */
! #include <Kerberos/CredentialsCache.h>
  
  #include <string.h>
  #include <stdlib.h>
diff -c -r src.old/lib/krb4/password_to_key.c src/lib/krb4/password_to_key.c
*** src.old/lib/krb4/password_to_key.c	Tue Jul 22 15:41:45 2003
--- src/lib/krb4/password_to_key.c	Tue Jul 22 15:41:37 2003
***************
*** 30,36 ****
  #include <stdlib.h>
  
  #ifdef USE_CCAPI
! #include <CredentialsCache.h>
  #endif
  #include "krb.h"
  #include "krb4int.h"
--- 30,36 ----
  #include <stdlib.h>
  
  #ifdef USE_CCAPI
! #include <Kerberos/CredentialsCache.h>
  #endif
  #include "krb.h"
  #include "krb4int.h"
diff -c -r src.old/lib/krb5/Makefile.in src/lib/krb5/Makefile.in
*** src.old/lib/krb5/Makefile.in	Tue Jul 22 15:41:50 2003
--- src/lib/krb5/Makefile.in	Tue Jul 22 15:41:42 2003
***************
*** 4,9 ****
--- 4,11 ----
  BUILDTOP=$(REL)..$(S)..
  LOCAL_SUBDIRS= error_tables asn.1 ccache keytab krb os rcache posix
  
+ LOCALINCLUDES = -I$(srcdir)$(S)ccache$(S)ccapi $(WIN_INCLUDES)
+ 
  ##DOSBUILDTOP = ..\..
  ##DOSLIBNAME=$(OUTPRE)krb5.lib
  ##DOSOBJFILEDEP=$(OUTPRE)asn1.lst $(OUTPRE)ccache.lst $(OUTPRE)err_tbls.lst $(OUTPRE)keytab.lst $(OUTPRE)krb.lst $(OUTPRE)os.lst $(OUTPRE)posix.lst $(OUTPRE)rcache.lst
***************
*** 24,29 ****
--- 26,32 ----
  	error_tables/OBJS.ST \
  	asn.1/OBJS.ST \
  	ccache/OBJS.ST \
+ 	ccache/ccapi/OBJS.ST \
  	keytab/OBJS.ST \
  	krb/OBJS.ST \
  	rcache/OBJS.ST \
***************
*** 35,40 ****
--- 38,44 ----
  	error_tables/OBJS.ST \
  	asn.1/OBJS.ST \
  	ccache/OBJS.ST \
+ 	ccache/ccapi/OBJS.ST \
  	keytab/OBJS.ST \
  	krb/OBJS.ST \
  	rcache/OBJS.ST \
diff -c -r src.old/lib/krb5/ccache/Makefile.in src/lib/krb5/ccache/Makefile.in
*** src.old/lib/krb5/ccache/Makefile.in	Tue Jul 22 15:41:47 2003
--- src/lib/krb5/ccache/Makefile.in	Tue Jul 22 15:41:40 2003
***************
*** 2,8 ****
  myfulldir=lib/krb5/ccache
  mydir=ccache
  BUILDTOP=$(REL)..$(S)..$(S)..
! LOCAL_SUBDIRS =
  
  RUN_SETUP = @KRB5_RUN_ENV@
  PROG_LIBPATH=-L$(TOPLIBD)
--- 2,8 ----
  myfulldir=lib/krb5/ccache
  mydir=ccache
  BUILDTOP=$(REL)..$(S)..$(S)..
! MY_SUBDIRS=ccapi
  
  RUN_SETUP = @KRB5_RUN_ENV@
  PROG_LIBPATH=-L$(TOPLIBD)
diff -c -r src.old/lib/krb5/ccache/ccapi/Makefile.in src/lib/krb5/ccache/ccapi/Makefile.in
*** src.old/lib/krb5/ccache/ccapi/Makefile.in	Tue Jul 22 15:41:46 2003
--- src/lib/krb5/ccache/ccapi/Makefile.in	Tue Jul 22 15:41:38 2003
***************
*** 24,26 ****
--- 24,29 ----
  
  all-unix:: all-libobjs
  clean-unix:: clean-libobjs
+ 
+ # @libobj_frag@
+ 
diff -c -r src.old/lib/krb5/ccache/ccapi/stdcc.h src/lib/krb5/ccache/ccapi/stdcc.h
*** src.old/lib/krb5/ccache/ccapi/stdcc.h	Tue Jul 22 15:41:47 2003
--- src/lib/krb5/ccache/ccapi/stdcc.h	Tue Jul 22 15:41:39 2003
***************
*** 2,8 ****
  #include "k5-int.h"
  	
  #ifdef USE_CCAPI
! #include <CredentialsCache2.h>
  #endif
  
  #if defined(_WIN32)
--- 2,8 ----
  #include "k5-int.h"
  	
  #ifdef USE_CCAPI
! #include <Kerberos/CredentialsCache2.h>
  #endif
  
  #if defined(_WIN32)
diff -c -r src.old/lib/krb5/ccache/ccapi/stdcc_util.h src/lib/krb5/ccache/ccapi/stdcc_util.h
*** src.old/lib/krb5/ccache/ccapi/stdcc_util.h	Tue Jul 22 15:41:47 2003
--- src/lib/krb5/ccache/ccapi/stdcc_util.h	Tue Jul 22 15:41:39 2003
***************
*** 4,10 ****
   */
  
  #if USE_CCAPI
! #include <CredentialsCache2.h>
  #endif
  
  #if defined(_WIN32)
--- 4,10 ----
   */
  
  #if USE_CCAPI
! #include <Kerberos/CredentialsCache2.h>
  #endif
  
  #if defined(_WIN32)
diff -c -r src.old/lib/krb5/configure.in src/lib/krb5/configure.in
*** src.old/lib/krb5/configure.in	Tue Jul 22 15:41:50 2003
--- src/lib/krb5/configure.in	Tue Jul 22 15:41:42 2003
***************
*** 24,27 ****
  KRB5_BUILD_PROGRAM
  KRB5_RUN_FLAGS
  dnl
! V5_AC_OUTPUT_MAKEFILE(. error_tables asn.1 ccache keytab krb rcache os posix)
--- 24,27 ----
  KRB5_BUILD_PROGRAM
  KRB5_RUN_FLAGS
  dnl
! V5_AC_OUTPUT_MAKEFILE(. error_tables asn.1 ccache ccache/ccapi keytab krb rcache os posix)
diff -c -r src.old/lib/krb5/krb/conv_creds.c src/lib/krb5/krb/conv_creds.c
*** src.old/lib/krb5/krb/conv_creds.c	Tue Jul 22 15:41:48 2003
--- src/lib/krb5/krb/conv_creds.c	Tue Jul 22 15:41:40 2003
***************
*** 31,37 ****
  #include "kerberosIV/krb.h"
  
  #ifdef USE_CCAPI
! #include <CredentialsCache.h>
  #endif
  
  #define krb524_debug krb5int_krb524_debug
--- 31,37 ----
  #include "kerberosIV/krb.h"
  
  #ifdef USE_CCAPI
! #include <Kerberos/CredentialsCache.h>
  #endif
  
  #define krb524_debug krb5int_krb524_debug
diff -c -r src.old/lib/krb5/os/ccdefname.c src/lib/krb5/os/ccdefname.c
*** src.old/lib/krb5/os/ccdefname.c	Tue Jul 22 15:41:49 2003
--- src/lib/krb5/os/ccdefname.c	Tue Jul 22 15:41:41 2003
***************
*** 32,38 ****
  #include <stdio.h>
  
  #if defined(USE_CCAPI)
! #include <CredentialsCache.h>
  #endif
  
  #if defined(_WIN32)
--- 32,38 ----
  #include <stdio.h>
  
  #if defined(USE_CCAPI)
! #include <Kerberos/CredentialsCache.h>
  #endif
  
  #if defined(_WIN32)