diff options
139 files changed, 838 insertions, 278 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 38f14f0..126afcf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ + +Thu Jun 15 18:15:54 EDT 1995 Paul Park (pjpark@mit.edu) + * aclocal.m4 - Separate K4 libraries; Separate library specification + from actual library path so we can do a dependency check + using the DEP_<lib> and link with the library itself. + - Add LinkFileDir(): a macro which generates a symlink in + another directory. + - Figure out values for shared library parameters. + - Add rules for building with these shared libraries. + * configure.in - Add system-specific linker flags. + Wed Jun 14 16:51:28 1995 Tom Yu (tlyu@dragons-lair) * aclocal.m4(_MAKE_SUBDIRS): revert yet again; no workaround since diff --git a/src/aclocal.m4 b/src/aclocal.m4 index 9a9a04a..9e816df 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -333,21 +333,46 @@ withval=yes if test $withval = no; then AC_MSG_RESULT(no krb4 support) KRB4_LIB= + DEPKRB4_LIB= + KRB4_CRYPTO_LIB= + DEPKRB4_CRYPTO_LIB= KDB4_LIB= + DEPKDB4_LIB= + LDARGS= + krb5_cv_build_krb4_libs=no + krb5_cv_krb4_libdir= else ADD_DEF(-DKRB5_KRB4_COMPAT) if test $withval = yes; then AC_MSG_RESULT(built in krb4 support) - KRB4_LIB='$(TOPLIBD)/libkrb4.a $(TOPLIBD)/libdes425.a' - KDB4_LIB='$(TOPLIBD)/libkdb4.a' + KRB4_LIB='-lkrb4' + DEPKRB4_LIB='$(TOPLIBD)/libkrb4.a' + KRB4_CRYPTO_LIB='-ldes425' + DEPKRB4_CRYPTO_LIB='$(TOPLIBD)/libdes425.a' + KDB4_LIB='-lkdb4' + DEPKDB4_LIB='$(TOPLIBD)/libkdb4.a' + LDARGS= + krb5_cv_build_krb4_libs=yes + krb5_cv_krb4_libdir= else AC_MSG_RESULT(preinstalled krb4 in $withval) - KRB4_LIB="$withval/lib/libkrb.a"' $(TOPLIBD)/libdes425.a' - KDB4_LIB="$withval/lib/libkdb.a" + KRB4_LIB="-lkrb" + DEPKRB4_LIB="$withval/lib/libkrb.a" + KRB4_CRYPTO_LIB='-ldes425' + DEPKRB4_CRYPTO_LIB='$(TOPLIBD)/libdes425.a' + KDB4_LIB="-lkdb" + DEPKDB4_LIB="$withval/lib/libkdb.a" + LDARGS="-L$withval/lib" + krb5_cv_build_krb4_libs=no + krb5_cv_krb4_libdir="$withval/lib" fi fi AC_SUBST(KRB4_LIB) AC_SUBST(KDB4_LIB) +AC_SUBST(KRB4_CRYPTO_LIB) +AC_SUBST(DEPKRB4_LIB) +AC_SUBST(DEPKDB4_LIB) +AC_SUBST(DEPKRB4_CRYPTO_LIB) AC_CONST ])dnl dnl @@ -411,6 +436,24 @@ changequote([,])dnl AC_DIVERT_POP()dnl ])dnl dnl +dnl Like above, but specifies how to get from link target to source, e.g. +dnl LinkFileDir(../foo, blotz, ./bar) issues a: +dnl ln -s ../foo ./bar/blotz +dnl +define(LinkFileDir,[ +AC_LN_S +AC_DIVERT_PUSH(AC_DIVERSION_MAKEFILE)dnl +changequote({,})dnl + +$1:: $2{ + $(RM) $}{@ + $(LN) }$3{$(S)$}{? $}{@ + +} +changequote([,])dnl +AC_DIVERT_POP()dnl +])dnl +dnl dnl explicit append text (for non-general things) -- AppendRule(txt) dnl define(AppendRule,[ @@ -669,6 +712,22 @@ dnl define(V5_MAKE_SHARED_LIB,[ AC_ARG_ENABLE([shared], [ --enable-shared build with shared libraries],[ +SHLIB_TAIL_COMP=$krb5_cv_shlibs_tail_comp +AC_SUBST(SHLIB_TAIL_COMP) +LD_UNRESOLVED_PREFIX=$krb5_cv_shlibs_sym_ufo +AC_SUBST(LD_UNRESOLVED_PREFIX) +LD_SHLIBDIR_PREFIX=$krb5_cv_shlibs_dirhead +AC_SUBST(LD_SHLIBDIR_PREFIX) +SHLIB_RPATH_DIRS= +if test $krb5_cv_shlibs_use_dirs = yes ; then + SHLIB_RPATH_DIRS="$krb5_cv_shlibs_dirhead [$](KRB5_SHLIBDIR) $krb5_cv_shlibs_dirhead `pwd`[$](S)[$](TOPLIBD)" +fi +AC_SUBST(SHLIB_RPATH_DIRS) +SHLIB_LIBDIRS="-L[$](TOPLIBD)" +if test X$krb5_cv_krb4_libdir != X ; then + SHLIB_LIBDIRS="$SHLIB_LIBDIRS -L$krb5_cv_krb4_libdir" +fi +AC_SUBST(SHLIB_LIBDIRS) HOST_TYPE=$krb5_cv_host AC_SUBST(HOST_TYPE) SHEXT=$krb5_cv_shlibs_ext @@ -681,8 +740,10 @@ all:: $(DO_MAKE_SHLIB) clean:: $(RM) $1.[$](SHEXT) -$1.[$](SHEXT): [$](LIBDONE) - [$](SRCTOP)/util/makeshlib [$](HOST_TYPE) [$](CC) [$]@ [$](LIB_SUBDIRS) +$1.[$](SHEXT): [$](LIBDONE) [$](DEPLIBS) + [$](SRCTOP)/util/makeshlib [$](HOST_TYPE) [$](CC) [$]@ \ + "[$](SHLIB_LIBDIRS)" \ + "[$](SHLIB_LIBS)" "[$](SHLIB_LDFLAGS)" [$](LIB_SUBDIRS) AC_DIVERT_POP()dnl ],[ @@ -690,3 +751,34 @@ DO_MAKE_SHLIB= ])dnl AC_SUBST(DO_MAKE_SHLIB) ])dnl + +dnl +dnl This rule adds the additional Makefile fragment necessary to actually +dnl link with the shared library +dnl +define(V5_USE_SHARED_LIB,[ +AC_ARG_WITH([shared], +[ --with-shared use shared libraries (default) + --without-shared don't use shared libraries], +, +withval=yes +)dnl +if test $withval = yes; then + AC_MSG_RESULT(Using shared libraries) + LDARGS="$krb5_cv_shlibs_ldflag -L[$](TOPLIBD) $LDARGS" + if test $krb5_cv_exe_need_dirs = yes; then + LDARGS="$LDARGS $krb5_cv_shlibs_dirhead [$](KRB5_SHLIBDIR) $krb5_cv_shlibs_dirhead `pwd`[$](S)[$](TOPLIBD)" + fi + SHLIB_TAIL_COMP=$krb5_cv_shlibs_tail_comp + AC_SUBST(SHLIB_TAIL_COMP) +else + AC_MSG_RESULT(Using archive libraries) + LDARGS="$krb5_cv_noshlibs_ldflag -L[$](TOPLIBD) $LDARGS" +fi +AC_SUBST(LDARGS) +])dnl + + + + + diff --git a/src/admin/aname/ChangeLog b/src/admin/aname/ChangeLog index ab3207c..fdfbfc1 100644 --- a/src/admin/aname/ChangeLog +++ b/src/admin/aname/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 15:22:33 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Fri Jun 9 18:13:43 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/admin/aname/Makefile.in b/src/admin/aname/Makefile.in index 0f418e9..cb607a9 100644 --- a/src/admin/aname/Makefile.in +++ b/src/admin/aname/Makefile.in @@ -3,12 +3,12 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) $(DBMLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) @@ -18,7 +18,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) all:: kdb5_anadd kdb5_anadd: kdb5_anadd.o $(DEPLIBS) - $(CC) $(CFLAGS) -o kdb5_anadd kdb5_anadd.o $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_anadd kdb5_anadd.o $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kdb5_anadd $(DESTDIR)$(ADMIN_BINDIR)/kdb5_anadd diff --git a/src/admin/aname/configure.in b/src/admin/aname/configure.in index 9d79e40..630bb23 100644 --- a/src/admin/aname/configure.in +++ b/src/admin/aname/configure.in @@ -3,4 +3,5 @@ CONFIG_RULES AC_PROG_INSTALL AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/convert/ChangeLog b/src/admin/convert/ChangeLog index f906781..406bb5b 100644 --- a/src/admin/convert/ChangeLog +++ b/src/admin/convert/ChangeLog @@ -1,3 +1,11 @@ + +Thu Jun 15 15:27:36 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, for K4, use KRB4_LIB and KRB4_CRYPTO_LIB, these wer + split out. + * configure.in - Add shared library usage check. + Fri Jun 9 18:14:06 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/admin/convert/Makefile.in b/src/admin/convert/Makefile.in index 78f8200..f236098 100644 --- a/src/admin/convert/Makefile.in +++ b/src/admin/convert/Makefile.in @@ -1,4 +1,4 @@ -KRB4_LIB = @KRB4_LIB@ +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ KDB4_LIB = @KDB4_LIB@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) @@ -6,12 +6,12 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) @@ -22,7 +22,7 @@ LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV all:: kdb5_convert kdb5_convert: kdb5_convert.o $(DEPLIBS) - $(CC) $(CFLAGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_convert kdb5_convert.o $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kdb5_convert ${DESTDIR}$(ADMIN_BINDIR)/kdb5_convert diff --git a/src/admin/convert/configure.in b/src/admin/convert/configure.in index 31197bd..77b90e8 100644 --- a/src/admin/convert/configure.in +++ b/src/admin/convert/configure.in @@ -3,4 +3,5 @@ CONFIG_RULES AC_PROG_INSTALL AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/create/ChangeLog b/src/admin/create/ChangeLog index 282021f..45d5773 100644 --- a/src/admin/create/ChangeLog +++ b/src/admin/create/ChangeLog @@ -1,3 +1,12 @@ + +Thu Jun 15 15:29:39 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it wasn't used. + * configure.in - Remove checks for dbm, they are not needed any + more with the Berkeley database code. Add shared library + usage check. + Fri Jun 9 18:14:21 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/admin/create/Makefile.in b/src/admin/create/Makefile.in index ac7658f..3491d9f 100644 --- a/src/admin/create/Makefile.in +++ b/src/admin/create/Makefile.in @@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) @@ -18,7 +17,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) all:: kdb5_create kdb5_create: kdb5_create.o $(DEPLIBS) - $(CC) $(CFLAGS) -o kdb5_create kdb5_create.o $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_create kdb5_create.o $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kdb5_create $(DESTDIR)$(ADMIN_BINDIR)/kdb5_create diff --git a/src/admin/create/configure.in b/src/admin/create/configure.in index e2115c6..f5524a2 100644 --- a/src/admin/create/configure.in +++ b/src/admin/create/configure.in @@ -1,6 +1,5 @@ AC_INIT(kdb5_create.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/destroy/ChangeLog b/src/admin/destroy/ChangeLog index 7812b96..6435759 100644 --- a/src/admin/destroy/ChangeLog +++ b/src/admin/destroy/ChangeLog @@ -1,4 +1,13 @@ +Thu Jun 15 15:31:59 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + + Tue May 30 14:41:50 EDT 1995 Paul Park (pjpark@mit.edu) * kdb5_destroy.c: Remove knowledge of database files. Use kdb5_db_ destroy to destroy the database. diff --git a/src/admin/destroy/Makefile.in b/src/admin/destroy/Makefile.in index 01303ac..05770f3 100644 --- a/src/admin/destroy/Makefile.in +++ b/src/admin/destroy/Makefile.in @@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) @@ -18,7 +17,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) all:: kdb5_destroy kdb5_destroy: kdb5_destroy.o $(DEPLIBS) - $(CC) $(CFLAGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_destroy kdb5_destroy.o $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kdb5_destroy ${DESTDIR}$(ADMIN_BINDIR)/kdb5_destroy diff --git a/src/admin/destroy/configure.in b/src/admin/destroy/configure.in index 92792cc..898b678 100644 --- a/src/admin/destroy/configure.in +++ b/src/admin/destroy/configure.in @@ -1,6 +1,5 @@ AC_INIT(kdb5_destroy.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/edit/ChangeLog b/src/admin/edit/ChangeLog index 9e82a37..ca2ffa1 100644 --- a/src/admin/edit/ChangeLog +++ b/src/admin/edit/ChangeLog @@ -1,3 +1,11 @@ + +Thu Jun 15 15:34:59 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, for K4, use KRB4_LIB and KRB4_CRYPTO_LIB, these wer + split out. + * configure.in - Add shared library usage check. + Fri Jun 9 18:14:43 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/admin/edit/Makefile.in b/src/admin/edit/Makefile.in index a8859cc..9b53cb6 100644 --- a/src/admin/edit/Makefile.in +++ b/src/admin/edit/Makefile.in @@ -1,4 +1,4 @@ -KRB4_LIB = @KRB4_LIB@ +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ KDB4_LIB = @KDB4_LIB@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g @@ -6,15 +6,14 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(SSLIB) $(COMERRLIB) $(DBMLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) - DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) LOCAL_LIBRARIES = $(KDBLIB) $(KDB4_LIB) $(KLIB) LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV @@ -39,7 +38,7 @@ SRCS= $(srcdir)/kdb5_edit.c \ all:: kdb5_edit kdb5_edit: kdb5_edit.o $(DEPLIBS) $(OBJS) - $(CC) $(CFLAGS) -o kdb5_edit $(OBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_edit $(OBJS) $(LOCAL_LIBRARIES) $(LIBS) getdate.c getdate.h: getdate.y $(RM) getdate.c getdate.h y.tab.* diff --git a/src/admin/edit/configure.in b/src/admin/edit/configure.in index e2f9bb0..92b929e 100644 --- a/src/admin/edit/configure.in +++ b/src/admin/edit/configure.in @@ -10,4 +10,5 @@ AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) AC_HAVE_FUNCS(getcwd) SS_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/admin/stash/ChangeLog b/src/admin/stash/ChangeLog index 976ea9a..26ef17e 100644 --- a/src/admin/stash/ChangeLog +++ b/src/admin/stash/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 15:35:39 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Fri Jun 9 18:16:17 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/admin/stash/Makefile.in b/src/admin/stash/Makefile.in index 9521412..0ccbee0 100644 --- a/src/admin/stash/Makefile.in +++ b/src/admin/stash/Makefile.in @@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) @@ -18,7 +17,7 @@ LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) all:: kdb5_stash kdb5_stash: kdb5_stash.o $(DEPLIBS) - $(CC) $(CFLAGS) -o kdb5_stash kdb5_stash.o $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdb5_stash kdb5_stash.o $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kdb5_stash ${DESTDIR}$(ADMIN_BINDIR)/kdb5_stash diff --git a/src/admin/stash/configure.in b/src/admin/stash/configure.in index d8b4a56..e709120 100644 --- a/src/admin/stash/configure.in +++ b/src/admin/stash/configure.in @@ -1,6 +1,5 @@ AC_INIT(kdb5_stash.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index c98a8ec..fecd108 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,14 @@ + +Thu Jun 15 17:32:20 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. Also, for K4, use + KRB4_LIB and KRB4_CRYPTO_LIB, these were + split out. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Sat Jun 10 22:56:10 1995 Tom Yu (tlyu@dragons-lair) * forward.c, kcmd.c, krcp.c, krlogind.c, krshd.c: diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index 4f01dd5..2d78cd3 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -3,9 +3,9 @@ LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV SETENVSRC=@SETENVSRC@ SETENVOBJ=@SETENVOBJ@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -KRB4_LIB = @KRB4_LIB@ -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ +KLIB = -lkadm -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) LOGINLIBS = @LOGINLIBS@ LIBOBJS=@LIBOBJS@ @@ -32,35 +32,35 @@ clean:: $(RM) rsh rcp rlogin krshd krlogind login.krb5 rsh: krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o rsh krsh.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) rsh $(DESTDIR)$(CLIENT_BINDIR)/rsh $(INSTALL_DATA) $(srcdir)/rsh.M ${DESTDIR}$(CLIENT_MANDIR)/rsh.1 rcp: krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o rcp krcp.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) rcp $(DESTDIR)$(CLIENT_BINDIR)/rcp $(INSTALL_DATA) $(srcdir)/rcp.M ${DESTDIR}$(CLIENT_MANDIR)/rcp.1 rlogin: krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o rlogin krlogin.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) rlogin $(DESTDIR)$(CLIENT_BINDIR)/rlogin $(INSTALL_DATA) $(srcdir)/rlogin.M ${DESTDIR}$(CLIENT_MANDIR)/rlogin.1 krshd: krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o krshd krshd.o kcmd.o logutil.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) krshd $(DESTDIR)$(SERVER_BINDIR)/krshd $(INSTALL_DATA) $(srcdir)/krshd.M ${DESTDIR}$(SERVER_MANDIR)/krshd.8 krlogind: krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o krlogind krlogind.o logutil.o kcmd.o forward.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) krlogind $(DESTDIR)$(SERVER_BINDIR)/krlogind @@ -71,7 +71,7 @@ install:: # krb5_read_passwrd in krb5.a. Sigh, circular references. # login.krb5: login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KLIB) $(LIBS) $(LOGINLIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o login.krb5 login.o logutil.o $(SETENVOBJ) $(LIBOBJS) $(KLIB) $(KLIB) $(LIBS) $(LOGINLIBS) install:: $(INSTALL_PROGRAM) login.krb5 $(DESTDIR)$(SERVER_BINDIR)/login.krb5 diff --git a/src/appl/bsd/configure.in b/src/appl/bsd/configure.in index e4a77e9..463a434 100644 --- a/src/appl/bsd/configure.in +++ b/src/appl/bsd/configure.in @@ -2,8 +2,6 @@ AC_INIT(krlogind.c) CONFIG_RULES AC_PROG_INSTALL dnl dbm libs for use of an_to_ln -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) AC_CHECK_LIB(util,main) AC_CHECK_LIB(crypt,crypt) dnl @@ -136,4 +134,5 @@ dnl dnl ADD_DEF(-DKERBEROS) AC_CONST +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog index ff12e31..d8cf29f 100644 --- a/src/appl/gss-sample/ChangeLog +++ b/src/appl/gss-sample/ChangeLog @@ -1,3 +1,10 @@ + +Thu Jun 15 17:35:08 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. + * configure.in - Add shared library usage check. + Sat Jun 10 19:06:03 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * gss-misc.c (recv_token): Initialize local variable to 0. diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in index 65f6c07..a04d03b 100644 --- a/src/appl/gss-sample/Makefile.in +++ b/src/appl/gss-sample/Makefile.in @@ -1,7 +1,6 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= SRCS= gss-client.c gss-misc.c gss-server.c @@ -9,16 +8,15 @@ OBJS= gss-client.o gss-misc.o gss-server.o all:: gss-server gss-client -KLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \ - $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lgssapi_krb5 -lkrb5 -lcrypto $(COMERRLIB) DEPKLIB = $(TOPLIBD)/gssapi/libgssapi_krb5.a $(TOPLIBD)/libkrb5.a \ - $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) + $(TOPLIBD)/libcrypto.a $(COMERRLIB) gss-server: gss-server.o gss-misc.o $(DEPKLIB) - $(LD) $(CFLAGS) -o gss-server gss-server.o gss-misc.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o gss-server gss-server.o gss-misc.o $(KLIB) $(LIBS) gss-client: gss-client.o gss-misc.o $(DEPKLIB) - $(LD) $(CFLAGS) -o gss-client gss-client.o gss-misc.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o gss-client gss-client.o gss-misc.o $(KLIB) $(LIBS) gss-client.o: $(srcdir)/gss-client.c diff --git a/src/appl/gss-sample/configure.in b/src/appl/gss-sample/configure.in index 108e2b9..def5fa4 100644 --- a/src/appl/gss-sample/configure.in +++ b/src/appl/gss-sample/configure.in @@ -4,4 +4,5 @@ AC_HAVE_HEADERS(unistd.h) AC_HEADER_CHECK(string.h,AC_DEFINE(USE_STRING_H)) AC_CONST AC_PROG_INSTALL +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/mailquery/ChangeLog b/src/appl/mailquery/ChangeLog index 1b8b3e0..7789fad 100644 --- a/src/appl/mailquery/ChangeLog +++ b/src/appl/mailquery/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:36:11 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 22:57:11 1995 Tom Yu (tlyu@dragons-lair) * poplib.c: krb5_auth_context redefinitions diff --git a/src/appl/mailquery/Makefile.in b/src/appl/mailquery/Makefile.in index 9af164e..8017aaf 100644 --- a/src/appl/mailquery/Makefile.in +++ b/src/appl/mailquery/Makefile.in @@ -3,13 +3,13 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) HESIODLIB = mailquery: mailquery.o poplib.o $(DEPKLIB) - $(CC) $(CFLAGS) -o mailquery mailquery.o poplib.o $(KLIB) \ + $(LD) $(LDFLAGS) $(LDARGS) -o mailquery mailquery.o poplib.o $(KLIB) \ $(HESIODLIB) $(LIBS) mailquery.o: $(srcdir)/mailquery.c diff --git a/src/appl/mailquery/configure.in b/src/appl/mailquery/configure.in index 98a36ea..b49dfc0 100644 --- a/src/appl/mailquery/configure.in +++ b/src/appl/mailquery/configure.in @@ -3,4 +3,5 @@ CONFIG_RULES AC_PROG_INSTALL AC_HAVE_HEADERS(unistd.h stdlib.h) AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR)) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/movemail/ChangeLog b/src/appl/movemail/ChangeLog index 90fb8aa..9e46edd 100644 --- a/src/appl/movemail/ChangeLog +++ b/src/appl/movemail/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:37:08 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 22:57:39 1995 Tom Yu (tlyu@dragons-lair) * movemail.c: krb5_auth_context redefinitions diff --git a/src/appl/movemail/Makefile.in b/src/appl/movemail/Makefile.in index f5a4399..fcbd2c6 100644 --- a/src/appl/movemail/Makefile.in +++ b/src/appl/movemail/Makefile.in @@ -6,13 +6,13 @@ OBJS = movemail.o movemail-mmdf.o all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) HESIODLIB = movemail: movemail.o $(DEPKLIB) - $(CC) $(CFLAGS) -o movemail movemail.o $(KLIB) $(HESIODLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o movemail movemail.o $(KLIB) $(HESIODLIB) $(LIBS) all:: movemail diff --git a/src/appl/movemail/configure.in b/src/appl/movemail/configure.in index b9b250a..fd1fcce 100644 --- a/src/appl/movemail/configure.in +++ b/src/appl/movemail/configure.in @@ -3,4 +3,5 @@ CONFIG_RULES AC_PROG_INSTALL CHECK_FCNTL AC_HAVE_HEADERS(unistd.h) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/popper/ChangeLog b/src/appl/popper/ChangeLog index 6737c5c..7a422ca 100644 --- a/src/appl/popper/ChangeLog +++ b/src/appl/popper/ChangeLog @@ -1,3 +1,12 @@ + +Thu Jun 15 17:38:06 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Sat Jun 10 22:57:55 1995 Tom Yu (tlyu@dragons-lair) * pop_init.c: krb5_auth_context redefinitions diff --git a/src/appl/popper/Makefile.in b/src/appl/popper/Makefile.in index 2df339b..b35f381 100644 --- a/src/appl/popper/Makefile.in +++ b/src/appl/popper/Makefile.in @@ -10,12 +10,11 @@ CFLAGS = $(CCOPTS) -DMAILDIR=\"/usr/spool/pop\" -DKERBEROS -DKRB5 -DDEBUG $(DEFS SERVER_MANSUFFIX = 8 COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) OBJS = pop_dele.o pop_dropcopy.o pop_dropinfo.o \ pop_get_command.o pop_get_subcommand.o pop_init.o \ @@ -25,7 +24,7 @@ OBJS = pop_dele.o pop_dropcopy.o pop_dropinfo.o \ pop_user.o pop_xtnd.o pop_xmit.o popper.o popper: $(OBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o popper $(OBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o popper $(OBJS) $(KLIB) $(LIBS) all:: popper diff --git a/src/appl/popper/configure.in b/src/appl/popper/configure.in index 144c565..23da3ad 100644 --- a/src/appl/popper/configure.in +++ b/src/appl/popper/configure.in @@ -3,8 +3,6 @@ CONFIG_RULES AC_PROG_INSTALL AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAS_VSPRINTF)) AC_CHECK_LIB(BSD,main) -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) CHECK_WAIT_TYPE CHECK_FCNTL KRB5_POSIX_LOCKS @@ -13,4 +11,5 @@ AC_HAVE_HEADERS(strings.h) AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H)) AC_HEADER_CHECK(paths.h,AC_DEFINE(HAS_PATHS_H)) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog index 596e284..211bf08 100644 --- a/src/appl/sample/sclient/ChangeLog +++ b/src/appl/sample/sclient/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:38:55 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 22:58:15 1995 Tom Yu (tlyu@dragons-lair) * sclient.c: krb5_auth_context redefinitions diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in index d802a33..8651c01 100644 --- a/src/appl/sample/sclient/Makefile.in +++ b/src/appl/sample/sclient/Makefile.in @@ -5,11 +5,11 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) sclient: sclient.o $(DEPKLIB) - $(CC) $(CFLAGS) -o sclient sclient.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o sclient sclient.o $(KLIB) $(LIBS) sclient.o: $(srcdir)/sclient.c diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in index 93af69e..a7b6a4a 100644 --- a/src/appl/sample/sclient/configure.in +++ b/src/appl/sample/sclient/configure.in @@ -1,4 +1,5 @@ AC_INIT(sclient.c) CONFIG_RULES AC_PROG_INSTALL +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog index c91b11f..d6bf4a7 100644 --- a/src/appl/sample/sserver/ChangeLog +++ b/src/appl/sample/sserver/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:39:17 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 22:58:40 1995 Tom Yu (tlyu@dragons-lair) * sserver.c: krb5_auth_context redefinitions diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in index d4ec742..ac59fd3 100644 --- a/src/appl/sample/sserver/Makefile.in +++ b/src/appl/sample/sserver/Makefile.in @@ -1,15 +1,15 @@ -CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) +CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KRB5_LOG LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) sserver: sserver.o $(DEPKLIB) - $(CC) $(CFLAGS) -o sserver sserver.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o sserver sserver.o $(KLIB) $(LIBS) sserver.o: $(srcdir)/sserver.c diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in index c8dee12..82a884d 100644 --- a/src/appl/sample/sserver/configure.in +++ b/src/appl/sample/sserver/configure.in @@ -1,4 +1,5 @@ AC_INIT(sserver.c) CONFIG_RULES AC_PROG_INSTALL +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog index 4ab149e..79b2c11 100644 --- a/src/appl/simple/client/ChangeLog +++ b/src/appl/simple/client/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:39:54 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 22:58:57 1995 Tom Yu (tlyu@dragons-lair) * sim_client.c: krb5_auth_context redefinitions diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in index 03e59f6..f6ac698 100644 --- a/src/appl/simple/client/Makefile.in +++ b/src/appl/simple/client/Makefile.in @@ -2,17 +2,16 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) LOCALINCLUDE= -I.. -I$(srcdir)/.. sim_client: sim_client.o $(DEPKLIB) - $(CC) $(CFLAGS) -o sim_client sim_client.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o sim_client sim_client.o $(KLIB) $(LIBS) sim_client.o: $(srcdir)/sim_client.c diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in index f670061..84cdeda 100644 --- a/src/appl/simple/client/configure.in +++ b/src/appl/simple/client/configure.in @@ -1,4 +1,5 @@ AC_INIT(sim_client.c) CONFIG_RULES AC_PROG_INSTALL +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog index 7d688c8..01c8241 100644 --- a/src/appl/simple/server/ChangeLog +++ b/src/appl/simple/server/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:40:51 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 22:59:20 1995 Tom Yu (tlyu@dragons-lair) * sim_server.c: krb5_auth_context redefinitions diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in index 07e75fe..5f4d33f 100644 --- a/src/appl/simple/server/Makefile.in +++ b/src/appl/simple/server/Makefile.in @@ -2,17 +2,16 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= LOCALINCLUDE= -I.. -I$(srcdir)/.. all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) sim_server: sim_server.o $(DEPKLIB) - $(CC) $(CFLAGS) -o sim_server sim_server.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o sim_server sim_server.o $(KLIB) $(LIBS) sim_server.o: $(srcdir)/sim_server.c diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in index ee3b891..8823e38 100644 --- a/src/appl/simple/server/configure.in +++ b/src/appl/simple/server/configure.in @@ -1,4 +1,5 @@ AC_INIT(sim_server.c) CONFIG_RULES AC_PROG_INSTALL +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog index 9a89dd7..f4ffef9 100644 --- a/src/appl/telnet/telnet/ChangeLog +++ b/src/appl/telnet/telnet/ChangeLog @@ -1,3 +1,12 @@ + +Thu Jun 15 17:41:31 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Fri Jun 9 18:29:49 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in index 05039d2..33423e6 100644 --- a/src/appl/telnet/telnet/Makefile.in +++ b/src/appl/telnet/telnet/Makefile.in @@ -26,8 +26,8 @@ LOCALINCLUDES=-I.. -I$(srcdir)/.. CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES) ARPA_TELNET= $(srcdir)/../arpa/telnet.h COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -KRB4_LIB = @KRB4_LIB@ -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ +KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) SRCS= commands.c main.c network.c ring.c \ @@ -43,7 +43,7 @@ OBJS= authenc.o commands.o main.o network.o ring.o sys_bsd.o \ all:: telnet telnet: $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a - $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) + $(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) clean:: $(RM) telnet diff --git a/src/appl/telnet/telnet/configure.in b/src/appl/telnet/telnet/configure.in index f9d9ba2..3bfbe66 100644 --- a/src/appl/telnet/telnet/configure.in +++ b/src/appl/telnet/telnet/configure.in @@ -24,8 +24,6 @@ AC_HEADER_CHECK(sys/filio.h,AC_DEFINE(FILIO_H)) AC_HEADER_CHECK(sys/stream.h,AC_DEFINE(STREAMS)) AC_FUNC_CHECK(cgetent,AC_DEFINE(HAS_CGETENT)) AC_FUNC_CHECK(setupterm,AC_DEFINE(HAS_SETUPTERM)) -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) CHECK_SIGNALS if test "$KRB4_LIB" = ''; then AC_MSG_RESULT(No Kerberos 4 authentication) @@ -33,4 +31,5 @@ else AC_MSG_RESULT(Kerberos 4 authentication enabled) AC_DEFINE(KRB4) fi +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog index 8c0a5bd..6cc7cf1 100644 --- a/src/appl/telnet/telnetd/ChangeLog +++ b/src/appl/telnet/telnetd/ChangeLog @@ -1,3 +1,14 @@ + +Thu Jun 15 17:43:21 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. Also, for K4, use + KRB4_LIB and KRB4_CRYPTO_LIB, these were + split out. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Fri Jun 9 18:29:56 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in index f783385..0bc4f9b 100644 --- a/src/appl/telnet/telnetd/Makefile.in +++ b/src/appl/telnet/telnetd/Makefile.in @@ -26,9 +26,9 @@ LOCALINCLUDES=-I.. -I$(srcdir)/.. CFLAGS = $(CCOPTS) $(AUTH_DEF) $(OTHERDEFS) $(DEFS) $(LOCALINCLUDES) ARPA_TELNET= $(srcdir)/../arpa/telnet.h COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -KRB4_LIB = @KRB4_LIB@ -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ +KLIB = -lkadm -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) SRCS= $(srcdir)/telnetd.c \ $(srcdir)/state.c \ @@ -52,7 +52,7 @@ OBJS= telnetd.o \ all:: telnetd telnetd: $(OBJS) $(DEPKLIB) ../libtelnet/libtelnet.a - $(CC) -o $@ $(CFLAGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) + $(LD) -o $@ $(LDFLAGS) $(LDARGS) $(OBJS) ../libtelnet/libtelnet.a $(KLIB) $(LIBS) clean:: $(RM) telnetd diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in index f1979d0..498f12f 100644 --- a/src/appl/telnet/telnetd/configure.in +++ b/src/appl/telnet/telnetd/configure.in @@ -1,8 +1,6 @@ AC_INIT(telnetd.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) AC_CHECK_LIB(util,main) AC_CHECK_LIB(termcap,main,AC_DEFINE(TERMCAP) LIBS="$LIBS -ltermcap") @@ -41,4 +39,5 @@ AC_MSG_RESULT($krb5_cv_sys_setpgrp_two) if test $krb5_cv_sys_setpgrp_two = yes; then AC_DEFINE(SETPGRP_TWOARG) fi +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog index a5d8c48..020fef2 100644 --- a/src/appl/user_user/ChangeLog +++ b/src/appl/user_user/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:44:23 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 23:00:05 1995 Tom Yu (tlyu@dragons-lair) * client.c, server.c: krb5_auth_context redefinitions diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in index 4e523ce..b7ef965 100644 --- a/src/appl/user_user/Makefile.in +++ b/src/appl/user_user/Makefile.in @@ -2,15 +2,14 @@ CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) uuclient: client.o $(DEPKLIB) - $(CC) $(CFLAGS) -o uuclient client.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o uuclient client.o $(KLIB) $(LIBS) client.o: $(srcdir)/client.c @@ -21,7 +20,7 @@ clean:: $(RM) client.o uuclient uuserver: server.o $(DEPKLIB) - $(CC) $(CFLAGS) -o uuserver server.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o uuserver server.o $(KLIB) $(LIBS) server.o: $(srcdir)/server.c diff --git a/src/appl/user_user/configure.in b/src/appl/user_user/configure.in index f41e2ca..fe538ff 100644 --- a/src/appl/user_user/configure.in +++ b/src/appl/user_user/configure.in @@ -1,4 +1,5 @@ AC_INIT(client.c) CONFIG_RULES AC_PROG_INSTALL +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog index 63b5660..5d27822 100644 --- a/src/clients/kdestroy/ChangeLog +++ b/src/clients/kdestroy/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:45:03 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Fri Jun 9 18:37:19 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in index 6dc1198..f911d47 100644 --- a/src/clients/kdestroy/Makefile.in +++ b/src/clients/kdestroy/Makefile.in @@ -5,11 +5,11 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) kdestroy: kdestroy.o $(DEPKLIB) - $(CC) $(CFLAGS) -o kdestroy kdestroy.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kdestroy kdestroy.o $(KLIB) $(LIBS) kdestroy.o: $(srcdir)/kdestroy.c diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in index 3213d45..865124d3 100644 --- a/src/clients/kdestroy/configure.in +++ b/src/clients/kdestroy/configure.in @@ -1,4 +1,5 @@ AC_INIT(kdestroy.c) CONFIG_RULES AC_PROG_INSTALL +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog index 8c6749b..f8ca6cb 100644 --- a/src/clients/kinit/ChangeLog +++ b/src/clients/kinit/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:45:47 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Fri Jun 9 18:37:27 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in index 6f6bdbd..e1b9737 100644 --- a/src/clients/kinit/Makefile.in +++ b/src/clients/kinit/Makefile.in @@ -4,11 +4,11 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) kinit: kinit.o $(DEPKLIB) - $(LD) $(CFLAGS) $(LDFLAGS) -o kinit kinit.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) $(LDFLAGS) -o kinit kinit.o $(KLIB) $(LIBS) kinit.o: $(srcdir)/kinit.c diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in index 7dcec0b..e4e3977 100644 --- a/src/clients/kinit/configure.in +++ b/src/clients/kinit/configure.in @@ -2,4 +2,5 @@ AC_INIT(kinit.c) CONFIG_RULES AC_PROG_INSTALL AC_HAVE_HEADERS(pwd.h) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog index 1ce4654..753c263 100644 --- a/src/clients/klist/ChangeLog +++ b/src/clients/klist/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:47:11 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Fri Jun 9 18:37:35 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 8d93adf..15d0033 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -5,11 +5,11 @@ COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) klist: klist.o $(DEPKLIB) - $(CC) $(CFLAGS) -o klist klist.o $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o klist klist.o $(KLIB) $(LIBS) klist.o: $(srcdir)/klist.c diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in index 0a9e794..1022a8f 100644 --- a/src/clients/klist/configure.in +++ b/src/clients/klist/configure.in @@ -1,4 +1,5 @@ AC_INIT(klist.c) CONFIG_RULES AC_PROG_INSTALL +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog index aa222d0..9c99151 100644 --- a/src/clients/ksu/ChangeLog +++ b/src/clients/ksu/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:46:22 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Fri Jun 9 18:37:43 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in index b88eec1..7a878ce 100644 --- a/src/clients/ksu/Makefile.in +++ b/src/clients/ksu/Makefile.in @@ -19,11 +19,11 @@ OBJS = \ all:: ksu -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +KLIB = -lkadm -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) ksu: $(OBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o ksu $(OBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o ksu $(OBJS) $(KLIB) $(LIBS) clean:: $(RM) ksu diff --git a/src/clients/ksu/configure.in b/src/clients/ksu/configure.in index 0890ff4..a0bcfeb 100644 --- a/src/clients/ksu/configure.in +++ b/src/clients/ksu/configure.in @@ -4,4 +4,5 @@ AC_PROG_INSTALL AC_CHECK_LIB(ndbm,main) AC_CHECK_LIB(dbm,main) AC_CHECK_HEADERS(stdarg.h) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/config/ChangeLog b/src/config/ChangeLog index fd303e1..dba8417 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:47:49 EDT 1995 Paul Park (pjpark@mit.edu) + * pre.in - Add definitions for building and using shared libraries. + Add KRB5_SHLIBDIR which is the destination directory for + shared libraries. + Wed Jun 14 19:34:12 1995 Tom Yu (tlyu@dragons-lair) * pre.in: DO_SUBDIRS causes make {install,clean,check,etc.} to get diff --git a/src/config/pre.in b/src/config/pre.in index c032832..48e2663 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -18,6 +18,9 @@ DEFS = @DEFS@ $(CPPFLAGS) CC = @CC@ LD = $(PURE) @LD@ CCOPTS = @CCOPTS@ +LD_UNRESOLVED_PREFIX = @LD_UNRESOLVED_PREFIX@ +LD_SHLIBDIR_PREFIX = @LD_SHLIBDIR_PREFIX@ +LDARGS = @LDARGS@ LIBS = @LIBS@ INSTALL=@INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ -s @@ -28,6 +31,7 @@ INSTALL_SETUID=$(INSTALL) -s -m 4755 prefix=@prefix@ INSTALL_PREFIX=$(prefix) INSTALL_EXEC_PREFIX=@exec_prefix@ +SHLIB_TAIL_COMP=@SHLIB_TAIL_COMP@ KRB5MANROOT = $(INSTALL_PREFIX)/man ADMIN_BINDIR = $(INSTALL_PREFIX)/admin @@ -38,6 +42,7 @@ SERVER_MANDIR = $(KRB5MANROOT)/man8 CLIENT_MANDIR = $(KRB5MANROOT)/man1 FILE_MANDIR = $(KRB5MANROOT)/man5 KRB5_LIBDIR = $(INSTALL_PREFIX)/lib +KRB5_SHLIBDIR = $(INSTALL_PREFIX)/lib$(SHLIB_TAIL_COMP) KRB5_INCDIR = $(INSTALL_PREFIX)/include KRB5_INCSUBDIRS = \ $(KRB5_INCDIR)/asn.1 \ diff --git a/src/configure.in b/src/configure.in index d2b0786..e61dd62 100644 --- a/src/configure.in +++ b/src/configure.in @@ -6,25 +6,46 @@ AC_CANONICAL_HOST krb5_cv_host=$host]) AC_MSG_RESULT($krb5_cv_host) AC_ARG_ENABLE([shared], -[ --enable-shared build with shared libraries],[ +[ --enable-shared build shared libraries],[ case $krb5_cv_host in *-*-linux*) echo "Enabling shared libraries for Linux...." krb5_cv_shlibs_cflags=-fPIC krb5_cv_shlibs_ext=so krb5_cv_shlibs_dir=shared + krb5_cv_shlibs_ldflag="-dy" + krb5_cv_noshlibs_ldflag="-dn" + krb5_cv_shlibs_sym_ufo="-u " + krb5_cv_shlibs_dirhead="-R" + krb5_cv_exe_need_dirs=yes + krb5_cv_shlibs_use_dirs=yes + krb5_cv_shlibs_tail_comp= ;; *-*-solaris*) echo "Enabling shared libraries for Solaris...." krb5_cv_shlibs_cflags=-Kpic krb5_cv_shlibs_ext=so krb5_cv_shlibs_dir=shared + krb5_cv_shlibs_ldflag="-dy" + krb5_cv_noshlibs_ldflag="-dn" + krb5_cv_shlibs_sym_ufo="-u " + krb5_cv_shlibs_dirhead="-R" + krb5_cv_exe_need_dirs=yes + krb5_cv_shlibs_use_dirs=yes + krb5_cv_shlibs_tail_comp= ;; alpha-dec-osf*) echo "Enabling shared libraries for Alpha OSF...." krb5_cv_shlibs_cflags= krb5_cv_shlibs_ext=so krb5_cv_shlibs_dir= + krb5_cv_shlibs_ldflag="-call_shared" + krb5_cv_noshlibs_ldflag="-non_shared" + krb5_cv_shlibs_sym_ufo="-expect_unresolved " + krb5_cv_shlibs_dirhead="-rpath" + krb5_cv_exe_need_dirs=no + krb5_cv_shlibs_use_dirs=yes + krb5_cv_shlibs_tail_comp= if test ! -f so_locations; then cp -p /usr/shlib/so_locations . fi @@ -37,7 +58,12 @@ alpha-dec-osf*) ;; esac],[krb5_cv_shlibs_cflags= krb5_cv_shlibs_ext= -krb5_cv_shlibs_dir=]) +krb5_cv_shlibs_dir= +krb5_cv_shlibs_ldflag= +krb5_cv_noshlibs_ldflag= +krb5_cv_shlibs_sym_ufo= +krb5_cv_shlibs_dirhead= +krb5_cv_shlibs_tail_comp=]) AC_ARG_ENABLE([athena], [ --enable-athena build with MIT Project Athena configuration],,) if test -z "$KRB4_LIB"; then diff --git a/src/kadmin.old/client/ChangeLog b/src/kadmin.old/client/ChangeLog index b22b641..1c11153 100644 --- a/src/kadmin.old/client/ChangeLog +++ b/src/kadmin.old/client/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:49:31 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 23:00:53 1995 Tom Yu (tlyu@dragons-lair) * kadmin.c, kadmin_add.c, kadmin_apr.c, kadmin_cpr.c, diff --git a/src/kadmin.old/client/Makefile.in b/src/kadmin.old/client/Makefile.in index f11a25d..2b0adb7 100644 --- a/src/kadmin.old/client/Makefile.in +++ b/src/kadmin.old/client/Makefile.in @@ -3,13 +3,12 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) SRCS = \ $(srcdir)/kadmin.c \ @@ -38,7 +37,7 @@ OBJS = \ all:: kadmin kadmin: $(KDBDEPLIB) $(OBJS) $(DEPKLIB) - $(LD) $(CFLAGS) -o kadmin $(OBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kadmin $(OBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) $(C)kadmin ${DESTDIR}$(CLIENT_BINDIR)$(S)kadmin_old diff --git a/src/kadmin.old/client/configure.in b/src/kadmin.old/client/configure.in index 4230232..5448b0d 100644 --- a/src/kadmin.old/client/configure.in +++ b/src/kadmin.old/client/configure.in @@ -2,4 +2,5 @@ AC_INIT(kadmin.c) CONFIG_RULES AC_PROG_INSTALL ET_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin.old/kpasswd/ChangeLog b/src/kadmin.old/kpasswd/ChangeLog index f7c80df..4278376 100644 --- a/src/kadmin.old/kpasswd/ChangeLog +++ b/src/kadmin.old/kpasswd/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:50:07 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 23:02:12 1995 Tom Yu (tlyu@dragons-lair) * kpasswd.c: krb5_auth_context redefinitions diff --git a/src/kadmin.old/kpasswd/Makefile.in b/src/kadmin.old/kpasswd/Makefile.in index 0225c55..33b3b05 100644 --- a/src/kadmin.old/kpasswd/Makefile.in +++ b/src/kadmin.old/kpasswd/Makefile.in @@ -3,13 +3,12 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) SRCS = \ $(srcdir)/networked.c \ @@ -23,7 +22,7 @@ OBJS = \ all:: kpasswd kpasswd: $(KDBDEPLIB) $(OBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) $(C)kpasswd ${DESTDIR}$(CLIENT_BINDIR)$(S)kpasswd_old diff --git a/src/kadmin.old/kpasswd/configure.in b/src/kadmin.old/kpasswd/configure.in index 457c790..6638e99 100644 --- a/src/kadmin.old/kpasswd/configure.in +++ b/src/kadmin.old/kpasswd/configure.in @@ -5,4 +5,5 @@ AC_HAVE_HEADERS(unistd.h stdlib.h) CHECK_UTMP AC_FUNC_CHECK(getutent,AC_DEFINE(HAVE_GETUTENT)) ET_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin.old/server/ChangeLog b/src/kadmin.old/server/ChangeLog index a8189e6..0a9bbbf 100644 --- a/src/kadmin.old/server/ChangeLog +++ b/src/kadmin.old/server/ChangeLog @@ -1,3 +1,12 @@ + +Thu Jun 15 17:51:04 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Sat Jun 10 23:02:30 1995 Tom Yu (tlyu@dragons-lair) * adm_adm_func.c, adm_extern.h, adm_funcs.c, adm_kadmin.c, diff --git a/src/kadmin.old/server/Makefile.in b/src/kadmin.old/server/Makefile.in index d09b40b..da2109f 100644 --- a/src/kadmin.old/server/Makefile.in +++ b/src/kadmin.old/server/Makefile.in @@ -3,14 +3,15 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a +KADMLIB=-lkadm +DEPKADMLIB=$(TOPLIBD)/libkadm.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = $(KADMLIB) -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) +DEPKLIB = $(DEPKADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) LOCAL_LIBRARIES = $(KDBLIB) $(KLIB) @@ -51,7 +52,7 @@ OBJS = \ all:: kadmind kadmind: $(KDBDEPLIB) $(OBJS) $(DEPLIBS) - $(LD) $(CFLAGS) -o kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) $(C)kadmind ${DESTDIR}$(SERVER_BINDIR)$(S)kadmind_old diff --git a/src/kadmin.old/server/configure.in b/src/kadmin.old/server/configure.in index 9e76068..8b56f8c 100644 --- a/src/kadmin.old/server/configure.in +++ b/src/kadmin.old/server/configure.in @@ -1,10 +1,9 @@ AC_INIT(adm_kadmin.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) HAS_ANSI_VOLATILE AC_TIME_WITH_SYS_TIME ET_RULES CHECK_SIGPROCMASK +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog index aa66d89..b0e24ea 100644 --- a/src/kadmin.v4/server/ChangeLog +++ b/src/kadmin.v4/server/ChangeLog @@ -1,3 +1,11 @@ + +Thu Jun 15 17:52:29 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, for K4, use KRB4_LIB and KRB4_CRYPTO_LIB, these were + split out. + * configure.in - Add shared library usage check. + Fri Jun 9 19:07:25 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/kadmin.v4/server/Makefile.in b/src/kadmin.v4/server/Makefile.in index b9d8b0f..0a1dcb4 100644 --- a/src/kadmin.v4/server/Makefile.in +++ b/src/kadmin.v4/server/Makefile.in @@ -1,13 +1,13 @@ -KRB4_LIB = @KRB4_LIB@ +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) $(DBMLIB) DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) @@ -42,7 +42,7 @@ kadm_err.c: kadm_err.et kadm_err.h: kadm_err.et v4kadmind: $(OBJS) $(DEPLIBS) - $(CC) $(CFLAGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o v4kadmind $(OBJS) $(KDBLIB) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) v4kadmind ${DESTDIR}$(SERVER_BINDIR)/v4kadmind diff --git a/src/kadmin.v4/server/configure.in b/src/kadmin.v4/server/configure.in index 1c51e02..39590cb 100644 --- a/src/kadmin.v4/server/configure.in +++ b/src/kadmin.v4/server/configure.in @@ -11,4 +11,5 @@ CHECK_WAIT_TYPE CHECK_FCNTL CHECK_SIGNALS ET_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/kpasswd/ChangeLog b/src/kadmin/kpasswd/ChangeLog index db2caf3..39be1c6 100644 --- a/src/kadmin/kpasswd/ChangeLog +++ b/src/kadmin/kpasswd/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:53:15 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 23:03:25 1995 Tom Yu (tlyu@dragons-lair) * kpasswd.c: krb5_auth_context redefinitions diff --git a/src/kadmin/kpasswd/Makefile.in b/src/kadmin/kpasswd/Makefile.in index 7937b65..8adb7b4 100644 --- a/src/kadmin/kpasswd/Makefile.in +++ b/src/kadmin/kpasswd/Makefile.in @@ -3,13 +3,11 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a -DBMLIB= -KADMLIB=$(TOPLIBD)/libkadm.a all:: -KLIB = $(KADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(KADMLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = -lkadm -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkadm.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) SRCS = \ $(srcdir)/kpasswd.c @@ -21,7 +19,7 @@ OBJS = \ all:: kpasswd kpasswd: $(KDBDEPLIB) $(OBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kpasswd $(OBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) kpasswd ${DESTDIR}$(CLIENT_BINDIR)/kpasswd diff --git a/src/kadmin/kpasswd/configure.in b/src/kadmin/kpasswd/configure.in index 437cbd7..6399d3c 100644 --- a/src/kadmin/kpasswd/configure.in +++ b/src/kadmin/kpasswd/configure.in @@ -2,4 +2,5 @@ AC_INIT(kpasswd.c) CONFIG_RULES AC_PROG_INSTALL ET_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/v5client/ChangeLog b/src/kadmin/v5client/ChangeLog index c86e030..1af16a8 100644 --- a/src/kadmin/v5client/ChangeLog +++ b/src/kadmin/v5client/ChangeLog @@ -1,3 +1,12 @@ + +Thu Jun 15 17:54:04 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Sat Jun 10 23:03:41 1995 Tom Yu (tlyu@dragons-lair) * network.c: krb5_auth_context redefinitions diff --git a/src/kadmin/v5client/Makefile.in b/src/kadmin/v5client/Makefile.in index 08db709..7bdef70 100644 --- a/src/kadmin/v5client/Makefile.in +++ b/src/kadmin/v5client/Makefile.in @@ -3,16 +3,15 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 DEPKDBLIB=$(TOPLIBD)/libkdb5.a -KADMLIB=$(TOPLIBD)/libkadm.a +KADMLIB=-lkadm DEPKADMLIB=$(TOPLIBD)/libkadm.a all:: -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(SSLIB) $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) $(DEPKADMLIB) @@ -33,7 +32,7 @@ SRCS= $(srcdir)/kadmin5.c \ all:: kadmin5 kadmin5: kadmin5.o $(DEPLIBS) $(OBJS) - $(CC) $(CFLAGS) -o kadmin5 $(OBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kadmin5 $(OBJS) $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kadmin5 ${DESTDIR}$(ADMIN_BINDIR)/kadmin5 diff --git a/src/kadmin/v5client/configure.in b/src/kadmin/v5client/configure.in index 33bb048..4e628dc 100644 --- a/src/kadmin/v5client/configure.in +++ b/src/kadmin/v5client/configure.in @@ -5,7 +5,6 @@ AC_PROG_YACC AC_HAVE_HEADERS(pwd.h regex.h) AC_HAVE_FUNCS(strptime re_comp regcomp getcwd) AC_CONST -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) SS_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog index c2cb923..252475a 100644 --- a/src/kadmin/v5server/ChangeLog +++ b/src/kadmin/v5server/ChangeLog @@ -1,3 +1,12 @@ + +Thu Jun 15 17:54:31 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Wed Jun 14 17:19:09 1995 Sam Hartman <hartmans@tardis.MIT.EDU> * srv_acl.c (acl_get_line): Check to make sure we haven't exceeded diff --git a/src/kadmin/v5server/Makefile.in b/src/kadmin/v5server/Makefile.in index 46479d8..bde3cb1 100644 --- a/src/kadmin/v5server/Makefile.in +++ b/src/kadmin/v5server/Makefile.in @@ -3,14 +3,15 @@ LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a SSLIB=$(BUILDTOP)/util/ss/libss.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a -KADMLIB=$(TOPLIBD)/libkadm.a +KDBLIB=-lkdb5 +DEPKDBLIB=$(TOPLIBD)/libkdb5.a +KADMLIB=-lkadm +DEPKADMLIB=$(TOPLIBD)/libkadm.a all:: -KLIB = $(KADMLIB) $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(KADMLIB) $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) $(DBMLIB) +KLIB = $(KADMLIB) $(KDBLIB) -lkrb5 -lcrypto $(SSLIB) $(COMERRLIB) +DEPKLIB = $(DEPKADMLIB) $(DEPKDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(SSLIB) $(COMERRLIB) SRCS = \ $(srcdir)/srv_main.c $(srcdir)/srv_key.c \ @@ -25,7 +26,7 @@ OBJS = \ all:: kadmind5 kadmind5: $(KDBDEPLIB) $(OBJS) $(DEPKLIB) - $(CC) $(CFLAGS) -o kadmind5 $(OBJS) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kadmind5 $(OBJS) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) $(C)kadmind5 ${DESTDIR}$(SERVER_BINDIR)$(S)kadmind5 diff --git a/src/kadmin/v5server/configure.in b/src/kadmin/v5server/configure.in index 1c6363a..3919a57 100644 --- a/src/kadmin/v5server/configure.in +++ b/src/kadmin/v5server/configure.in @@ -1,8 +1,6 @@ AC_INIT(srv_main.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) AC_FUNC_CHECK(waitpid,AC_DEFINE(HAVE_WAITPID)) AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF)) AC_CHECK_HEADERS(sys/select.h) @@ -10,4 +8,5 @@ CHECK_SIGNALS CHECK_SETJMP CHECK_WAIT_TYPE ET_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index b23d1ac..286d9b9 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,14 @@ + +Thu Jun 15 17:55:21 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + Also, remove DBMLIB, it was not used. Also, for K4, use + KRB4_LIB and KRB4_CRYPTO_LIB, these were + split out. + * configure.in - Remove dbm library checks, these are no longer needed + with the Berkeley database code. Also, add shared library + usage check. + Tue Jun 13 12:44:20 1995 Sam Hartman <hartmans@tardis.MIT.EDU> * network.c: Base inclusion of sys/select.h on whether it exists diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index dda9be6..0ad336d 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -1,22 +1,23 @@ -KRB4_LIB = @KRB4_LIB@ +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 KDBDEPLIB=$(TOPLIBD)/libkdb5.a -KADMLIB=$(TOPLIBD)/libkadm.a +KADMLIB=-lkadm KADMDEPLIB=$(TOPLIBD)/libkadm.a -KLIB = $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 $(KRB4_LIB) -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) KRB4INCLUDES=-I$(SRCTOP)/include/kerberosIV all:: +DEFINES = -DBACKWARD_COMPAT $(KRB4DEF) + LOCALINCLUDE = $(KRB4INCLUDES) -I. SRCS= \ kdc5_err.c \ @@ -55,7 +56,7 @@ kdc5_err.h: kdc5_err.et kdc5_err.o: kdc5_err.h krb5kdc: $(OBJS) $(KDBDEPLIB) $(DEPKLIB) $(KADMDEPLIB) - $(LD) $(CFLAGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KADMLIB) $(KLIB) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o krb5kdc $(OBJS) $(KDBLIB) $(KADMLIB) $(KLIB) $(LIBS) install:: $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc diff --git a/src/kdc/configure.in b/src/kdc/configure.in index 154fd0b..73f2af6 100644 --- a/src/kdc/configure.in +++ b/src/kdc/configure.in @@ -1,10 +1,9 @@ AC_INIT(main.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) AC_CHECK_HEADERS(sys/select.h) ET_RULES HAS_ANSI_VOLATILE +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index fb5d4e0..efd7c90 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 17:56:43 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Wed Jun 14 19:28:33 1995 Tom Yu (tlyu@dragons-lair) * Makefile.in: added install rules diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index f84703f..fcfa140 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -24,19 +24,18 @@ CFLAGS = $(CCOPTS) -DUSE_MASTER $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= all:: -KRB4_LIB = @KRB4_LIB@ +KRB4_LIB = @KRB4_LIB@ @KRB4_CRYPTO_LIB@ -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 KDBDEPLIB=$(TOPLIBD)/libkdb5.a -KLIB = libkrb524.a $(TOPLIBD)/libkrb5.a $(KRB4_LIB) $(TOPLIBD)/libcrypto.a \ - $(COMERRLIB) $(DBMLIB) +KLIB = libkrb524.a -lkrb5 $(KRB4_LIB) -lcrypto \ + $(COMERRLIB) DEPKLIB = libkrb524.a $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a \ - $(COMERRLIB) $(DBMLIB) + $(COMERRLIB) LOCALINCLUDE= -I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV \ -I. -I$(srcdir) @@ -56,13 +55,13 @@ libkrb524.a: $(OBJS) $(RANLIB) $@ test: libkrb524.a test.o $(DEPKDBLIB) $(DEPKLIB) - $(CC) -o test $(LDFLAGS) test.o $(KDBLIB) $(KLIB) $(LIBS) + $(LD) -o test $(LDFLAGS) $(LDARGS) test.o $(KDBLIB) $(KLIB) $(LIBS) krb524d: libkrb524.a krb524d.o $(DEPKDBLIB) $(DEPKLIB) - $(CC) -o krb524d krb524d.o $(LDFLAGS) $(KDBLIB) $(KLIB) $(LIBS) + $(LD) -o krb524d krb524d.o $(LDFLAGS) $(LDARGS) $(KDBLIB) $(KLIB) $(LIBS) k524init: libkrb524.a k524init.o $(DEPKLIB) - $(CC) -o k524init $(LDFLAGS) k524init.o $(KLIB) $(LIBS) + $(LD) -o k524init $(LDFLAGS) $(LDARGS) k524init.o $(KLIB) $(LIBS) install:: $(INSTALL_DATA) libkrb524.a $(DESTDIR)$(KRB5_LIBDIR)/libkrb524.a diff --git a/src/krb524/configure.in b/src/krb524/configure.in index 0c6e633..6b92b09 100644 --- a/src/krb524/configure.in +++ b/src/krb524/configure.in @@ -6,4 +6,5 @@ AC_PROG_RANLIB AC_PROG_INSTALL AC_TYPE_SIGNAL ET_RULES +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index e06257e..2d06a1b 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,8 @@ + +Thu Jun 15 17:57:26 EDT 1995 Paul Park (pjpark@mit.edu) + * configure.in - Do not build K4 directories if we're not supposed to. + Remove LinkFile() logic and put it in each subdirectory. + Wed Jun 14 07:36:46 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * Makefile.in (clean-unix): Remove shared library symlinks diff --git a/src/lib/configure.in b/src/lib/configure.in index 75a4185..ccd1585 100644 --- a/src/lib/configure.in +++ b/src/lib/configure.in @@ -1,27 +1,20 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(crypto des425 kdb4 krb4 krb5 kdb gssapi kadm) +if test $krb5_cv_build_krb4_libs = yes ; then + AC_MSG_RESULT(building Kerberos 4 libraries) + kdb4=kdb4 + krb4=krb4 +else + AC_MSG_RESULT(skipping Kerberos 4 libraries) + kdb4= + krb4= +fi +CONFIG_DIRS(crypto des425 $kdb4 $krb4 krb5 kdb gssapi kadm) AC_PROG_ARCHIVE AC_PROG_RANLIB _MAKE_SUBDIRS("making",all-unix-subdirs,all) MAKE_SUBDIRS("cleaning",clean) MAKE_SUBDIRS("installing",install) MAKE_SUBDIRS("checking",check) -LinkFile(libkrb5.a, ./krb5/libkrb5.a) -LinkFile(libcrypto.a, ./crypto/libcrypto.a) -LinkFile(libgssapi_krb5.a, ./gssapi/libgssapi_krb5.a) -LinkFile(libkrb4.a, ./krb4/libkrb4.a) -LinkFile(libkdb4.a, ./kdb4/libkdb4.a) -LinkFile(libdes425.a, ./des425/libdes425.a) -AppendRule([all-unix:: all-unix-subdirs libkrb5.a libcrypto.a]) -AppendRule([all-unix:: libgssapi_krb5.a]) -AppendRule([all-unix:: libkrb4.a libkdb4.a libdes425.a]) -AC_ARG_ENABLE([shared], -[ --enable-shared build with shared libraries],[ -LinkFile(libcrypto.so, ./crypto/libcrypto.so) -LinkFile(libkrb5.so, ./krb5/libkrb5.so) -LinkFile(libkrb4.so, ./krb4/libkrb4.so) -LinkFile(libdes425.so, ./des425/libdes425.so) -AppendRule([all-unix:: libkrb5.so libcrypto.so libkrb4.so libdes425.so]) -])dnl +AppendRule([all-unix:: all-unix-subdirs]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index baf67fb..5d0b7a1 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,10 @@ + +Thu Jun 15 17:58:41 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Add definitions for shared library building rules. + Add explicit dependency on "shared" since we probably need it. + * configure.in - Create symlinks for archive and shared library when + we build them. + Fri Jun 9 18:52:19 1995 <tytso@rsx-11.mit.edu> * des_crc.c, des_md5.c: Fix -Wall nits. diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 1ac2d8d..615626d 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -24,9 +24,14 @@ LIB_SUBDIRS= des md4 md5 crc32 os . LIBUPDATE= $(BUILDTOP)/util/libupdate LIBDONE= ./des/DONE ./md4/DONE ./md5/DONE ./crc32/DONE ./os/DONE ./DONE -all:: all-$(WHAT) - -all-unix:: shared +# No dependencies. Record places to find this shared object if the target +# link editor and loader support it. +DEPLIBS= +SHLIB_LIBS= +SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ +SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ + +all:: shared shared: mkdir shared diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index 387255a..1ccce9c 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -8,6 +8,14 @@ AC_PROG_INSTALL V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) DO_SUBDIRS -AppendRule([all:: libcrypto.a]) +LinkFileDir(../libcrypto.a, libcrypto.a, ./crypto) +AppendRule([all-unix:: ../libcrypto.a]) V5_MAKE_SHARED_LIB(libcrypto) +AC_ARG_ENABLE([shared], +[ --enable-shared build shared libraries],[ +LinkFileDir(../libcrypto.[$](SHEXT), libcrypto.[$](SHEXT), ./crypto) +AppendRule([all-unix:: ../libcrypto.$(SHEXT)]) +])dnl +AppendRule([all-unix:: libcrypto.a]) +AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 1225705..bcced22 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,11 @@ + +Thu Jun 15 18:00:45 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change "./DONE" target to "DONE" since we have a rule + for how to build it. Also add definitions for shared library + building rules. + * configure.in - Create symlinks for archive and shared library when + we build them. + Wed Jun 14 07:37:26 1995 Ezra Peisach <epeisach@kangaroo.mit.edu> * Makefile.in (libdes425.a): Don't copy library up a level. Let diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 7b75cf9..3da8c04 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -40,8 +40,14 @@ SRCS= $(srcdir)/cksum.c \ $(srcdir)/weak_key.c LIB_SUBDIRS= . -LIBDONE= ./DONE - +LIBDONE= DONE +# +# Depends on libcrypto. +# +DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT) +SHLIB_LIBS=-lcrypto +SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ +SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ EXT_LIB= libdes425.a $(TOPLIBD)/libcrypto.a DEPKLIB= $(TOPLIBD)/libcrypto.a diff --git a/src/lib/des425/configure.in b/src/lib/des425/configure.in index 75fa651..75a4c8e 100644 --- a/src/lib/des425/configure.in +++ b/src/lib/des425/configure.in @@ -6,6 +6,13 @@ AC_PROG_RANLIB AC_PROG_INSTALL V5_SHARED_LIB_OBJS SubdirLibraryRule([${OBJS}]) +LinkFileDir(../libdes425.a, libdes425.a, ./des425) AppendRule([all:: libdes425.a]) +AppendRule([all-unix:: ../libdes425.a]) V5_MAKE_SHARED_LIB(libdes425) +AC_ARG_ENABLE([shared], +[ --enable-shared build shared libraries],[ +LinkFileDir(../libdes425.[$](SHEXT), libdes425.[$](SHEXT), ./des425) +AppendRule([all-unix:: ../libdes425.$(SHEXT)]) +])dnl V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index 4bbb1d9..cea81ec 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,11 @@ + +Thu Jun 15 18:02:16 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove explicit "all" rule at head of file, it causes + platform specific target to get done first. + * configure.in - Create symlinks for archive and shared library when + we build them. Also, put explicit "all" rule at end of file + so that we do the subdirectory rules first. + Fri Jun 9 18:55:01 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index 53229c8..986e956 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -3,8 +3,6 @@ TST=if test -n "`cat DONE`" ; then ##DOSBUILDTOP = ..\.. ##DOS!include $(BUILDTOP)\config\windows.in -all:: all-$(WHAT) - all-unix:: all-mac:: diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in index a7602a8..693bda8 100644 --- a/src/lib/gssapi/configure.in +++ b/src/lib/gssapi/configure.in @@ -7,4 +7,7 @@ AC_PROG_RANLIB AC_PROG_INSTALL DO_SUBDIRS AppendRule([all:: libgssapi_krb5.a]) +LinkFileDir(../libgssapi_krb5.a, libgssapi_krb5.a, ./gssapi) +AppendRule([all-unix:: ../libgssapi_krb5.a]) +AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog index 4a8ca1e..bf568b9 100644 --- a/src/lib/kadm/ChangeLog +++ b/src/lib/kadm/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 18:03:40 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove explicit copying of archive library to library + directory. + * configure.in - Create symlink for archive when we build it. + Wed Jun 14 14:36:13 1995 Sam Hartman <hartmans@tardis.MIT.EDU> * t_dbentry.c (main): option should be an int so that comparisons diff --git a/src/lib/kadm/Makefile.in b/src/lib/kadm/Makefile.in index 32b2251..86470df 100644 --- a/src/lib/kadm/Makefile.in +++ b/src/lib/kadm/Makefile.in @@ -28,6 +28,7 @@ SRCS= $(srcdir)/adm_conn.c \ all:: all-$(WHAT) $(BASE_OBJS) all-unix:: $(DB_OBJS) $(UNIX_OBJS) +all-unix:: libkadm.a all-mac:: $(DB_OBJS) all-windows:: @@ -35,9 +36,6 @@ libkadm.a: $(OBJS) $(UNIX_OBJS) $(RM) $@ $(ARADD) $@ $(OBJS) $(UNIX_OBJS) $(RANLIB) $@ - $(RM) $(TOPLIBD)/libkadm.a - $(CP) libkadm.a $(BUILDTOP)/lib/libkadm.a - $(RANLIB) $(BUILDTOP)/lib/libkadm.a install:: libkadm.a $(INSTALL_DATA) libkadm.a $(DESTDIR)$(KRB5_LIBDIR)/libkadm.a diff --git a/src/lib/kadm/configure.in b/src/lib/kadm/configure.in index b60cb07..b5e674b 100644 --- a/src/lib/kadm/configure.in +++ b/src/lib/kadm/configure.in @@ -8,5 +8,7 @@ AC_HAVE_HEADERS(pwd.h stdarg.h syslog.h) AC_HAVE_FUNCS(srand48 srand srandom syslog openlog closelog strftime) AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF)) ET_RULES -AppendRule([all:: libkadm.a]) +LinkFileDir(../libkadm.a, libkadm.a, ./kadm) +AppendRule([all-unix:: ../libkadm.a]) +AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 2c32b96..f15bd12 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 18:04:58 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove explicit copying of archive library to library + directory. Add dependency on all-$(WHAT) + * configure.in - Create symlink for archive when we build it. + Wed Jun 14 12:37:51 1995 Sam Hartman <hartmans@tardis.MIT.EDU> * configure.in: Check for umask being defined. diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index bf02084..1b89c19 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -4,7 +4,7 @@ LDFLAGS = -g LIB_SUBDIRS= $(BUILDTOP)/util/berk_db/hash LIBUPDATE=$(BUILDTOP)/util/libupdate -all:: $(OBJS) +all:: $(OBJS) all-$(WHAT) SRCS= \ @@ -41,9 +41,6 @@ libkdb5.a: $(OBJS) $(BUILDTOP)/util/berk_db/hash/DONE done ; \ fi $(RANLIB) $@ - $(RM) $(TOPLIBD)/libkdb5.a - $(CP) libkdb5.a $(BUILDTOP)/lib/libkdb5.a - $(RANLIB) $(BUILDTOP)/lib/libkdb5.a install:: libkdb5.a $(INSTALL_DATA) libkdb5.a $(DESTDIR)$(KRB5_LIBDIR)/libkdb5.a diff --git a/src/lib/kdb/configure.in b/src/lib/kdb/configure.in index 1b97e4e..4272d9a 100644 --- a/src/lib/kdb/configure.in +++ b/src/lib/kdb/configure.in @@ -6,5 +6,7 @@ AC_PROG_RANLIB AC_PROG_INSTALL AC_HAVE_HEADERS(unistd.h) AC_CHECK_FUNCS(srand48 srand srandom umask) +LinkFileDir(../libkdb5.a, libkdb5.a, ./kdb) AppendRule([all:: libkdb5.a]) +AppendRule([all-unix:: ../libkdb5.a]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kdb/t_kdb.c b/src/lib/kdb/t_kdb.c index 7807b8a..35df1ad 100644 --- a/src/lib/kdb/t_kdb.c +++ b/src/lib/kdb/t_kdb.c @@ -237,9 +237,9 @@ gen_principal(kcontext, realm, do_rand, n, princp, namep) { static char pnamebuf[MAX_PNAME_LEN]; static char *instnames[] = { - "instance1", "xxx2", "whereami3", "ABCDEFG4" }; + "instance1", "xxx2", "whereami3", "ABCDEFG4", "foofoo5" }; static char *princnames[] = { - "princ1", "user2", "service3", "RANDOM4" }; + "princ1", "user2", "service3" }; krb5_error_code kret; char *instname; @@ -334,7 +334,7 @@ delete_principal(kcontext, principal) } int -do_testing(db, passes, verbose, timing, rcases, check, save_db) +do_testing(db, passes, verbose, timing, rcases, check, save_db, dontclean) char *db; int passes; int verbose; @@ -342,6 +342,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db) int rcases; int check; int save_db; + int dontclean; { krb5_error_code kret; krb5_context kcontext; @@ -615,28 +616,30 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db) } } - /* Clean up the remaining principals */ - if (verbose > 1) - fprintf(stdout, "%s: deleting remaining %d principals\n", - programname, nvalid); - for (passno=0; passno<nvalid; passno++) { - op = "deleting principal"; - if (timing) { - swatch_on(); - } - if (kret = delete_principal(kcontext, - playback_principal(passno))) { - linkage = "finally "; - oparg = playback_name(passno); - goto cya; - } - if (timing) { - elapsed = swatch_eltime(); - accumulated[2].t_time += elapsed; - accumulated[2].t_number++; + if (!dontclean) { + /* Clean up the remaining principals */ + if (verbose > 1) + fprintf(stdout, "%s: deleting remaining %d principals\n", + programname, nvalid); + for (passno=0; passno<nvalid; passno++) { + op = "deleting principal"; + if (timing) { + swatch_on(); + } + if (kret = delete_principal(kcontext, + playback_principal(passno))) { + linkage = "finally "; + oparg = playback_name(passno); + goto cya; + } + if (timing) { + elapsed = swatch_eltime(); + accumulated[2].t_time += elapsed; + accumulated[2].t_number++; + } + if (verbose > 4) + fprintf(stderr, "XD(%s)\n", playback_name(passno)); } - if (verbose > 4) - fprintf(stderr, "XD(%s)\n", playback_name(passno)); } cya: if (verbose) @@ -728,23 +731,27 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db) /* * Delete principals. */ - if (timing) { - swatch_on(); - } - for (passno=passes-1; passno>=0; passno--) { - op = "deleting principal"; - if (kret = delete_principal(kcontext, - playback_principal(passno))) - goto goodbye; - if (verbose > 4) - fprintf(stderr, "XD(%s)\n", playback_name(passno)); - } - if (timing) { - elapsed = swatch_eltime(); - fprintf(stdout, - "%s: deleted %d principals in %9.4f seconds (%9.4f/delete)\n", - programname, passes, elapsed, elapsed/((float) passes)); + if (!dontclean) { + if (timing) { + swatch_on(); + } + for (passno=passes-1; passno>=0; passno--) { + op = "deleting principal"; + if (kret = delete_principal(kcontext, + playback_principal(passno))) + goto goodbye; + if (verbose > 4) + fprintf(stderr, "XD(%s)\n", playback_name(passno)); + } + if (timing) { + elapsed = swatch_eltime(); + fprintf(stdout, + "%s: deleted %d principals in %9.4f seconds (%9.4f/delete)\n", + programname, passes, elapsed, + elapsed/((float) passes)); + } } + } goodbye: @@ -789,6 +796,7 @@ do_testing(db, passes, verbose, timing, rcases, check, save_db) * [-v] - Verbose output. * [-d <dbname>] - Database name. * [-s] - Save database even on successful completion. + * [-D] - Leave database dirty. */ int main(argc, argv) @@ -799,7 +807,7 @@ main(argc, argv) extern char *optarg; int do_time, do_random, num_passes, check_cont, verbose, error; - int save_db; + int save_db, dont_clean; char *db_name; programname = argv[0]; @@ -815,10 +823,11 @@ main(argc, argv) verbose = 0; db_name = T_KDB_DEF_DB; save_db = 0; + dont_clean = 0; error = 0; /* Parse argument list */ - while ((option = getopt(argc, argv, "cd:n:rstv")) != EOF) { + while ((option = getopt(argc, argv, "cd:n:rstvD")) != EOF) { switch (option) { case 'c': check_cont = 1; @@ -845,6 +854,9 @@ main(argc, argv) case 'v': verbose++; break; + case 'D': + dont_clean = 1; + break; default: error++; break; @@ -860,6 +872,7 @@ main(argc, argv) do_time, do_random, check_cont, - save_db); + save_db, + dont_clean); return(error); } diff --git a/src/lib/kdb4/ChangeLog b/src/lib/kdb4/ChangeLog index 39dfea4..ba30b9a 100644 --- a/src/lib/kdb4/ChangeLog +++ b/src/lib/kdb4/ChangeLog @@ -1,3 +1,7 @@ + +Thu Jun 15 18:06:24 EDT 1995 Paul Park (pjpark@mit.edu) + * configure.in - Create symlink for archive when we build it. + Fri Jun 9 19:26:57 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/lib/kdb4/configure.in b/src/lib/kdb4/configure.in index be7fb34..fe3f8e4 100644 --- a/src/lib/kdb4/configure.in +++ b/src/lib/kdb4/configure.in @@ -11,4 +11,7 @@ KRB5_POSIX_LOCKS AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H)) ET_RULES SubdirLibraryRule([$(OBJS)]) +LinkFileDir(../libkdb4.a, libkdb4.a, ./kdb4) +AppendRule([all-unix:: ../libkdb4.a]) +AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 2a56f8e..9db9658 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 18:07:24 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Add definitions for shared library build rules. + * configure.in - Create symlinks for archive and shared library + when we build them. + Fri Jun 9 19:28:22 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 9811b09..b95164a 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -87,6 +87,16 @@ SRCS = \ LIB_SUBDIRS= . LIBDONE= ./DONE +# +# Depends on libcrypto and KRB4_CRYPTO_LIB, expect one unresolved symbol: +# _et_list. +# +KRB4_CRYPTO_LIBS=@KRB4_CRYPTO_LIB@ +DEPKRB4_LIBS=@DEPKRB4_CRYPTO_LIB@ +DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT) +SHLIB_LIBS=$(KRB4_CRYPTO_LIBS) -lcrypto +SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ $(LD_UNRESOLVED_PREFIX)_et_list +SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ # # These objects implement ticket cacheing for Unix. They are diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in index 767e765..9a0c59b 100644 --- a/src/lib/krb4/configure.in +++ b/src/lib/krb4/configure.in @@ -46,4 +46,11 @@ V5_SHARED_LIB_OBJS SubdirLibraryRule([$(OBJS)]) V5_MAKE_SHARED_LIB(libkrb4) CopyHeader(krb_err.h,$(EHDRDIR)) +LinkFileDir(../libkrb4.a, libkrb4.a, ./krb4) +AppendRule([all-unix:: ../libkrb4.a]) +AC_ARG_ENABLE([shared], +[ --enable-shared build shared libraries],[ +LinkFileDir(../libkrb4.[$](SHEXT), libkrb4.[$](SHEXT), ./krb4) +AppendRule([all-unix:: ../libkrb4.$(SHEXT)]) +])dnl V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index e4bbaff..064d506 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,11 @@ + +Thu Jun 15 18:08:12 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Add definitions for shared library build rules. Also, + remove explicit "all" target at front so we do subdirectories + first. + * configure.in - Create symlinks for archive and shared library when + we build them. + Fri Jun 9 18:51:24 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index da126df..7ce3eb2 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -10,8 +10,20 @@ LIBDONE= error_tables/DONE asn.1/DONE ccache/DONE ccache/stdio/DONE \ ccache/file/DONE keytab/DONE keytab/file/DONE krb/DONE \ rcache/DONE free/DONE os/DONE posix/DONE \ $(BUILDTOP)/util/profile/DONE - -all:: all-$(WHAT) +# +# Depends on KRB4_LIB, KRB4_CRYPTO_LIB and libcrypto, expect two unresolved +# symbols: +# _et_list (from krb4) +# error_message +# +KRB4_LIBS=@KRB4_LIB@ +KRB4_CRYPTO_LIBS=@KRB4_CRYPTO_LIB@ +DEPKRB4_LIBS=@DEPKRB4_LIB@ @DEPKRB4_CRYPTO_LIB@ +DEPLIBS=$(TOPLIBD)/libcrypto.$(SHEXT) +SHLIB_LIBS=$(KRB4_LIBS) $(KRB4_CRYPTO_LIBS) -lcrypto +SHLIB_LDFLAGS= $(LDFLAGS) @SHLIB_RPATH_DIRS@ \ + $(LD_UNRESOLVED_PREFIX)_et_list $(LD_UNRESOLVED_PREFIX)error_message +SHLIB_LIBDIRS= @SHLIB_LIBDIRS@ all-unix:: diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index c989d60..a120246 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -8,4 +8,12 @@ AC_PROG_INSTALL DO_SUBDIRS AppendRule([all:: libkrb5.a]) V5_MAKE_SHARED_LIB(libkrb5) +AC_ARG_ENABLE([shared], +[ --enable-shared build shared libraries],[ +LinkFileDir(../libkrb5.[$](SHEXT), libkrb5.[$](SHEXT), ./krb5) +AppendRule([all-unix:: ../libkrb5.$(SHEXT)]) +])dnl +LinkFileDir(../libkrb5.a, libkrb5.a, ./krb5) +AppendRule([all-unix:: ../libkrb5.a]) +AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog index 8d31804..b6d320d 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 18:09:33 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Change explicit library names to -l<lib> form, and + change target link line to use $(LD) and associated flags. + * configure.in - Add shared library usage check. + Sat Jun 10 23:07:45 1995 Tom Yu (tlyu@dragons-lair) * kprop.c, kpropd.c: krb5_auth_context redefinitions diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index 25f883e..22e6cc6 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -2,11 +2,10 @@ CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= -KDBLIB=$(TOPLIBD)/libkdb5.a +KDBLIB=-lkdb5 -KLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = -lkrb5 -lcrypto $(COMERRLIB) +DEPKLIB = $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) all:: @@ -25,14 +24,14 @@ SRCS= $(CLIENTSRCS) $(SERVERSRCS) all:: kprop kpropd kprop: $(CLIENTOBJS) $(DEPLIBS) - $(CC) $(CFLAGS) -o kprop $(CLIENTOBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kprop $(CLIENTOBJS) $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kprop ${DESTDIR}$(SERVER_BINDIR)/kprop $(INSTALL_DATA) $(srcdir)/kprop.M ${DESTDIR}$(SERVER_MANDIR)/kprop.8 kpropd: $(SERVEROBJS) $(DEPLIBS) - $(CC) $(CFLAGS) -o kpropd $(SERVEROBJS) $(LOCAL_LIBRARIES) $(LIBS) + $(LD) $(LDFLAGS) $(LDARGS) -o kpropd $(SERVEROBJS) $(LOCAL_LIBRARIES) $(LIBS) install:: $(INSTALL_PROGRAM) kpropd ${DESTDIR}$(SERVER_BINDIR)/kpropd diff --git a/src/slave/configure.in b/src/slave/configure.in index 483441e..3343055 100644 --- a/src/slave/configure.in +++ b/src/slave/configure.in @@ -3,4 +3,5 @@ CONFIG_RULES AC_PROG_INSTALL AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS))) AC_CHECK_LIB(util,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog index 2e42665..dd39bcf 100644 --- a/src/tests/ChangeLog +++ b/src/tests/ChangeLog @@ -1,3 +1,8 @@ + +Thu Jun 15 18:10:03 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Set LD_LIBRARY_PATH to be the library directory in + case we've built with shared libraries. + Fri Jun 9 18:56:53 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 648166b..70520af 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -15,18 +15,18 @@ check:: kdb_check kdb_check: $(RM) $(TEST_DB)* - ../admin/create/kdb5_create $(KADMIN_OPTS) - ../tests/create/kdb5_mkdums $(KTEST_OPTS) - ../tests/verify/kdb5_verify $(KTEST_OPTS) - ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump" - ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f - ../admin/edit/kdb5_edit -r $(TEST_REALM) -R "load_db $(TEST_DB).dump $(TEST_DB)" - ../tests/verify/kdb5_verify $(KTEST_OPTS) - ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump2" + LD_LIBRARY_PATH=$(TOPLIBD) ../admin/create/kdb5_create $(KADMIN_OPTS) + LD_LIBRARY_PATH=$(TOPLIBD) ../tests/create/kdb5_mkdums $(KTEST_OPTS) + LD_LIBRARY_PATH=$(TOPLIBD) ../tests/verify/kdb5_verify $(KTEST_OPTS) + LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump" + LD_LIBRARY_PATH=$(TOPLIBD) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f + LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit -r $(TEST_REALM) -R "load_db $(TEST_DB).dump $(TEST_DB)" + LD_LIBRARY_PATH=$(TOPLIBD) ../tests/verify/kdb5_verify $(KTEST_OPTS) + LD_LIBRARY_PATH=$(TOPLIBD) ../admin/edit/kdb5_edit $(KADMIN_OPTS) -R "dump_db $(TEST_DB).dump2" sort $(TEST_DB).dump > $(TEST_DB).sort sort $(TEST_DB).dump2 > $(TEST_DB).sort2 cmp $(TEST_DB).sort $(TEST_DB).sort2 - ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f + LD_LIBRARY_PATH=$(TOPLIBD) ../admin/destroy/kdb5_destroy -d $(TEST_DB) -f $(RM) $(TEST_DB)* diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog index 25f71c7..90b816d 100644 --- a/src/tests/create/ChangeLog +++ b/src/tests/create/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 18:10:55 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove DBMLIB. + * configure.in - Remove check for dbm libraries. Use shared library + linking rules. + Fri Jun 9 18:58:15 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in index a462b73..6af3bc1 100644 --- a/src/tests/create/Makefile.in +++ b/src/tests/create/Makefile.in @@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= KDBLIB=$(TOPLIBD)/libkdb5.a DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: kdb5_mkdums -KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in index 5991eeb..d5bb2a8 100644 --- a/src/tests/create/configure.in +++ b/src/tests/create/configure.in @@ -1,6 +1,5 @@ AC_INIT(kdb5_mkdums.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog index f64da99..525b4ad 100644 --- a/src/tests/dejagnu/config/ChangeLog +++ b/src/tests/dejagnu/config/ChangeLog @@ -1,3 +1,8 @@ + +Thu Jun 15 18:13:55 EDT 1995 Paul Park (pjpark@mit.edu) + * default.exp - Setup and use LD_LIBRARY_PATH, in case we were built + with shared libraries. + Fri Jun 9 23:45:08 1995 Theodore Y. Ts'o <tytso@dcl> * default.exp: Use the principal "krbtest/admin@KRBTEST.COM" for diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index be2b782..1389ad5 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -96,6 +96,10 @@ if ![info exists RESOLVE] { set RESOLVE [findfile $objdir/../resolve/resolve] } +if ![info exists SHLIBDIR] { + set SHLIBDIR [findfile $objdir/../../lib] +} + # We use a couple of variables to hold shell prompts which may be # overridden by the user. @@ -270,6 +274,15 @@ if [ info exists env(KERBEROS_SERVER)] { catch "unset orig_kerberos_server" } +# +# Set LD_LIBRARY_PATH to specify our built shared libraries. +# +if [info exists env(LD_LIBRARY_PATH)] { + set orig_ld_lib_path $env(LD_LIBRARY_PATH) +} else { + catch "unset orig_ld_lib_path" +} + # setup_kerberos_env # Set the environment variables needed to run Kerberos programs. @@ -277,6 +290,7 @@ proc setup_kerberos_env { } { global env global tmppwd global hostname + global SHLIBDIR # Set the environment variable KRB5_CONFIG to point to our krb5.conf file. # All the Kerberos tools check KRB5_CONFIG. @@ -297,6 +311,9 @@ proc setup_kerberos_env { } { set env(KERBEROS_SERVER) "KRBTEST.COM:$hostname:3088" verbose "KERBEROS_SERVER=$env(KERBEROS_SERVER)" + # Tell the dynamic loader where to get our shared libraries + set env(LD_LIBRARY_PATH) "$SHLIBDIR" + verbose "LD_LIBRARY_PATH=$env(LD_LIBRARY_PATH)" return 1 } @@ -946,6 +963,7 @@ proc setup_root_shell { testname } { global rlogin_spawn_id global rlogin_pid global tmppwd + global env # Make sure we are using the original values of the environment # variables. This means that the caller must call @@ -1037,6 +1055,15 @@ proc setup_root_shell { testname } { -re "$ROOT_PROMPT" { } } + # Set up our LD_LIBRARY_PATH + send "LD_LIBRARY_PATH=$env(LD_LIBRARY_PATH)\r" + expect { + -re "$ROOT_PROMPT" { } + } + send "export LD_LIBRARY_PATH\r" + expect { + -re "$ROOT_PROMPT" { } + } # Move over to the right directory. set dir [pwd] diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog index 226b502..6262b24 100644 --- a/src/tests/verify/ChangeLog +++ b/src/tests/verify/ChangeLog @@ -1,3 +1,9 @@ + +Thu Jun 15 18:12:00 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove DBMLIB. + * configure.in - Remove check for dbm libraries, use shared library + linking rules. + Fri Jun 9 18:58:51 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in index 307a33c..4b18e5d 100644 --- a/src/tests/verify/Makefile.in +++ b/src/tests/verify/Makefile.in @@ -2,14 +2,13 @@ CFLAGS = $(CCOPTS) $(DEFS) LDFLAGS = -g COMERRLIB=$(BUILDTOP)/util/et/libcom_err.a -DBMLIB= KDBLIB=$(TOPLIBD)/libkdb5.a DEPKDBLIB=$(TOPLIBD)/libkdb5.a all:: kdb5_verify -KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) -DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) $(DBMLIB) +KLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) +DEPKLIB = $(KDBLIB) $(TOPLIBD)/libkrb5.a $(TOPLIBD)/libcrypto.a $(COMERRLIB) DEPLIBS = $(DEPKDBLIB) $(DEPKLIB) diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in index 7dd4b6e..df75815 100644 --- a/src/tests/verify/configure.in +++ b/src/tests/verify/configure.in @@ -1,6 +1,5 @@ AC_INIT(kdb5_verify.c) CONFIG_RULES AC_PROG_INSTALL -AC_CHECK_LIB(ndbm,main) -AC_CHECK_LIB(dbm,main) +V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/ChangeLog b/src/util/ChangeLog index 4697e33..04d0074 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,8 @@ + +Thu Jun 15 18:14:46 EDT 1995 Paul Park (pjpark@mit.edu) + * makeshlib - Add arguments for library search directories, library + lists and flags to link with. + Fri Jun 9 18:59:02 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/util/makeshlib b/src/util/makeshlib index 01f464f..eae351b 100644 --- a/src/util/makeshlib +++ b/src/util/makeshlib @@ -2,12 +2,16 @@ # # makeshlib: Make a shared library..... # -# Usage: makeshlib <host> <CC> <library> <directories> +# Usage: makeshlib <host> <CC> <library> <libdirfl> <liblist> <flags> \ +# <directories> # host=$1 ; shift CC=$1 ; shift library=$1 ; shift +libdirfl=$1; shift +liblist=$1; shift +ldflags=$1; shift case $host in *-*-solaris*) @@ -16,8 +20,9 @@ case $host in sed -e "s;^;$i/shared/;" -e "s; ; $i/shared/;g" $i/DONE done` - echo $CC -G -o $library $FILES - $CC -G -o $library $FILES + echo $CC -G $ldflags -o $library $FILES $libdirfl $liblist + $CC -G $ldflags -o $library $FILES $libdirfl $liblist + stat=$? ;; alpha-*-osf*) FILES=`for i @@ -26,11 +31,15 @@ alpha-*-osf*) done` - echo ld -shared -o $library -all $FILES -none -lc -update_registry ../../so_locations - ld -shared -o $library -all $FILES -none -lc -update_registry ../../so_locations + echo ld -shared -error_unresolved $ldflags -o $library -all $FILES $libdirfl $liblist -none -lc -update_registry ../../so_locations + ld -shared -error_unresolved $ldflags -o $library -all $FILES $libdirfl $liblist -none -lc -update_registry ../../so_locations + stat=$? + echo status is $stat ;; *) echo "Host type $host not supported!" exit 1 esac +exit $stat + |