diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-01-19 18:44:57 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-01-19 18:44:57 +0000 |
| commit | 4c40a2de53cb618b839d1647442dcd9f0e9d2ae4 (patch) | |
| tree | 8cbf419a991e02ec4d3edfca216ecf5b4efec709 /src | |
| parent | 7ad685d8ab901f3794b4a2a48b0d3a15fd4068ee (diff) | |
| download | krb5-4c40a2de53cb618b839d1647442dcd9f0e9d2ae4.tar.gz krb5-4c40a2de53cb618b839d1647442dcd9f0e9d2ae4.tar.xz krb5-4c40a2de53cb618b839d1647442dcd9f0e9d2ae4.zip | |
Change basename of libkadm5 libraries to avoid Heimdal conflict
ticket: 6644
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@23662 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/pre.in | 8 | ||||
| -rwxr-xr-x | src/krb5-config.in | 4 | ||||
| -rw-r--r-- | src/lib/kadm5/clnt/Makefile.in | 7 | ||||
| -rw-r--r-- | src/lib/kadm5/clnt/libkadm5clnt_mit.exports (renamed from src/lib/kadm5/clnt/libkadm5clnt.exports) | 0 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/Makefile.in | 7 | ||||
| -rw-r--r-- | src/lib/kadm5/srv/libkadm5srv_mit.exports (renamed from src/lib/kadm5/srv/libkadm5srv.exports) | 0 |
6 files changed, 18 insertions, 8 deletions
diff --git a/src/config/pre.in b/src/config/pre.in index 75204a314..db9b1ccc8 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 1952ccb5c..8435d02b0 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 aceb949fa..f6a11b43a 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 index 5e81580b1..5e81580b1 100644 --- a/src/lib/kadm5/clnt/libkadm5clnt.exports +++ b/src/lib/kadm5/clnt/libkadm5clnt_mit.exports diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index e813830de..9e8b26f83 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 index d8d3b2283..d8d3b2283 100644 --- a/src/lib/kadm5/srv/libkadm5srv.exports +++ b/src/lib/kadm5/srv/libkadm5srv_mit.exports |