commit f3594c86fac6c6bf4e41a600c2d7e8f22180fc75 Author: tlyu tlyu@dc483132-0cff-0310-8789-dd5450dbe970 Date: Thu Jan 21 22:49:01 2010 +0000

ticket: 6644 version_fixed: 1.8 status: resolved

pull up r23662 from trunk

------------------------------------------------------------------------ r23662 | ghudson | 2010-01-19 13:44:57 -0500 (Tue, 19 Jan 2010) | 3 lines

ticket: 6644 subject: Change basename of libkadm5 libraries to avoid Heimdal conflict

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-8@23664 dc483132-0cff-0310-8789-dd5450dbe970

src/config/pre.in | 8 ++++---- src/krb5-config.in | 4 ++-- src/lib/kadm5/clnt/Makefile.in | 7 ++++++- ...bkadm5clnt.exports => libkadm5clnt_mit.exports} | 0 src/lib/kadm5/srv/Makefile.in | 7 ++++++- ...libkadm5srv.exports => libkadm5srv_mit.exports} | 0 6 files changed, 18 insertions(+), 8 deletions(-) --- diff --git a/src/config/pre.in b/src/config/pre.in index 75204a3..db9b1cc 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -316,8 +316,8 @@ DEPLIBEXT=@DEPLIBEXT@ KDB5_PLUGIN_DEPLIBS = @KDB5_PLUGIN_DEPLIBS@ KDB5_PLUGIN_LIBS = @KDB5_PLUGIN_LIBS@

-KADMCLNT_DEPLIB = $(TOPLIBD)/libkadm5clnt$(DEPLIBEXT) -KADMSRV_DEPLIB = $(TOPLIBD)/libkadm5srv$(DEPLIBEXT) +KADMCLNT_DEPLIB = $(TOPLIBD)/libkadm5clnt_mit$(DEPLIBEXT) +KADMSRV_DEPLIB = $(TOPLIBD)/libkadm5srv_mit$(DEPLIBEXT) KDB5_DEPLIB = $(TOPLIBD)/libkdb5$(DEPLIBEXT) GSSRPC_DEPLIB = $(TOPLIBD)/libgssrpc$(DEPLIBEXT) GSS_DEPLIB = $(TOPLIBD)/libgssapi_krb5$(DEPLIBEXT) @@ -385,8 +385,8 @@ GSS_LIBS = $(GSS_KRB5_LIB) GSSRPC_LIBS = -lgssrpc $(GSS_LIBS) KADM_COMM_LIBS = $(GSSRPC_LIBS) # need fixing if ever used on Mac OS X! -KADMSRV_LIBS = -lkadm5srv $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS) -KADMCLNT_LIBS = -lkadm5clnt $(KADM_COMM_LIBS) +KADMSRV_LIBS = -lkadm5srv_mit $(HESIOD_LIBS) $(KDB5_LIBS) $(KADM_COMM_LIBS) +KADMCLNT_LIBS = -lkadm5clnt_mit $(KADM_COMM_LIBS)

# libutil for NetBSD, et al. for openpty(), etc. UTIL_LIB = @UTIL_LIB@ diff --git a/src/krb5-config.in b/src/krb5-config.in index 1952ccb..8435d02 100755 --- a/src/krb5-config.in +++ b/src/krb5-config.in @@ -194,12 +194,12 @@ if test -n "$do_libs"; then fi

if test $library = 'kadm_server'; then - lib_flags="$lib_flags -lkadm5srv -lkdb5 $KDB5_DB_LIB" + lib_flags="$lib_flags -lkadm5srv_mit -lkdb5 $KDB5_DB_LIB" library=kadm_common fi

if test $library = 'kadm_client'; then - lib_flags="$lib_flags -lkadm5clnt" + lib_flags="$lib_flags -lkadm5clnt_mit" library=kadm_common fi

diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index aceb949..f6a11b4 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -3,7 +3,7 @@ BUILDTOP=$(REL)..$(S)..$(S).. LOCALINCLUDES = -I$(BUILDTOP)/include/kadm5 DEFS=

-LIBBASE=kadm5clnt +LIBBASE=kadm5clnt_mit LIBMAJOR=7 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST @@ -70,6 +70,11 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs

install:: install-libs

+install-unix:: + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5clnt$(DEPLIBEXT) + (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(DEPLIBEXT) \ + libkadm5clnt$(DEPLIBEXT)) + depend:: includes

@lib_frag@ diff --git a/src/lib/kadm5/clnt/libkadm5clnt.exports b/src/lib/kadm5/clnt/libkadm5clnt_mit.exports similarity index 100% rename from src/lib/kadm5/clnt/libkadm5clnt.exports rename to src/lib/kadm5/clnt/libkadm5clnt_mit.exports diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index e813830..9e8b26f 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -9,7 +9,7 @@ DEFS= ##DOSBUILDTOP = ...... ##DOSLIBNAME = libkadm5srv.lib

-LIBBASE=kadm5srv +LIBBASE=kadm5srv_mit LIBMAJOR=7 LIBMINOR=0 STOBJLISTS=../OBJS.ST OBJS.ST @@ -87,6 +87,11 @@ clean-unix:: clean-liblinks clean-libs clean-libobjs

install:: install-libs

+install-unix:: + $(RM) $(DESTDIR)$(KRB5_LIBDIR)/libkadm5srv$(DEPLIBEXT) + (cd $(DESTDIR)$(KRB5_LIBDIR) && $(LN_S) lib$(LIBBASE)$(DEPLIBEXT) \ + libkadm5srv$(DEPLIBEXT)) + depend:: includes

@lib_frag@ diff --git a/src/lib/kadm5/srv/libkadm5srv.exports b/src/lib/kadm5/srv/libkadm5srv_mit.exports similarity index 100% rename from src/lib/kadm5/srv/libkadm5srv.exports rename to src/lib/kadm5/srv/libkadm5srv_mit.exports