diff options
269 files changed, 1140 insertions, 720 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7db491195..ffc14585f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,17 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + +Wed Jan 28 18:09:00 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * aclocal.m4: Removed the following (obsolete) functions: + LinkFile, LinkFileDir, CopySrcHeader, CopyHeader, + Krb5InstallHeaders, AppendRule, AC_PUSH_MAKEFILE, + AC_POP_MAKEFILE, CONFIG_DIRS, DO_SUBDIRS, USE_*_LIBRARY + Tue Oct 28 11:49:55 1997 Ezra Peisach <epeisach@mit.edu> * aclocal.m4 (WITH_NETLIB): Use AC_LIBRARY_NET. diff --git a/src/Makefile.in b/src/Makefile.in index 82ec6f410..33b7b11ed 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(C) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = . diff --git a/src/aclocal.m4 b/src/aclocal.m4 index df4b67a58..25e0c3a87 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -17,8 +17,10 @@ case "$ac_reltopdir" in esac ac_topdir=$srcdir/$ac_reltopdir ac_config_fragdir=$ac_reltopdir/config -krb5_prepend_frags=$ac_config_fragdir/pre.in -krb5_append_frags=$ac_config_fragdir/post.in +krb5_pre_in=$ac_config_fragdir/pre.in +krb5_post_in=$ac_config_fragdir/post.in +krb5_prepend_frags=$krb5_pre_in +krb5_append_frags=$krb5_post_in BUILDTOP=$ac_reltopdir SRCTOP=$srcdir/$ac_reltopdir if test -d "$srcdir/$ac_config_fragdir"; then @@ -28,33 +30,6 @@ else fi ])dnl dnl -dnl Does configure need to be run in immediate subdirectories of this -dnl directory? -dnl -dnl XXX we should remove this and replace CONFIG_DIRS with AC_CONFIG_SUBDIRS -dnl in all of the configure.in files. -dnl -define(CONFIG_DIRS,[AC_CONFIG_SUBDIRS($1)])dnl -dnl -dnl AC_PUSH_MAKEFILE(): -dnl allow stuff to get tacked on to the end of the makefile -dnl -define(AC_PUSH_MAKEFILE,[dnl -cat>>append.out<<\PUSHEOF -])dnl -define(AC_POP_MAKEFILE,[dnl -PUSHEOF -])dnl - -dnl -dnl DO_SUBDIRS -dnl recurse into subdirs by specifying the recursion targets -dnl the rules are in post.in but the target needs substitution -AC_DEFUN([DO_SUBDIRS], -[# this is a noop now -]) - -dnl dnl drop in standard rules for all configure files -- CONFIG_RULES dnl define(CONFIG_RULES,[dnl @@ -319,115 +294,6 @@ CPPFLAGS="$CPPFLAGS $withval", [AC_MSG_RESULT(CPPOPTS defaults to $CPPOPTS)])dnl AC_SUBST(CPPOPTS)])dnl dnl -dnl Imake LinkFile rule, so they occur in the right place -- LinkFile(dst,src) -dnl -define(LinkFile,[ -AC_REQUIRE([AC_LN_S]) -AC_PUSH_MAKEFILE()dnl -changequote({,})dnl - -$1:: $2{ - $(RM) $}{@ - $(LN) $}{? $}{@ - -} -changequote([,])dnl -AC_POP_MAKEFILE()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_REQUIRE([AC_LN_S]) -AC_PUSH_MAKEFILE()dnl -changequote({,})dnl - -$1:: $2{ - $(RM) $}{@ - $(LN) }$3{$(S)$}{? $}{@ - -} -changequote([,])dnl -AC_POP_MAKEFILE()dnl -])dnl -dnl -dnl explicit append text (for non-general things) -- AppendRule(txt) -dnl -define(AppendRule,[ -AC_PUSH_MAKEFILE()dnl - -$1 - -AC_POP_MAKEFILE()dnl -])dnl -dnl -dnl create DONE file for lib/krb5 -- SubdirLibraryRule(list) -define(SubdirLibraryRule,[ -AC_PUSH_MAKEFILE()dnl - -all-unix:: DONE - -DONE:: $1 $(srcdir)/Makefile.in - @if test x'$1' = x && test -r [$]@; then :;\ - else \ - (set -x; echo $1 > [$]@) \ - fi - -clean-unix:: - $(RM) DONE -AC_POP_MAKEFILE()dnl -])dnl -dnl -dnl copy header file into include dir -- CopyHeader(hfile,hdir) -dnl -define(CopyHeader,[ -AC_PUSH_MAKEFILE()dnl - -includes:: $2/$1 -$2/$1: $1 - @if test -d $2; then :; else (set -x; mkdir $2) fi - @if cmp $1 $2/$1 >/dev/null 2>&1; then :; \ - else \ - (set -x; [$](RM) $2/$1; [$](CP) $1 $2/$1) \ - fi - -clean-unix:: - $(RM) $2/$1 - -AC_POP_MAKEFILE()dnl -])dnl -dnl -dnl copy source header file into include dir -- CopySrcHeader(hfile,hdir) -dnl -define(CopySrcHeader,[ -AC_PUSH_MAKEFILE()dnl - -includes:: $2/$1 -$2/$1: $(srcdir)/$1 - @if test -d $2; then :; else (set -x; mkdir $2) fi - @if cmp $(srcdir)/$1 $2/$1 >/dev/null 2>&1; then :; \ - else \ - (set -x; [$](RM) $2/$1; [$](CP) $(srcdir)/$1 $2/$1) \ - fi - -clean-unix:: - $(RM) $2/$1 - -AC_POP_MAKEFILE()dnl -])dnl -dnl -dnl Krb5InstallHeaders(headers,destdir) -define(Krb5InstallHeaders,[ -AC_PUSH_MAKEFILE()dnl -install-unix:: $1 - @set -x; for f in $1 ; \ - do [$](INSTALL_DATA) [$$]f $2/[$$]f ; \ - done -AC_POP_MAKEFILE()dnl -])dnl -dnl dnl arbitrary DEFS -- ADD_DEF(value) dnl define(ADD_DEF,[ @@ -477,83 +343,35 @@ fi AC_MSG_RESULT(setting LEXLIB to $LEXLIB) AC_SUBST(LEX)AC_SUBST(LEXLIB)])dnl dnl +dnl K5_GEN_MAKEFILE([dir, [frags]]) +dnl +define(K5_GEN_MAKEFILE,[dnl +ifelse($1, , x=., x="$1") +appendlist='' +ifelse($2, , ,[dnl +for i in $2 +do + appendlist=$appendlist:$ac_config_fragdir/$i.in +done]) +krb5_output_list="$krb5_output_list $x/Makefile:$krb5_pre_in:$x/Makefile.in$appendlist:$krb5_post_in"])dnl +dnl +dnl K5_GEN_FILE( <ac_output arguments> ) +dnl +define(K5_GEN_FILE,[krb5_output_list="$krb5_output_list $1"])dnl +dnl +dnl K5_OUTPUT_FILES +dnl +define(K5_OUTPUT_FILES,[AC_OUTPUT($krb5_output_list)])dnl +dnl dnl V5_OUTPUT_MAKEFILE dnl define(V5_AC_OUTPUT_MAKEFILE, [ifelse($1, , ac_v5_makefile_dirs=., ac_v5_makefile_dirs="$1") ifelse($2, , filelist="", filelist="$2") -dnl OPTIMIZE THIS FOR COMMON CASE!! for x in $ac_v5_makefile_dirs; do - filelist="$filelist $x/Makefile.tmp:$krb5_prepend_frags:$x/Makefile.in:$krb5_append_frags" + filelist="$filelist $x/Makefile:$krb5_prepend_frags:$x/Makefile.in:$krb5_append_frags" done -AC_OUTPUT($filelist, -[EOF -ac_reltopdir=`echo $ac_reltopdir | sed \ - -e ':LOOP' \ - -e 's,/\./,/,' \ - -e 'tLOOP' \ - -e 's,^\./,,' \ - -e 's,/\.$,,g' \ - ` -test "$ac_reltopdir" = "" && ac_reltopdir=. -cat >> $CONFIG_STATUS <<EOF -ac_v5_makefile_dirs="$ac_v5_makefile_dirs" -ac_reltopdir=$ac_reltopdir -EOF -dnl This should be fixed so that the here document produced gets broken up -dnl into chunks that are the "right" size, in case we run across shells that -dnl are broken WRT large here documents. ->> append.out -cat - append.out >> $CONFIG_STATUS <<\EOF -cat >> append.tmp <<\CEOF -# -# rules appended by configure - -EOF -rm append.out -dnl now back to regular config.status generation -cat >> $CONFIG_STATUS <<\EOF -CEOF -for d in $ac_v5_makefile_dirs; do - # If CONFIG_FILES was set from Makefile, skip unprocessed directories. - if test -r $d/Makefile.tmp; then -changequote(,)dnl - x=`echo $d/ | sed \ - -e 's,//*$,/,' \ - -e ':LOOP' \ - -e 's,/\./,/,' \ - -e 'tLOOP' \ - -e 's,^\./,,' \ - -e 's,[^/]*/,../,g' \ - ` -changequote([,])dnl - test "$x" = "" && x=./ - case $srcdir in - /*) s=$ac_given_srcdir/$ac_reltopdir ;; - *) s=$x$ac_given_srcdir/$ac_reltopdir ;; - esac - s=`echo $s | sed \ - -e 's,//*$,/,' \ - -e ':LOOP' \ - -e 's,/\./,/,' \ - -e 'tLOOP' \ - -e 's,^\./,,' \ - -e 's,/\.$,,g' \ - ` - test "$s" = "" && s=. - echo creating $d/Makefile - cat - $d/Makefile.tmp append.tmp > $d/Makefile <<EOX -thisconfigdir=$x -SRCTOP=$s -BUILDTOP=$x$ac_reltopdir -EOX - rm $d/Makefile.tmp -# sed -f $CONF_FRAGDIR/mac-mf.sed < Makefile > MakeFile - fi -done -rm append.tmp -], -CONF_FRAGDIR=$srcdir/${ac_config_fragdir} )])dnl +AC_OUTPUT($filelist)])dnl dnl dnl KRB5_SOCKADDR_SA_LEN: define HAVE_SA_LEN if sockaddr contains the sa_len dnl component @@ -675,158 +493,6 @@ ADD_DEF(-Dvolatile=) fi ])dnl dnl -dnl This rule tells KRB5_LIBRARIES to use the kadm5srv library. -dnl -kadmsrv_deplib='' -kadmsrv_lib='' -define(USE_KADMSRV_LIBRARY,[ -kadmsrv_deplib="\[$](TOPLIBD)/libkadm5srv.a" -kadmsrv_lib=-lkadm5srv]) -dnl -dnl This rule tells KRB5_LIBRARIES to use the kadm5clnt library. -dnl -kadmclnt_deplib='' -kadmclnt_lib='' -define(USE_KADMCLNT_LIBRARY,[ -kadmclnt_deplib="\[$](TOPLIBD)/libkadm5clnt.a" -kadmclnt_lib=-lkadm5clnt]) -dnl -dnl This rule tells KRB5_LIBRARIES to use the gssrpc library. -dnl -gssrpc_deplib='' -gssrpc_lib='' -define(USE_GSSRPC_LIBRARY,[ -gssrpc_deplib="\[$](TOPLIBD)/libgssrpc.a" -gssrpc_lib=-lgssrpc]) -dnl -dnl This rule tells KRB5_LIBRARIES to use the gssapi library. -dnl -gssapi_deplib='' -gssapi_lib='' -define(USE_GSSAPI_LIBRARY,[ -gssapi_deplib="\[$](TOPLIBD)/libgssapi_krb5.a" -gssapi_lib=-lgssapi_krb5]) -dnl -dnl This rule tells KRB5_LIBRARIES to use the krb5util library. -dnl -kutil_deplib='' -kutil_lib='' -define(USE_KRB5UTIL_LIBRARY,[ -kutil_deplib="\[$](TOPLIBD)/libkrb5util.a" -kutil_lib=-lkrb5util]) -dnl -dnl This rule tells KRB5_LIBRARIES to include the aname db library. -dnl -define(USE_ANAME,[ -USE_DB_LIBRARY -])dnl -dnl -dnl This rule tells KRB5_LIBRARIES to include the kdb5 and db libraries. -dnl -kdb5_deplib='' -kdb5_lib='' -define(USE_KDB5_LIBRARY,[ -kdb5_deplib="\[$](TOPLIBD)/libkdb5.a" -kdb5_lib=-lkdb5 -USE_DB_LIBRARY -]) -dnl -dnl This rule tells KRB5_LIBRARIES to include the krb4 libraries. -dnl -krb4_deplib='' -krb5_lib='' -define(USE_KRB4_LIBRARY,[ -krb4_deplib="$DEPKRB4_LIB $DEPKRB4_CRYPTO_LIB" -krb4_lib="$KRB4_LIB $KRB4_CRYPTO_LIB"] - CPPFLAGS="$CPPFLAGS $KRB4_INCLUDE") dnl -dnl -dnl This rule tells KRB5_LIBRARIES to include the ss library. -dnl -ss_deplib='' -ss_lib='' -define(USE_SS_LIBRARY,[ -ss_deplib="\[$](TOPLIBD)/libss.a" -ss_lib=-lss -]) -dnl -dnl This rule tells KRB5_LIBRARIES to include the dyn library. -dnl -dyn_deplib='' -dyn_lib='' -define(USE_DYN_LIBRARY,[ -dyn_deplib="\[$](TOPLIBD)/libdyn.a" -dyn_lib=-ldyn -]) -dnl -dnl This rule tells KRB5_LIBRARIES to include the db library. -dnl -db_deplib='' -db_lib='' -define(USE_DB_LIBRARY,[ -db_deplib="\[$](TOPLIBD)/libdb.a" -db_lib="\[$](TOPLIBD)/libdb.a" -]) -dnl -dnl This rule generates library lists for programs. -dnl -define(KRB5_LIBRARIES,[ -dnl -dnl under solaris, if we use compile() and step(), we need -lgen -save_LIBS="$LIBS" -LIBS=-lgen -dnl this will fail if there's no compile/step in -lgen, or if there's -dnl no -lgen. This is fine. -AC_CHECK_FUNCS(compile step) -[if test "$ac_cv_func_compile" = yes ; then - LIBS="$save_LIBS -lgen" -else - LIBS="$save_LIBS" -fi] -dnl this is ugly, but it wouldn't be necessary if krb5 didn't abuse -dnl configure so badly -SRVDEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmsrv_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" -SRVLIBS="\[$](LOCAL_LIBRARIES) $kadmsrv_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" -CLNTDEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmclnt_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" -CLNTLIBS="\[$](LOCAL_LIBRARIES) $kadmclnt_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" -DEPLIBS="\[$](DEPLOCAL_LIBRARIES) $kadmclnt_deplib $kadmsrv_deplib $gssrpc_deplib $gssapi_deplib $kdb5_deplib $kutil_deplib \[$](TOPLIBD)/libkrb5.a $krb4_deplib \[$](TOPLIBD)/libcrypto.a $ss_deplib $dyn_deplib $db_deplib \[$](TOPLIBD)/libcom_err.a" -LIBS="\[$](LOCAL_LIBRARIES) $kadmclnt_lib $kadmsrv_lib $gssrpc_lib $gssapi_lib $kdb5_lib $kutil_lib $krb4_lib -lkrb5 -lcrypto $ss_lib $dyn_lib $db_lib -lcom_err $LIBS" -LDFLAGS="$LDFLAGS -L\$(TOPLIBD)" -AC_SUBST(LDFLAGS) -AC_SUBST(LDARGS) -AC_SUBST(DEPLIBS) -AC_SUBST(SRVDEPLIBS) -AC_SUBST(SRVLIBS) -AC_SUBST(CLNTDEPLIBS) -AC_SUBST(CLNTLIBS)]) -dnl -dnl Defines LDARGS correctly so that we actually 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 "$krb5_cv_shlibs_enabled" = yes ; then - 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)" - 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 -else - LDARGS="-L\$(TOPLIBD) $LDARGS" -fi -AC_SUBST(LDARGS) -])dnl -dnl dnl dnl Check for prototype support - used by application not including k5-int.h dnl diff --git a/src/appl/ChangeLog b/src/appl/ChangeLog index 708b53bee..dc6accc3f 100644 --- a/src/appl/ChangeLog +++ b/src/appl/ChangeLog @@ -1,3 +1,12 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Mon Nov 18 20:57:08 1996 Theodore Y. Ts'o <tytso@mit.edu> * configure.in: Remove the popper, mailquery, and movemail diff --git a/src/appl/Makefile.in b/src/appl/Makefile.in index 16fdba5d2..37ad0fec6 100644 --- a/src/appl/Makefile.in +++ b/src/appl/Makefile.in @@ -1 +1,3 @@ +thisconfigdir=./ +BUILDTOP=$(U) CFLAGS = $(CCOPTS) diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog index 3beb9cf41..0dbf84b38 100644 --- a/src/appl/bsd/ChangeLog +++ b/src/appl/bsd/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Jan 20 21:42:06 1998 Tom Yu <tlyu@mit.edu> * krlogind.c (protocol): Declare pibuf and fibuf as being BUFSIZ diff --git a/src/appl/bsd/Makefile.in b/src/appl/bsd/Makefile.in index 368ceb8f1..9ea3cb74c 100644 --- a/src/appl/bsd/Makefile.in +++ b/src/appl/bsd/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES) LOCALINCLUDE=@KRB4_INCLUDES@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/appl/configure.in b/src/appl/configure.in index 8622fa98c..54e2af327 100644 --- a/src/appl/configure.in +++ b/src/appl/configure.in @@ -1,5 +1,4 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(sample simple user_user bsd gss-sample gssftp telnet) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(sample simple user_user bsd gss-sample gssftp telnet) V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog index 8bdd01df7..893ff8816 100644 --- a/src/appl/gss-sample/ChangeLog +++ b/src/appl/gss-sample/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Sep 18 17:52:26 1997 Tom Yu <tlyu@mit.edu> * configure.in: Replace USE_STRING_H with something more sane. diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in index 948b83e87..ee1630015 100644 --- a/src/appl/gss-sample/Makefile.in +++ b/src/appl/gss-sample/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_AUTOCONF_H -DGSSAPI_V2 PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/appl/gssftp/ChangeLog b/src/appl/gssftp/ChangeLog index ea47f8438..86fe3771a 100644 --- a/src/appl/gssftp/ChangeLog +++ b/src/appl/gssftp/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sun Jan 14 03:19:55 1996 Mark Eichin <eichin@cygnus.com> * README.gssftp: new file, documents history of this implementation. diff --git a/src/appl/gssftp/Makefile.in b/src/appl/gssftp/Makefile.in index 76388e8c6..89ff07c04 100644 --- a/src/appl/gssftp/Makefile.in +++ b/src/appl/gssftp/Makefile.in @@ -1,2 +1,4 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) LDFLAGS = -g diff --git a/src/appl/gssftp/configure.in b/src/appl/gssftp/configure.in index 373180bc0..11fa91ae9 100644 --- a/src/appl/gssftp/configure.in +++ b/src/appl/gssftp/configure.in @@ -1,5 +1,4 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(ftp ftpd) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(ftp ftpd) V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index 2e42d579b..8c3c1a81c 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Jan 29 19:39:27 1998 Dan Winship <danw@mit.edu> * ftp.h: diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in index e2927804b..5e971b131 100644 --- a/src/appl/gssftp/ftp/Makefile.in +++ b/src/appl/gssftp/ftp/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) # # appl/gssftp/ftp/Makefile.in # diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog index 18377bb55..da0540900 100644 --- a/src/appl/gssftp/ftpd/ChangeLog +++ b/src/appl/gssftp/ftpd/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Feb 6 13:25:28 1998 Theodore Y. Ts'o <tytso@mit.edu> * popen.c (ftpd_popen): Make sure you can't overrun the argv[] and diff --git a/src/appl/gssftp/ftpd/Makefile.in b/src/appl/gssftp/ftpd/Makefile.in index 303ae80ed..a23796410 100644 --- a/src/appl/gssftp/ftpd/Makefile.in +++ b/src/appl/gssftp/ftpd/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) # # appl/gssftp/ftpd/Makefile.in # diff --git a/src/appl/sample/ChangeLog b/src/appl/sample/ChangeLog index b4b4f5077..847b6da1e 100644 --- a/src/appl/sample/ChangeLog +++ b/src/appl/sample/ChangeLog @@ -1,5 +1,13 @@ +Mon Feb 2 16:47:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for all of the subdirectories + and move all of the configure.in tests from the + subdirectories into this configure.in. + Fri Jul 7 15:45:38 EDT 1995 Paul Park (pjpark@mit.edu) + * Makefile.in - Remove LDFLAGS. Fri Jun 9 18:27:34 1995 <tytso@rsx-11.mit.edu> diff --git a/src/appl/sample/Makefile.in b/src/appl/sample/Makefile.in index 16fdba5d2..f3fd3c23b 100644 --- a/src/appl/sample/Makefile.in +++ b/src/appl/sample/Makefile.in @@ -1 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) +LOCAL_SUBDIRS = sclient sserver + CFLAGS = $(CCOPTS) diff --git a/src/appl/sample/configure.in b/src/appl/sample/configure.in index 8a4b84729..5bbd1eecc 100644 --- a/src/appl/sample/configure.in +++ b/src/appl/sample/configure.in @@ -1,5 +1,11 @@ -AC_INIT(configure.in) +AC_INIT(sample.h) CONFIG_RULES -CONFIG_DIRS(sclient sserver) -DO_SUBDIRS -V5_AC_OUTPUT_MAKEFILE +CONFIG_RULES +AC_PROG_INSTALL +AC_CHECK_HEADERS(stdlib.h) +KRB5_BUILD_PROGRAM +K5_GEN_MAKEFILE(.) +K5_GEN_MAKEFILE(sclient) +K5_GEN_MAKEFILE(sserver) +K5_OUTPUT_FILES + diff --git a/src/appl/sample/sclient/ChangeLog b/src/appl/sample/sclient/ChangeLog index afb3bd2d0..e7201b5cb 100644 --- a/src/appl/sample/sclient/ChangeLog +++ b/src/appl/sample/sclient/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Dec 16 09:43:15 1997 Ezra Peisach <epeisach@mit.edu> * sclient.c (main): Free client principal and krb5_ap_rep_enc_part diff --git a/src/appl/sample/sclient/Makefile.in b/src/appl/sample/sclient/Makefile.in index 8763029a8..fc0506fce 100644 --- a/src/appl/sample/sclient/Makefile.in +++ b/src/appl/sample/sclient/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/appl/sample/sclient/configure.in b/src/appl/sample/sclient/configure.in deleted file mode 100644 index 0a1fcf4b2..000000000 --- a/src/appl/sample/sclient/configure.in +++ /dev/null @@ -1,6 +0,0 @@ -AC_INIT(sclient.c) -CONFIG_RULES -AC_PROG_INSTALL -AC_CHECK_HEADERS(stdlib.h) -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/sample/sserver/ChangeLog b/src/appl/sample/sserver/ChangeLog index 591aef56d..48076d722 100644 --- a/src/appl/sample/sserver/ChangeLog +++ b/src/appl/sample/sserver/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Feb 4 20:47:55 1997 Tom Yu <tlyu@mit.edu> * Makefile.in: diff --git a/src/appl/sample/sserver/Makefile.in b/src/appl/sample/sserver/Makefile.in index 5be42c28a..735171890 100644 --- a/src/appl/sample/sserver/Makefile.in +++ b/src/appl/sample/sserver/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/appl/sample/sserver/configure.in b/src/appl/sample/sserver/configure.in deleted file mode 100644 index af0f45a26..000000000 --- a/src/appl/sample/sserver/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(sserver.c) -CONFIG_RULES -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/simple/ChangeLog b/src/appl/simple/ChangeLog index a2ae28f7d..3c69c21d9 100644 --- a/src/appl/simple/ChangeLog +++ b/src/appl/simple/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 16:47:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for all of the subdirectories + and move all of the configure.in tests from the + subdirectories into this configure.in. + Fri Sep 15 14:24:37 1995 Theodore Y. Ts'o <tytso@dcl> * simple.h (SIMPLE_SERVICE, SIMPLE_PORT): Use separate definitions diff --git a/src/appl/simple/Makefile.in b/src/appl/simple/Makefile.in index 16fdba5d2..5c3584ff1 100644 --- a/src/appl/simple/Makefile.in +++ b/src/appl/simple/Makefile.in @@ -1 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) +LOCAL_SUBDIRS = client server + CFLAGS = $(CCOPTS) diff --git a/src/appl/simple/client/ChangeLog b/src/appl/simple/client/ChangeLog index 72017595a..794f41938 100644 --- a/src/appl/simple/client/ChangeLog +++ b/src/appl/simple/client/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Feb 18 18:11:03 1997 Richard Basch <basch@lehman.com> * sim_client.c: Replace krb5_xfree with krb5_free_data_contents diff --git a/src/appl/simple/client/Makefile.in b/src/appl/simple/client/Makefile.in index f9f530322..104c2b491 100644 --- a/src/appl/simple/client/Makefile.in +++ b/src/appl/simple/client/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/appl/simple/client/configure.in b/src/appl/simple/client/configure.in deleted file mode 100644 index 3d81282e8..000000000 --- a/src/appl/simple/client/configure.in +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(sim_client.c) -CONFIG_RULES -AC_PROG_INSTALL -AC_CHECK_HEADERS(stdlib.h) -if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then - AC_DEFINE(BROKEN_STREAMS_SOCKETS) -fi -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/simple/configure.in b/src/appl/simple/configure.in index b155112dc..dc8492e68 100644 --- a/src/appl/simple/configure.in +++ b/src/appl/simple/configure.in @@ -1,5 +1,14 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(client server) -DO_SUBDIRS -V5_AC_OUTPUT_MAKEFILE +AC_PROG_INSTALL +AC_CHECK_HEADERS(stdlib.h) +if test "$ac_cv_lib_socket" = "yes" -a "$ac_cv_lib_nsl" = "yes"; then + AC_DEFINE(BROKEN_STREAMS_SOCKETS) +fi +KRB5_BUILD_PROGRAM +K5_GEN_MAKEFILE(.) +K5_GEN_MAKEFILE(client) +K5_GEN_MAKEFILE(server) +K5_OUTPUT_FILES + + diff --git a/src/appl/simple/server/ChangeLog b/src/appl/simple/server/ChangeLog index e6fd132f4..1a11f94a4 100644 --- a/src/appl/simple/server/ChangeLog +++ b/src/appl/simple/server/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Feb 18 18:12:16 1997 Richard Basch <basch@lehman.com> * sim_server.c: Use krb5_free_data_contents instead of krb5_xfree diff --git a/src/appl/simple/server/Makefile.in b/src/appl/simple/server/Makefile.in index 332c2660e..e3118eaf2 100644 --- a/src/appl/simple/server/Makefile.in +++ b/src/appl/simple/server/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LOCALINCLUDE= -I.. -I$(srcdir)/.. diff --git a/src/appl/simple/server/configure.in b/src/appl/simple/server/configure.in deleted file mode 100644 index 61590e6e9..000000000 --- a/src/appl/simple/server/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(sim_server.c) -CONFIG_RULES -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/ChangeLog b/src/appl/telnet/ChangeLog index 599cccf1a..3aa6a4408 100644 --- a/src/appl/telnet/ChangeLog +++ b/src/appl/telnet/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jun 9 18:29:38 1995 <tytso@rsx-11.mit.edu> * configure.in: Remove standardized set of autoconf macros, which diff --git a/src/appl/telnet/Makefile.in b/src/appl/telnet/Makefile.in index e69de29bb..d319fd72d 100644 --- a/src/appl/telnet/Makefile.in +++ b/src/appl/telnet/Makefile.in @@ -0,0 +1,2 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) diff --git a/src/appl/telnet/configure.in b/src/appl/telnet/configure.in index 1b90cbc47..9dccb58ca 100644 --- a/src/appl/telnet/configure.in +++ b/src/appl/telnet/configure.in @@ -1,5 +1,4 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(libtelnet telnet telnetd) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(libtelnet telnet telnetd) V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/libtelnet/ChangeLog b/src/appl/telnet/libtelnet/ChangeLog index df22164b7..987b0296d 100644 --- a/src/appl/telnet/libtelnet/ChangeLog +++ b/src/appl/telnet/libtelnet/ChangeLog @@ -1,3 +1,11 @@ +Thu Feb 12 10:23:28 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Remove obsolete USE_KRB4_LIBRARY macro + +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Nov 20 17:13:42 1997 Tom Yu <tlyu@mit.edu> * forward.c (rd_and_store_for_creds): Fix up to no longer do the diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in index 614531d2b..8ce564370 100644 --- a/src/appl/telnet/libtelnet/Makefile.in +++ b/src/appl/telnet/libtelnet/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) # derived from the original Makefile.generic # # Copyright (c) 1991 The Regents of the University of California. diff --git a/src/appl/telnet/libtelnet/configure.in b/src/appl/telnet/libtelnet/configure.in index 01cf5d72e..b2bc50ee9 100644 --- a/src/appl/telnet/libtelnet/configure.in +++ b/src/appl/telnet/libtelnet/configure.in @@ -14,5 +14,4 @@ else AC_MSG_RESULT(Kerberos 4 authentication enabled) AC_DEFINE(KRB4) fi -USE_KRB4_LIBRARY V5_AC_OUTPUT_MAKEFILE diff --git a/src/appl/telnet/telnet/ChangeLog b/src/appl/telnet/telnet/ChangeLog index 73189bb8c..0b4848b0c 100644 --- a/src/appl/telnet/telnet/ChangeLog +++ b/src/appl/telnet/telnet/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Feb 12 15:23:36 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * configure.in: Fix DES425_LIB... missed this in libhack_branch; diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in index ca7e743df..977460195 100644 --- a/src/appl/telnet/telnet/Makefile.in +++ b/src/appl/telnet/telnet/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) # derived from the original Makefile.generic # # Copyright (c) 1991 The Regents of the University of California. diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog index 31eaf8e47..49f9bf061 100644 --- a/src/appl/telnet/telnetd/ChangeLog +++ b/src/appl/telnet/telnetd/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Jan 28 17:21:08 1998 Dan Winship <danw@mit.edu> * telnetd.c (doit): additional fix for previous terminaltype change diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in index d3dcfca8d..2719cf071 100644 --- a/src/appl/telnet/telnetd/Makefile.in +++ b/src/appl/telnet/telnetd/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) # derived from the original Makefile.generic # # Copyright (c) 1991 The Regents of the University of California. diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog index e6706b4e9..9c1e6f765 100644 --- a/src/appl/user_user/ChangeLog +++ b/src/appl/user_user/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Feb 4 20:35:45 1997 Tom Yu <tlyu@mit.edu> * Makefile.in: diff --git a/src/appl/user_user/Makefile.in b/src/appl/user_user/Makefile.in index fe2906ad1..e46e64923 100644 --- a/src/appl/user_user/Makefile.in +++ b/src/appl/user_user/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/clients/ChangeLog b/src/clients/ChangeLog index 5972961ea..352f018e2 100644 --- a/src/clients/ChangeLog +++ b/src/clients/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Thu Jan 29 00:12:07 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use this configure.in for all subdirectories. + Fri Jan 30 16:08:25 1998 Tom Yu <tlyu@mit.edu> * configure.in: Add new directory for kpasswd. diff --git a/src/clients/Makefile.in b/src/clients/Makefile.in index a9e9c5966..eded64f3c 100644 --- a/src/clients/Makefile.in +++ b/src/clients/Makefile.in @@ -1,4 +1,7 @@ -##DOS##BUILDTOP = .. +thisconfigdir=./ +BUILDTOP=$(U) + +LOCAL_SUBDIRS= klist kinit kdestroy kpasswd ksu ##WIN32##all-windows:: ##WIN32## @echo Making all in clients\klist diff --git a/src/clients/configure.in b/src/clients/configure.in index b800259ea..51489ded3 100644 --- a/src/clients/configure.in +++ b/src/clients/configure.in @@ -1,5 +1,15 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(klist kinit kdestroy kpasswd ksu) -DO_SUBDIRS -V5_AC_OUTPUT_MAKEFILE +AC_PROG_INSTALL +KRB5_BUILD_PROGRAM +AC_HEADER_STDARG +AC_CHECK_FUNCS(getusershell lstat ) +AC_CHECK_HEADERS(unistd.h pwd.h) +K5_GEN_MAKEFILE(.) +K5_GEN_MAKEFILE(klist) +K5_GEN_MAKEFILE(kinit) +K5_GEN_MAKEFILE(kdestroy) +K5_GEN_MAKEFILE(kpasswd) +K5_GEN_MAKEFILE(ksu) +K5_OUTPUT_FILES + diff --git a/src/clients/kdestroy/ChangeLog b/src/clients/kdestroy/ChangeLog index ac8c54326..5b0cbf680 100644 --- a/src/clients/kdestroy/ChangeLog +++ b/src/clients/kdestroy/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Jan 21 15:12:30 1998 Ezra Peisach <epeisach@kangaroo.mit.edu> * kdestroy.c (main): returns int, not void. ANSI X3.159-1989 diff --git a/src/clients/kdestroy/Makefile.in b/src/clients/kdestroy/Makefile.in index 4e907b02d..22c485c46 100644 --- a/src/clients/kdestroy/Makefile.in +++ b/src/clients/kdestroy/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) ##DOS##BUILDTOP=..\.. CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) diff --git a/src/clients/kdestroy/configure.in b/src/clients/kdestroy/configure.in deleted file mode 100644 index 993b1be21..000000000 --- a/src/clients/kdestroy/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(kdestroy.c) -CONFIG_RULES -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/kinit/ChangeLog b/src/clients/kinit/ChangeLog index 0f6719a7b..8547cdf8d 100644 --- a/src/clients/kinit/ChangeLog +++ b/src/clients/kinit/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Jan 21 15:10:37 1998 Ezra Peisach <epeisach@kangaroo.mit.edu> * kinit.c (main): returns int, not void. ANSI X3.159-1989 diff --git a/src/clients/kinit/Makefile.in b/src/clients/kinit/Makefile.in index b9799120a..ae30d64a2 100644 --- a/src/clients/kinit/Makefile.in +++ b/src/clients/kinit/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) ##DOS##BUILDTOP=..\.. CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) diff --git a/src/clients/kinit/configure.in b/src/clients/kinit/configure.in deleted file mode 100644 index 8fb057c8e..000000000 --- a/src/clients/kinit/configure.in +++ /dev/null @@ -1,6 +0,0 @@ -AC_INIT(kinit.c) -CONFIG_RULES -AC_PROG_INSTALL -AC_HAVE_HEADERS(pwd.h) -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/klist/ChangeLog b/src/clients/klist/ChangeLog index 3571b121b..4dfa65b80 100644 --- a/src/clients/klist/ChangeLog +++ b/src/clients/klist/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Jan 21 15:11:22 1998 Ezra Peisach <epeisach@kangaroo.mit.edu> * klist.c (main): returns int, not void. ANSI X3.159-1989 diff --git a/src/clients/klist/Makefile.in b/src/clients/klist/Makefile.in index 2954a4dc4..fc6e614cc 100644 --- a/src/clients/klist/Makefile.in +++ b/src/clients/klist/Makefile.in @@ -1,4 +1,5 @@ -##DOS##BUILDTOP=..\.. +thisconfigdir=./../ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/clients/klist/configure.in b/src/clients/klist/configure.in deleted file mode 100644 index f324b0ab7..000000000 --- a/src/clients/klist/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(klist.c) -CONFIG_RULES -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog index ab2bf14d7..d59c8e0c8 100644 --- a/src/clients/kpasswd/ChangeLog +++ b/src/clients/kpasswd/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 12 08:37:00 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 30 16:06:13 1998 Tom Yu <tlyu@mit.edu> * kpasswd.c: diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in index 0970a9846..8fe4321bc 100644 --- a/src/clients/kpasswd/Makefile.in +++ b/src/clients/kpasswd/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/clients/kpasswd/configure.in b/src/clients/kpasswd/configure.in deleted file mode 100644 index e5d2575db..000000000 --- a/src/clients/kpasswd/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(kpasswd.c) -CONFIG_RULES -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/clients/ksu/ChangeLog b/src/clients/ksu/ChangeLog index 896dab8a4..3d8c51edc 100644 --- a/src/clients/ksu/ChangeLog +++ b/src/clients/ksu/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Feb 4 20:46:49 1998 Tom Yu <tlyu@mit.edu> * krb_auth_su.c (krb5_verify_tkt_def): If using a pre-existing diff --git a/src/clients/ksu/Makefile.in b/src/clients/ksu/Makefile.in index eeace51c4..256ad25f8 100644 --- a/src/clients/ksu/Makefile.in +++ b/src/clients/ksu/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"' CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE) diff --git a/src/clients/ksu/configure.in b/src/clients/ksu/configure.in deleted file mode 100644 index 70d663b5a..000000000 --- a/src/clients/ksu/configure.in +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(krb_auth_su.c) -CONFIG_RULES -AC_PROG_INSTALL -USE_ANAME -AC_HEADER_STDARG -AC_CHECK_FUNCS(getusershell lstat ) -AC_CHECK_HEADERS(unistd.h) -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/config-files/ChangeLog b/src/config-files/ChangeLog index 8cd401cd2..cca13fdab 100644 --- a/src/config-files/ChangeLog +++ b/src/config-files/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Jan 28 09:02:31 1998 Ezra Peisach <epeisach@mit.edu> * kdc.conf.M: Document the v4_mode option. [krb5-kdc/464] diff --git a/src/config-files/Makefile.in b/src/config-files/Makefile.in index e56430c7c..5b837ce35 100644 --- a/src/config-files/Makefile.in +++ b/src/config-files/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) all:: install:: diff --git a/src/config/ChangeLog b/src/config/ChangeLog index a27f4dd38..1d64f80db 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * pre.in: SUBDIRS now also includes LOCAL_SUBDIRS, which is + defined in the Makefile.in to control the recursive + descent through the subdirectories. This is used so + that the subdirectories can be defined in Makefile.in, + instead of in the individual configure.in files. + Tue Nov 18 19:20:59 1997 Tom Yu <tlyu@mit.edu> * pre.in: Clean up up .ct.c rule. diff --git a/src/config/pre.in b/src/config/pre.in index 10fd880b0..561b1def5 100644 --- a/src/config/pre.in +++ b/src/config/pre.in @@ -57,8 +57,9 @@ C=./ S=/ U=../ -SUBDIRS = @subdirs@ +SUBDIRS = @subdirs@ $(LOCAL_SUBDIRS) srcdir = @srcdir@ +SRCTOP = @srcdir@/$(BUILDTOP) VPATH = @srcdir@ CPPFLAGS = @CPPFLAGS@ diff --git a/src/configure.in b/src/configure.in index 68fafd24d..c7be4dbd3 100644 --- a/src/configure.in +++ b/src/configure.in @@ -256,8 +256,7 @@ kadminv4=kadmin.v4 krb524=krb524 fi dnl -CONFIG_DIRS(util include lib $krb524 kdc kadmin slave clients appl tests config-files gen-manpages) +AC_CONFIG_SUBDIRS(util include lib $krb524 kdc kadmin slave clients appl tests config-files gen-manpages) dnl $kadminv4 removed from the above -DO_SUBDIRS dnl AC_OUTPUT(Makefile,[EXTRA_RULES]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/gen-manpages/ChangeLog b/src/gen-manpages/ChangeLog index 3160470bd..dee186102 100644 --- a/src/gen-manpages/ChangeLog +++ b/src/gen-manpages/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Sep 10 14:22:14 1996 Tom Yu <tlyu@mit.edu> * Makefile.in (install): don't install header.doc diff --git a/src/gen-manpages/Makefile.in b/src/gen-manpages/Makefile.in index 59d50e730..cbd6a5a54 100644 --- a/src/gen-manpages/Makefile.in +++ b/src/gen-manpages/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) all:: install:: diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 6bfd0b0e3..bfc2ab101 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Jan 29 20:15:30 1998 Dan Winship <danw@mit.edu> * krb5.hin: fix #define of krb5_cc_gen_new (takes a krb5_ccache *, diff --git a/src/include/Makefile.in b/src/include/Makefile.in index f9bbbb45f..a6c6f8db1 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) ##DOSBUILDTOP = .. all-unix:: krb5.h adm_err.h diff --git a/src/include/configure.in b/src/include/configure.in index 4b1c1f3fa..eb366ea54 100644 --- a/src/include/configure.in +++ b/src/include/configure.in @@ -2,6 +2,5 @@ AC_INIT(configure.in) CONFIG_RULES AC_PROG_INSTALL AC_PROG_AWK -CONFIG_DIRS(krb5 kerberosIV) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(krb5 kerberosIV) V5_AC_OUTPUT_MAKEFILE diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog index c3b576574..da2d9406e 100644 --- a/src/include/kerberosIV/ChangeLog +++ b/src/include/kerberosIV/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Nov 18 23:37:54 1997 Tom Yu <tlyu@mit.edu> * des.h: Clean up prototypes so they're sane and look a little diff --git a/src/include/kerberosIV/Makefile.in b/src/include/kerberosIV/Makefile.in index e0959b3d2..9a34576dd 100644 --- a/src/include/kerberosIV/Makefile.in +++ b/src/include/kerberosIV/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) KRB4_HEADERS=krb.h des.h kadm.h mit-copyright.h all-unix:: krb_err.h diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index af6652b8b..2101a766d 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Sep 30 17:19:16 1997 Tom Yu <tlyu@mit.edu> * configure.in: Remove references to dbm and ndbm. Replace diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index b3500dd4b..262996ef6 100644 --- a/src/include/krb5/Makefile.in +++ b/src/include/krb5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) KRB5RCTMPDIR= @KRB5_RCTMPDIR@ ##DOSBUILDTOP = ..\.. diff --git a/src/kadmin.v4/ChangeLog b/src/kadmin.v4/ChangeLog index 5edb760a4..0964fe56b 100644 --- a/src/kadmin.v4/ChangeLog +++ b/src/kadmin.v4/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Aug 24 19:18:23 1995 Theodore Y. Ts'o <tytso@dcl> * .Sanitize (Things-to-keep): Update file list diff --git a/src/kadmin.v4/Makefile.in b/src/kadmin.v4/Makefile.in index 2f64b25f2..1043979b4 100644 --- a/src/kadmin.v4/Makefile.in +++ b/src/kadmin.v4/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) CFLAGS = $(CCOPTS) all:: diff --git a/src/kadmin.v4/configure.in b/src/kadmin.v4/configure.in index 05c1320f3..9523e0d2a 100644 --- a/src/kadmin.v4/configure.in +++ b/src/kadmin.v4/configure.in @@ -1,5 +1,4 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(server) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(server) V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin.v4/server/ChangeLog b/src/kadmin.v4/server/ChangeLog index b411bb8a1..ba734f8ea 100644 --- a/src/kadmin.v4/server/ChangeLog +++ b/src/kadmin.v4/server/ChangeLog @@ -1,3 +1,12 @@ +Thu Feb 12 10:24:40 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Removed obsolete macros: USE_KDB5_LIBRARY, + USE_KRB4_LIBRARY + +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Nov 22 15:49:35 1996 unknown <bjaspan@mit.edu> * kadm_ser_wrap.c (kadm_ser_init): use sizeof instead of h_length diff --git a/src/kadmin.v4/server/Makefile.in b/src/kadmin.v4/server/Makefile.in index 39c13ee26..55ef8a78a 100644 --- a/src/kadmin.v4/server/Makefile.in +++ b/src/kadmin.v4/server/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV -I. diff --git a/src/kadmin.v4/server/configure.in b/src/kadmin.v4/server/configure.in index d4c10f959..403d6ebba 100644 --- a/src/kadmin.v4/server/configure.in +++ b/src/kadmin.v4/server/configure.in @@ -12,8 +12,6 @@ AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H)) CHECK_WAIT_TYPE CHECK_SIGNALS AC_PROG_AWK -USE_KDB5_LIBRARY -USE_KRB4_LIBRARY KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog index 03f661972..ba0e30577 100644 --- a/src/kadmin/ChangeLog +++ b/src/kadmin/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Nov 13 19:24:36 1996 Tom Yu <tlyu@mit.edu> * testing/Makefile.in (clean): Remove krb5-test-root. diff --git a/src/kadmin/Makefile.in b/src/kadmin/Makefile.in index 2f64b25f2..1043979b4 100644 --- a/src/kadmin/Makefile.in +++ b/src/kadmin/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) CFLAGS = $(CCOPTS) all:: diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 190267c68..12ea41192 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 7 19:57:43 1997 Ezra Peisach <epeisach@mit.edu> * kadmin.c (quit): Call krb5_free_context. diff --git a/src/kadmin/cli/Makefile.in b/src/kadmin/cli/Makefile.in index 73a13f095..d46d60715 100644 --- a/src/kadmin/cli/Makefile.in +++ b/src/kadmin/cli/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in index 1a86a4eeb..be60003d0 100644 --- a/src/kadmin/configure.in +++ b/src/kadmin/configure.in @@ -5,6 +5,5 @@ v4server="" else v4server=v4server fi -CONFIG_DIRS(cli dbutil passwd ktutil server $v4server v5passwdd testing) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(cli dbutil passwd ktutil server $v4server v5passwdd testing) V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog index 03bf5d9e4..8db80a966 100644 --- a/src/kadmin/dbutil/ChangeLog +++ b/src/kadmin/dbutil/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sun Nov 2 19:09:17 1997 Ezra Peisach <epeisach@mit.edu> * kdb5_util.c: Add flag indicating that policy db is to be closed. diff --git a/src/kadmin/dbutil/Makefile.in b/src/kadmin/dbutil/Makefile.in index 893812109..89420eefd 100644 --- a/src/kadmin/dbutil/Makefile.in +++ b/src/kadmin/dbutil/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -DKDB4_DISABLE -I. $(LOCALINCLUDE) @KRB4_INCLUDES@ PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/kadmin/kdbkeys/ChangeLog b/src/kadmin/kdbkeys/ChangeLog index 206aea9be..b512e8a62 100644 --- a/src/kadmin/kdbkeys/ChangeLog +++ b/src/kadmin/kdbkeys/ChangeLog @@ -1,3 +1,12 @@ +Thu Feb 12 10:24:16 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Removed obsolete macros: USE_KADMSRV_LIBRARY,n + USE_GSSRPC_LIBRARY, USE_DYN_LIBRARY, USE_KDB5_LIBRARY + +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Jul 18 19:44:10 1996 Marc Horowitz <marc@mit.edu> * configure.in: removed ET_RULES, replaced with AC_PROG_AWK diff --git a/src/kadmin/kdbkeys/Makefile.in b/src/kadmin/kdbkeys/Makefile.in index 5672bd0bf..a5d1ea30c 100644 --- a/src/kadmin/kdbkeys/Makefile.in +++ b/src/kadmin/kdbkeys/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG = kdbkeys diff --git a/src/kadmin/kdbkeys/configure.in b/src/kadmin/kdbkeys/configure.in index 6c027fc27..fe426e878 100644 --- a/src/kadmin/kdbkeys/configure.in +++ b/src/kadmin/kdbkeys/configure.in @@ -2,10 +2,6 @@ AC_INIT(kdbkeys.c) CONFIG_RULES AC_PROG_INSTALL AC_PROG_AWK -USE_KADMSRV_LIBRARY -USE_GSSRPC_LIBRARY -USE_DYN_LIBRARY -USE_KDB5_LIBRARY KRB5_LIBRARIES V5_USE_SHARED_LIB V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/ktutil/ChangeLog b/src/kadmin/ktutil/ChangeLog index 5fb5d7724..a716a7cc6 100644 --- a/src/kadmin/ktutil/ChangeLog +++ b/src/kadmin/ktutil/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Sep 30 18:58:09 1997 Tom Yu <tlyu@mit.edu> * ktutil.c: Replace HAS_STDLIB_H with something more sane. diff --git a/src/kadmin/ktutil/Makefile.in b/src/kadmin/ktutil/Makefile.in index d0be5705f..c592ff5d1 100644 --- a/src/kadmin/ktutil/Makefile.in +++ b/src/kadmin/ktutil/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(KRB4_INCLUDES) PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/kadmin/passwd/ChangeLog b/src/kadmin/passwd/ChangeLog index 39d5d3bb5..85f78018f 100644 --- a/src/kadmin/passwd/ChangeLog +++ b/src/kadmin/passwd/ChangeLog @@ -1,3 +1,14 @@ +Thu Feb 12 10:22:47 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Remove unused NetBSD kludge to prevent use of + USE_KDB5_LIBRARY, since these macros are obsolete. + +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Removed use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 30 15:29:28 1998 Tom Yu <tlyu@mit.edu> * Makefile.in: Remove install rules. diff --git a/src/kadmin/passwd/Makefile.in b/src/kadmin/passwd/Makefile.in index c94b72465..21758f512 100644 --- a/src/kadmin/passwd/Makefile.in +++ b/src/kadmin/passwd/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. -DUSE_KADM5_API_VERSION=1 PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/kadmin/passwd/configure.in b/src/kadmin/passwd/configure.in index d47ea63e8..cd597bbc3 100644 --- a/src/kadmin/passwd/configure.in +++ b/src/kadmin/passwd/configure.in @@ -1,32 +1,7 @@ AC_INIT(kpasswd.c) CONFIG_RULES AC_CONFIG_SUBDIRS(unit-test) -DO_SUBDIRS AC_PROG_INSTALL AC_PROG_AWK - -dnl -dnl The following is a kludge to get around a shared library problem -dnl for NetBSD and Linux. We have to include -lkdb5 under Linux, and -dnl we can't include -lkdb5 under NetBSD, due to various breakages in -dnl each system's shared library implementation -dnl - -dnl commented out for now --tlyu -dnl -ifelse([AC_MSG_CHECKING([for build host]) -AC_CACHE_VAL(krb5_cv_host, [export CC -AC_CANONICAL_HOST -krb5_cv_host=$host]) -AC_MSG_RESULT($krb5_cv_host) -case $krb5_cv_host in -*-*-*bsd*) - echo "Skipping USE KDB5 LIBRARY on BSD to avoid libdb incompatibilites" - ;; -*) - USE_KDB5_LIBRARY - ;; -esac]) - KRB5_BUILD_PROGRAM V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/passwd/unit-test/ChangeLog b/src/kadmin/passwd/unit-test/ChangeLog new file mode 100644 index 000000000..ff5429640 --- /dev/null +++ b/src/kadmin/passwd/unit-test/ChangeLog @@ -0,0 +1,4 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + diff --git a/src/kadmin/passwd/unit-test/Makefile.in b/src/kadmin/passwd/unit-test/Makefile.in index 8ffc57f2c..a98d94acf 100644 --- a/src/kadmin/passwd/unit-test/Makefile.in +++ b/src/kadmin/passwd/unit-test/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) check unit-test:: unit-test-@DO_TEST@ unit-test-: diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index 79837230d..a27bd4de4 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Jan 21 00:00:34 1998 Tom Yu <tlyu@mit.edu> * schpw.c: New file. Support for Cygnus chpw. diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index 9d552aabe..0e743f059 100644 --- a/src/kadmin/server/Makefile.in +++ b/src/kadmin/server/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/kadmin/testing/ChangeLog b/src/kadmin/testing/ChangeLog new file mode 100644 index 000000000..40303f899 --- /dev/null +++ b/src/kadmin/testing/ChangeLog @@ -0,0 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + diff --git a/src/kadmin/testing/Makefile.in b/src/kadmin/testing/Makefile.in index 0b9d609fc..ae1002d4b 100644 --- a/src/kadmin/testing/Makefile.in +++ b/src/kadmin/testing/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) all:: diff --git a/src/kadmin/testing/configure.in b/src/kadmin/testing/configure.in index d157c12be..60dd52a5a 100644 --- a/src/kadmin/testing/configure.in +++ b/src/kadmin/testing/configure.in @@ -1,5 +1,4 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(scripts util) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(scripts util) V5_AC_OUTPUT_MAKEFILE diff --git a/src/kadmin/testing/scripts/ChangeLog b/src/kadmin/testing/scripts/ChangeLog index c21053d49..9133a4a5c 100644 --- a/src/kadmin/testing/scripts/ChangeLog +++ b/src/kadmin/testing/scripts/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sun Feb 9 01:07:37 1997 Tom Yu <tlyu@mit.edu> * env-setup.shin: Fix to deal with multiple variables in diff --git a/src/kadmin/testing/scripts/Makefile.in b/src/kadmin/testing/scripts/Makefile.in index 65e646d7b..fda52fe6e 100644 --- a/src/kadmin/testing/scripts/Makefile.in +++ b/src/kadmin/testing/scripts/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) PERL=@PERL@ .SUFFIXES: .plin .pl diff --git a/src/kadmin/testing/scripts/configure.in b/src/kadmin/testing/scripts/configure.in index 84277a42d..eda5f77df 100644 --- a/src/kadmin/testing/scripts/configure.in +++ b/src/kadmin/testing/scripts/configure.in @@ -7,4 +7,7 @@ RBUILD=`pwd`/../../.. AC_SUBST(RBUILD) dnl The following are substituted into env-setup.sh AC_SUBST(SRCTOP) -V5_AC_OUTPUT_MAKEFILE( ,env-setup.sh:env-setup.shin) +K5_GEN_MAKEFILE(.) +K5_GEN_FILE(env-setup.sh:env-setup.shin) +K5_OUTPUT_FILES + diff --git a/src/kadmin/testing/util/ChangeLog b/src/kadmin/testing/util/ChangeLog index c5d3d4cc5..48b5e6369 100644 --- a/src/kadmin/testing/util/ChangeLog +++ b/src/kadmin/testing/util/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Oct 22 15:40:34 1997 Ezra Peisach <epeisach@dumpster.rose.brandeis.edu> * test.c, tcl_ovsec_kadm.c, tcl_krb5_hash.c, tcl_kadm5.c: Include diff --git a/src/kadmin/testing/util/Makefile.in b/src/kadmin/testing/util/Makefile.in index 6c6cf630b..233fd8b6d 100644 --- a/src/kadmin/testing/util/Makefile.in +++ b/src/kadmin/testing/util/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCL_INCLUDES) PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH) diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog index a4453cad2..02b4088bd 100644 --- a/src/kadmin/v4server/ChangeLog +++ b/src/kadmin/v4server/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Oct 23 13:07:01 1997 Ezra Peisach <epeisach@mit.edu> * kadm_server.h: Declare kadm_context as extern so it will not be diff --git a/src/kadmin/v4server/Makefile.in b/src/kadmin/v4server/Makefile.in index 395d92ea9..2a3106e18 100644 --- a/src/kadmin/v4server/Makefile.in +++ b/src/kadmin/v4server/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) \ -DKADM5 -DNEED_SOCKETS @HESIOD_DEFS@ PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog index b489175de..5c678cfda 100644 --- a/src/kadmin/v4server/unit-test/ChangeLog +++ b/src/kadmin/v4server/unit-test/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sat Feb 22 15:12:17 1997 Ezra Peisach <epeisach@mit.edu> * configure.in: Do not run test suite unless Athena compatibility diff --git a/src/kadmin/v4server/unit-test/Makefile.in b/src/kadmin/v4server/unit-test/Makefile.in index dbb2454da..360ad350b 100644 --- a/src/kadmin/v4server/unit-test/Makefile.in +++ b/src/kadmin/v4server/unit-test/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) # # $Id$ # diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog index aa65ef1d2..c8ad93803 100644 --- a/src/kadmin/v5passwdd/ChangeLog +++ b/src/kadmin/v5passwdd/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Sep 25 21:17:00 1997 Tom Yu <tlyu@mit.edu> * srv_net.c (net_init): Replace KRB5_USE_INET with something more diff --git a/src/kadmin/v5passwdd/Makefile.in b/src/kadmin/v5passwdd/Makefile.in index 9d9a9756b..10f80a01c 100644 --- a/src/kadmin/v5passwdd/Makefile.in +++ b/src/kadmin/v5passwdd/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 95e0eeddd..efb48763d 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Feb 5 19:17:25 1998 Tom Yu <tlyu@mit.edu> * kerberos_v4.c: Move macro definition of klog earlier so that it diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in index b21d7b631..e063becb2 100644 --- a/src/kdc/Makefile.in +++ b/src/kdc/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH) diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 75aadab26..9435ffc9b 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Dec 11 23:30:30 1997 Tom Yu <tlyu@mit.edu> * cnv_tkt_skey.c: diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index 05f991d4f..2a466917f 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) # Copyright 1994 by OpenVision Technologies, Inc. # # Permission to use, copy, modify, distribute, and sell this software diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index 27f5acf3c..5eb39457d 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Nov 19 10:33:19 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (clean-unix): Do not remove libraries here as the diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 9b0fe776a..35b5b4048 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = .. diff --git a/src/lib/configure.in b/src/lib/configure.in index 80c359eb3..3b36dd1cf 100644 --- a/src/lib/configure.in +++ b/src/lib/configure.in @@ -7,8 +7,7 @@ else AC_MSG_RESULT(skipping Kerberos 4 libraries) krb4= fi -CONFIG_DIRS(crypto krb5 des425 $krb4 krb5util kdb gssapi rpc kadm5) +AC_CONFIG_SUBDIRS(crypto krb5 des425 $krb4 krb5util kdb gssapi rpc kadm5) AC_PROG_ARCHIVE AC_PROG_RANLIB -DO_SUBDIRS V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index efeba0dbe..ebc03cb36 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 14 15:34:44 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * Makefile.in: Bump major version due to possible size changes. diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 0cab7cd5c..3e1eaba8c 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/crc32 -I$(srcdir)/des -I$(srcdir)/md4 -I$(srcdir)/md5 -I$(srcdir)/sha ##DOSBUILDTOP = ..\.. diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in index 04d628e18..ba9300cd9 100644 --- a/src/lib/crypto/configure.in +++ b/src/lib/crypto/configure.in @@ -1,6 +1,6 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(des crc32 md4 md5 sha os) +AC_CONFIG_SUBDIRS(des crc32 md4 md5 sha os) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB @@ -119,7 +119,6 @@ dnl else dnl AC_MSG_RESULT(Disabling NIST_SHA) dnl fi -DO_SUBDIRS KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/crypto/crc32/ChangeLog b/src/lib/crypto/crc32/ChangeLog index c903fdd9e..55707c380 100644 --- a/src/lib/crypto/crc32/ChangeLog +++ b/src/lib/crypto/crc32/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sat Feb 22 18:46:38 1997 Richard Basch <basch@lehman.com> * Makefile.in: Move list file construction to win-post.in diff --git a/src/lib/crypto/crc32/Makefile.in b/src/lib/crypto/crc32/Makefile.in index 81bf5d8d5..02379bee5 100644 --- a/src/lib/crypto/crc32/Makefile.in +++ b/src/lib/crypto/crc32/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index 2e816ff6f..848b01264 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Dec 25 20:57:53 1997 Tom Yu <chaoself@mit.edu> * init_rkey.c (mit_des_init_random_key): Punt the struct; use diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index 37bc204ed..3c7df6460 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/crypto/md4/ChangeLog b/src/lib/crypto/md4/ChangeLog index bcac6ed4b..8ee89d5c5 100644 --- a/src/lib/crypto/md4/ChangeLog +++ b/src/lib/crypto/md4/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 16:36:15 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * md4.c: Fix to deal with types longer than 32 bits. diff --git a/src/lib/crypto/md4/Makefile.in b/src/lib/crypto/md4/Makefile.in index fa92b4ccd..9c6cb96ac 100644 --- a/src/lib/crypto/md4/Makefile.in +++ b/src/lib/crypto/md4/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) # -I$(srcdir) is needed to pull in $(srcdir)/rsa-md4.h for ./t_mddriver.c. CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des -I"$(srcdir)" diff --git a/src/lib/crypto/md5/ChangeLog b/src/lib/crypto/md5/ChangeLog index 130adc451..8955638a2 100644 --- a/src/lib/crypto/md5/ChangeLog +++ b/src/lib/crypto/md5/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 16:36:30 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * md5.c: Fix to deal with types longer than 32 bits. diff --git a/src/lib/crypto/md5/Makefile.in b/src/lib/crypto/md5/Makefile.in index 03cc6ff96..267f3ca73 100644 --- a/src/lib/crypto/md5/Makefile.in +++ b/src/lib/crypto/md5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/crypto/os/ChangeLog b/src/lib/crypto/os/ChangeLog index dcdb92300..94d840ae1 100644 --- a/src/lib/crypto/os/ChangeLog +++ b/src/lib/crypto/os/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Nov 28 21:23:42 1997 Tom Yu <tlyu@mit.edu> * configure.in: Add AC_PROG_LN_S to deal with symlinking in diff --git a/src/lib/crypto/os/Makefile.in b/src/lib/crypto/os/Makefile.in index 2ccc99bc1..39da75a86 100644 --- a/src/lib/crypto/os/Makefile.in +++ b/src/lib/crypto/os/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/crypto/sha/ChangeLog b/src/lib/crypto/sha/ChangeLog index 154f7b679..d80dbcc9d 100644 --- a/src/lib/crypto/sha/ChangeLog +++ b/src/lib/crypto/sha/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 16:37:18 1997 Tom Yu <tlyu@voltage-multiplier.mit.edu> * shs.c, sha_glue.c, hmac_sha.c: Fix to deal with LONG wider than diff --git a/src/lib/crypto/sha/Makefile.in b/src/lib/crypto/sha/Makefile.in index 20f2ac906..72276f9e2 100644 --- a/src/lib/crypto/sha/Makefile.in +++ b/src/lib/crypto/sha/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/des425/ChangeLog b/src/lib/des425/ChangeLog index 3951f45bf..ed2228606 100644 --- a/src/lib/des425/ChangeLog +++ b/src/lib/des425/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 23 22:19:39 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> * configure.in: Add AC_PROG_INSTALL since it's need by the install diff --git a/src/lib/des425/Makefile.in b/src/lib/des425/Makefile.in index 64f3a4da4..55e5aeca5 100644 --- a/src/lib/des425/Makefile.in +++ b/src/lib/des425/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV ##DOS##BUILDTOP = ..\.. diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog index 1aad2af77..de21f3867 100644 --- a/src/lib/gssapi/ChangeLog +++ b/src/lib/gssapi/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 16:47:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for all of the subdirectories + and move all of the configure.in tests from the + subdirectories into this configure.in. + Wed Jan 21 19:12:42 1998 Tom Yu <tlyu@mit.edu> * Makefile.in (LIBMINOR): Bump minor version due to internal diff --git a/src/lib/gssapi/Makefile.in b/src/lib/gssapi/Makefile.in index c4e311083..92129e0b7 100644 --- a/src/lib/gssapi/Makefile.in +++ b/src/lib/gssapi/Makefile.in @@ -1,4 +1,7 @@ -##DOSBUILDTOP = ..\.. +thisconfigdir=./ +BUILDTOP=$(U)$(U) +LOCAL_SUBDIRS= generic krb5 + ##DOSLIBNAME=gssapi.lib ##DOSOBJFILELIST=@generic.lst @krb5.lst ##DOSOBJFILEDEP=generic.lst krb5.lst diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in index c0fba38b5..2de487194 100644 --- a/src/lib/gssapi/configure.in +++ b/src/lib/gssapi/configure.in @@ -1,11 +1,20 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(generic krb5) -dnl CONFIG_DIRS(generic krb5 mechglue) +dnl AC_CONFIG_SUBDIRS(generic krb5) +dnl AC_CONFIG_SUBDIRS(generic krb5 mechglue) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD -AC_PROG_RANLIB +AC_PROG_AWK AC_PROG_INSTALL -DO_SUBDIRS +AC_PROG_RANLIB +AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h) +AC_SIZE_T +AC_CHECK_SIZEOF(short) +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(long) +KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS -V5_AC_OUTPUT_MAKEFILE +K5_GEN_MAKEFILE(., lib) +K5_GEN_MAKEFILE(generic, libobj) +K5_GEN_MAKEFILE(krb5, libobj) +K5_OUTPUT_FILES diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog index 3e9021a04..14842021b 100644 --- a/src/lib/gssapi/generic/ChangeLog +++ b/src/lib/gssapi/generic/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jun 27 08:44:54 1997 Theodore Ts'o <tytso@rsts-11.mit.edu> * gssapi.hin: Add definition of GSS_C_NO_NAME (per diff --git a/src/lib/gssapi/generic/Makefile.in b/src/lib/gssapi/generic/Makefile.in index dbe0f8b67..feb41ff66 100644 --- a/src/lib/gssapi/generic/Makefile.in +++ b/src/lib/gssapi/generic/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/gssapi/generic/configure.in b/src/lib/gssapi/generic/configure.in deleted file mode 100644 index f879d41f0..000000000 --- a/src/lib/gssapi/generic/configure.in +++ /dev/null @@ -1,11 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -AC_PROG_INSTALL -AC_PROG_AWK -AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h) -AC_SIZE_T -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long) -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog index 1626ec2cf..899ac007a 100644 --- a/src/lib/gssapi/krb5/ChangeLog +++ b/src/lib/gssapi/krb5/ChangeLog @@ -1,3 +1,12 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Wed Jan 28 16:57:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove use of CopySrcHeader from + configure.in and move functionality to Makefile.in + Thu Feb 5 22:39:44 1998 Theodore Y. Ts'o <tytso@mit.edu> * wrap_size_limit.c (krb5_gss_wrap_size_limit): Fix bug where if diff --git a/src/lib/gssapi/krb5/Makefile.in b/src/lib/gssapi/krb5/Makefile.in index 2a16c7e4d..083529a55 100644 --- a/src/lib/gssapi/krb5/Makefile.in +++ b/src/lib/gssapi/krb5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) -I../generic -I$(srcdir)/../generic ##DOS##BUILDTOP = ..\..\.. @@ -159,6 +161,18 @@ all-windows:: win-include $(SRCS) $(HDRS) all-unix:: $(SRCS) $(HDRS) includes all-unix:: all-libobjs +includes:: gssapi_krb5.h + if cmp $(srcdir)/gssapi_krb5.h \ + $(BUILDTOP)/include/gssapi/gssapi_krb5.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h; \ + $(CP) $(srcdir)/gssapi_krb5.h \ + $(BUILDTOP)/include/gssapi/gssapi_krb5.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/gssapi/gssapi_krb5.h + win-include:: if not exist $(EHDRDIR)\nul mkdir $(EHDRDIR) copy gssapi_krb5.h $(EHDRDIR) diff --git a/src/lib/gssapi/krb5/configure.in b/src/lib/gssapi/krb5/configure.in deleted file mode 100644 index 8de9aa66f..000000000 --- a/src/lib/gssapi/krb5/configure.in +++ /dev/null @@ -1,8 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -AC_PROG_AWK -AC_PROG_INSTALL -AC_CHECK_HEADERS(stdlib.h) -KRB5_BUILD_LIBOBJS -CopySrcHeader(gssapi_krb5.h,[$](BUILDTOP)/include/gssapi) -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/gssapi/mechglue/ChangeLog b/src/lib/gssapi/mechglue/ChangeLog index 35c48afca..b0f08da62 100644 --- a/src/lib/gssapi/mechglue/ChangeLog +++ b/src/lib/gssapi/mechglue/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Feb 5 10:37:00 1996 Richard Basch <basch@lehman.com> * g_accept_sec_context.c g_acquire_cred.c g_compare_name.c diff --git a/src/lib/gssapi/mechglue/Makefile.in b/src/lib/gssapi/mechglue/Makefile.in index ae86a4fa7..33faf8910 100644 --- a/src/lib/gssapi/mechglue/Makefile.in +++ b/src/lib/gssapi/mechglue/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I. -I$(srcdir) ##DOSBUILDTOP = ..\..\.. diff --git a/src/lib/gssapi/mechglue/configure.in b/src/lib/gssapi/mechglue/configure.in deleted file mode 100644 index bd9b4db21..000000000 --- a/src/lib/gssapi/mechglue/configure.in +++ /dev/null @@ -1,26 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -AC_PROG_ARCHIVE -AC_PROG_ARCHIVE_ADD -AC_PROG_RANLIB -AC_PROG_INSTALL -AC_CHECK_HEADERS(stdlib.h) -V5_SHARED_LIB_OBJS -SubdirLibraryRule([${OBJS}]) -CopySrcHeader(mechglue.h,[$(EHDRDIR)]) -AC_CANONICAL_HOST -case $host in - *-*-aix*) # don't build libgssapi.a on AIX - ;; - *) - V5_MAKE_SHARED_LIB(libgssapi,1.0,.., ./mechglue) - AppendRule([install:: libgssapi.[$](LIBEXT) - [$](INSTALL_DATA) libgssapi.[$](LIBEXT) [$](DESTDIR)[$](KRB5_LIBDIR)[$](S)libgssapi.[$](LIBEXT)]) - LinkFileDir([$](TOPLIBD)/libgssapi.[$](LIBEXT),libgssapi.[$](LIBEXT),./gssapi/mechglue) - AppendRule([all:: [$](TOPLIBD)/libgssapi.[$](LIBEXT)]) - - ;; -esac - -V5_AC_OUTPUT_MAKEFILE - diff --git a/src/lib/kadm/ChangeLog b/src/lib/kadm/ChangeLog index 7f3afaed1..fc26f0400 100644 --- a/src/lib/kadm/ChangeLog +++ b/src/lib/kadm/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Wed Jan 28 16:12:42 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Remove use of AppendRule and LinkFileDir + Thu Sep 25 21:30:36 1997 Tom Yu <tlyu@mit.edu> * adm_conn.c (kadm_contact_server): Replace KRB5_USE_INET with diff --git a/src/lib/kadm/Makefile.in b/src/lib/kadm/Makefile.in index 06fcb28d8..d12c9ee7f 100644 --- a/src/lib/kadm/Makefile.in +++ b/src/lib/kadm/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\.. @@ -36,9 +38,12 @@ SRCS= $(srcdir)/adm_conn.c \ # $(srcdir)/adm_kw_dec.c \ # $(srcdir)/adm_kw_enc.c +../libkadm.a: libkadm.a + $(RM) $@ + $(LN) ./kadm/$? $@ all-unix:: $(BASE_OBJS) $(DB_OBJS) $(UNIX_OBJS) -all-unix:: libkadm.a +all-unix:: libkadm.a ../libkadm.a all-mac:: $(BASE_OBJS) $(DB_OBJS) ##DOS##LIBOBJS = $(BASE_OBJS) diff --git a/src/lib/kadm/configure.in b/src/lib/kadm/configure.in index a3d4ab55e..7dabe8aaf 100644 --- a/src/lib/kadm/configure.in +++ b/src/lib/kadm/configure.in @@ -10,7 +10,4 @@ AC_HAVE_FUNCS(srand48 srand srandom syslog openlog closelog) AC_FUNC_CHECK(vsprintf,AC_DEFINE(HAVE_VSPRINTF)) AC_PROG_AWK KRB5_RUN_FLAGS -LinkFileDir(../libkadm.a, libkadm.a, ./kadm) -AppendRule([all-unix:: ../libkadm.a]) -AppendRule([all:: all-$(WHAT)]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog index 230b9cb51..163518ad7 100644 --- a/src/lib/kadm5/ChangeLog +++ b/src/lib/kadm5/ChangeLog @@ -1,3 +1,13 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Wed Jan 28 16:32:36 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove the CopySrcHeader and + CopyHeader macros from configure.in and substitute + equivalent functionality in Makefile.in + Tue Jan 20 23:06:36 1998 Tom Yu <tlyu@mit.edu> * alt_prof.c (kadm5_get_config_params): Add support for Cygnus chpw. diff --git a/src/lib/kadm5/Makefile.in b/src/lib/kadm5/Makefile.in index 8fbb06ed9..ed4fa2782 100644 --- a/src/lib/kadm5/Makefile.in +++ b/src/lib/kadm5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\.. @@ -60,6 +62,30 @@ HDRS = $(HDRDIR)/adb.h \ $(HDRDIR)/chpass_util_strings.h \ $(HDRDIR)/kadm_err.h +BUILD_HDRS = adb_err.h chpass_util_strings.h kadm_err.h +SRC_HDRS = adb.h admin.h admin_internal.h admin_xdr.h kadm_rpc.h \ + server_internal.h + +includes:: $(SRC_HDRS) $(BUILD_HDRS) + mkdir -p $(HDRDIR) + for i in $(SRC_HDRS) ; do \ + if cmp $(srcdir)/$$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $(srcdir)/$$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + for i in $(BUILD_HDRS) ; do \ + if cmp $$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + +clean-unix:: + $(RM) $(HDRS) + all-prerecurse:: includes all-prerecurse:: all-libobjs diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog index e3d65e2dc..9fef2a6e7 100644 --- a/src/lib/kadm5/clnt/ChangeLog +++ b/src/lib/kadm5/clnt/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 28 16:32:36 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove the CopySrcHeader macro + from configure.in and substitute equivalent + functionality in Makefile.in + Mon Oct 13 10:55:02 1997 Ezra Peisach <epeisach@mit.edu> * client_init.c (kadm5_destroy): Free handle->lhandle field, call diff --git a/src/lib/kadm5/clnt/Makefile.in b/src/lib/kadm5/clnt/Makefile.in index e53d5887b..9900ddc23 100644 --- a/src/lib/kadm5/clnt/Makefile.in +++ b/src/lib/kadm5/clnt/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 LIB=kadm5clnt @@ -47,6 +49,18 @@ all-unix:: includes all-unix:: all-liblinks all-windows:: $(OBJS) +includes:: client_internal.h + if cmp $(srcdir)/client_internal.h \ + $(BUILDTOP)/include/kadm5/client_internal.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/kadm5/client_internal.h; \ + $(CP) $(srcdir)/client_internal.h \ + $(BUILDTOP)/include/kadm5/client_internal.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/kadm5/client_internal.h + check-windows:: clean-windows:: diff --git a/src/lib/kadm5/clnt/configure.in b/src/lib/kadm5/clnt/configure.in index d4e973618..7594455be 100644 --- a/src/lib/kadm5/clnt/configure.in +++ b/src/lib/kadm5/clnt/configure.in @@ -6,5 +6,4 @@ AC_PROG_RANLIB AC_PROG_INSTALL KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS -CopySrcHeader(client_internal.h,[$](BUILDTOP)/include/kadm5) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in index f228eebc4..67fb8e759 100644 --- a/src/lib/kadm5/configure.in +++ b/src/lib/kadm5/configure.in @@ -1,7 +1,6 @@ AC_INIT(configure.in) CONFIG_RULES AC_CONFIG_SUBDIRS(clnt srv unit-test) -DO_SUBDIRS AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB @@ -10,16 +9,5 @@ AC_PROG_LEX AC_PROG_AWK AC_CHECK_HEADERS(syslog.h) AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf) -CopySrcHeader(adb.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(admin.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(admin_internal.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(admin_xdr.h,[$](BUILDTOP)/include/kadm5) -dnl CopySrcHeader(client_internal.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(kadm_rpc.h,[$](BUILDTOP)/include/kadm5) -dnl CopySrcHeader(server_acl.h,[$](BUILDTOP)/include/kadm5) -CopySrcHeader(server_internal.h,[$](BUILDTOP)/include/kadm5) -CopyHeader(adb_err.h,[$](BUILDTOP)/include/kadm5) -CopyHeader(chpass_util_strings.h,[$](BUILDTOP)/include/kadm5) -CopyHeader(kadm_err.h,[$](BUILDTOP)/include/kadm5) KRB5_BUILD_LIBOBJS V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog index afd953d5a..4fb1c9f95 100644 --- a/src/lib/kadm5/srv/ChangeLog +++ b/src/lib/kadm5/srv/ChangeLog @@ -1,3 +1,9 @@ +Wed Jan 28 16:32:36 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove the CopySrcHeader macro + from configure.in and substitute equivalent + functionality in Makefile.in + Mon Oct 13 10:59:22 1997 Ezra Peisach <epeisach@mit.edu> * server_init.c (kadm5_destroy): Call kadm5_free_config_params. diff --git a/src/lib/kadm5/srv/Makefile.in b/src/lib/kadm5/srv/Makefile.in index cf53feff6..1b04cd4a0 100644 --- a/src/lib/kadm5/srv/Makefile.in +++ b/src/lib/kadm5/srv/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -I$(BUILDTOP)/include/kadm5 @HESIOD_DEFS@ ##DOSBUILDTOP = ..\..\.. @@ -67,6 +69,18 @@ all-unix:: includes all-unix:: all-liblinks all-windows:: $(OBJS) +includes:: server_acl.h + if cmp $(srcdir)/server_acl.h \ + $(BUILDTOP)/include/kadm5/server_acl.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/kadm5/server_acl.h; \ + $(CP) $(srcdir)/server_acl.h \ + $(BUILDTOP)/include/kadm5/server_acl.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/kadm5/server_acl.h + check-windows:: clean-mac:: diff --git a/src/lib/kadm5/srv/configure.in b/src/lib/kadm5/srv/configure.in index b0c69ddf5..6730797a8 100644 --- a/src/lib/kadm5/srv/configure.in +++ b/src/lib/kadm5/srv/configure.in @@ -28,6 +28,4 @@ esac KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS - -CopySrcHeader(server_acl.h,[$](BUILDTOP)/include/kadm5) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/kadm5/unit-test/ChangeLog b/src/lib/kadm5/unit-test/ChangeLog index 3f9b54e26..659b2bcdd 100644 --- a/src/lib/kadm5/unit-test/ChangeLog +++ b/src/lib/kadm5/unit-test/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Nov 19 10:55:20 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (clean): Remove server-setkey-test diff --git a/src/lib/kadm5/unit-test/Makefile.in b/src/lib/kadm5/unit-test/Makefile.in index 96289f896..903013948 100644 --- a/src/lib/kadm5/unit-test/Makefile.in +++ b/src/lib/kadm5/unit-test/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_KADM5_API_VERSION=1 PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 4923b70bf..bea687a75 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 10:18:10 1997 Ezra Peisach <epeisach@mit.edu> * kdb_cpw.c (add_key_pwd): For KRB5_KDB_SALTTYPE_AFS3, the salt diff --git a/src/lib/kdb/Makefile.in b/src/lib/kdb/Makefile.in index 370aa428e..113c319b8 100644 --- a/src/lib/kdb/Makefile.in +++ b/src/lib/kdb/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) KRB5_RUN_ENV = @KRB5_RUN_ENV@ KRB5_CONFIG_SETUP = KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf ; export KRB5_CONFIG ; diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 04a313360..878169140 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in, Makefile.in: Remove use of CopyHeader from + configure.in and move functionality to Makefile.in + Tue Jan 6 17:11:28 1998 Tom Yu <tlyu@mit.edu> * in_tkt.c: Conditionalize use of macro do_seteuid, rather than diff --git a/src/lib/krb4/Makefile.in b/src/lib/krb4/Makefile.in index 5a4fc7864..410cca960 100644 --- a/src/lib/krb4/Makefile.in +++ b/src/lib/krb4/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(DEFINES) DEFINES=-I$(srcdir)/../../include/kerberosIV @@ -195,6 +197,18 @@ krb_err.c: krb_err.et depend:: krb_err.h depend:: $(CODE) +includes:: krb_err.h + if cmp /krb_err.h $(EHDRDIR)/krb_err.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(EHDRDIR)/krb_err.h; \ + $(CP) krb_err.h $(EHDRDIR)/krb_err.h) ; \ + fi + +clean-unix:: + $(RM) $(EHDRDIR)/krb_err.h + + + #install-unix:: # $(INSTALL_DATA) krb_err.h $(DESTDIR)$(KRB5_INCDIR)/kerberosIV/krb_err.h diff --git a/src/lib/krb4/configure.in b/src/lib/krb4/configure.in index 10acfeda6..b79215db9 100644 --- a/src/lib/krb4/configure.in +++ b/src/lib/krb4/configure.in @@ -41,7 +41,6 @@ fi AC_DEFINE(KRB4_USE_KEYTAB) AC_HAVE_FUNCS(strsave seteuid setreuid setresuid) AC_PROG_AWK -CopyHeader(krb_err.h,$(EHDRDIR)) KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog index d7a189a95..acf26ac4c 100644 --- a/src/lib/krb5/ChangeLog +++ b/src/lib/krb5/ChangeLog @@ -1,3 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Use AC_CONFIG_DIRS instead of CONFIG_DIRS, and + remove use of DO_SUBDIRS. + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jul 25 15:24:41 1997 Tom Yu <tlyu@mit.edu> * Makefile.in: Bump version due to et changes. diff --git a/src/lib/krb5/Makefile.in b/src/lib/krb5/Makefile.in index aecf5b8ae..fa6761a26 100644 --- a/src/lib/krb5/Makefile.in +++ b/src/lib/krb5/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) ##DOSBUILDTOP = ..\.. ##DOSLIBNAME=krb5.lib ##DOSOBJFILEDEP=asn1.lst ccache.lst err_tbls.lst free.lst keytab.lst krb.lst os.lst posix.lst rcache.lst diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index f018642ac..63c9715fb 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 2 21:18:30 1998 Tom Yu <tlyu@mit.edu> * asn1buf.c (asn12krb5_buf): Check return value of diff --git a/src/lib/krb5/asn.1/Makefile.in b/src/lib/krb5/asn.1/Makefile.in index 7c06c62c4..a03e0372c 100644 --- a/src/lib/krb5/asn.1/Makefile.in +++ b/src/lib/krb5/asn.1/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS=$(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index 0ca88f34f..226323f27 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,11 @@ +Wed Feb 11 22:56:49 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for all of the subdirectories + and move all of the configure.in tests from the + subdirectories into this configure.in. + Sat Dec 6 02:26:16 1997 Tom Yu <tlyu@mit.edu> * Makefile.in: Add cccopy.c. diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in index d8824ebfb..18cbc53b9 100644 --- a/src/lib/krb5/ccache/Makefile.in +++ b/src/lib/krb5/ccache/Makefile.in @@ -1,3 +1,7 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) +LOCAL_SUBDIRS = stdio file memory + CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)$(S)file -I$(srcdir)$(S)stdio ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in index f38d5062f..2807b7400 100644 --- a/src/lib/krb5/ccache/configure.in +++ b/src/lib/krb5/ccache/configure.in @@ -1,6 +1,10 @@ -AC_INIT(configure.in) +AC_INIT(ccbase.c) CONFIG_RULES -CONFIG_DIRS(stdio file memory) -DO_SUBDIRS +AC_HAVE_HEADERS(unistd.h) +AC_HAVE_FUNCS(flock fchmod chmod) KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE +K5_GEN_MAKEFILE(., libobj) +K5_GEN_MAKEFILE(stdio, libobj) +K5_GEN_MAKEFILE(file, libobj) +K5_GEN_MAKEFILE(memory, libobj) +K5_OUTPUT_FILES diff --git a/src/lib/krb5/ccache/file/ChangeLog b/src/lib/krb5/ccache/file/ChangeLog index 7d8b7ce15..105579e6d 100644 --- a/src/lib/krb5/ccache/file/ChangeLog +++ b/src/lib/krb5/ccache/file/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Sep 25 21:23:11 1997 Tom Yu <tlyu@mit.edu> * fcc_maybe.c: Replace KRB5_USE_INET with something more sane. diff --git a/src/lib/krb5/ccache/file/Makefile.in b/src/lib/krb5/ccache/file/Makefile.in index 3def8f1ec..86be7027f 100644 --- a/src/lib/krb5/ccache/file/Makefile.in +++ b/src/lib/krb5/ccache/file/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\..\.. diff --git a/src/lib/krb5/ccache/file/configure.in b/src/lib/krb5/ccache/file/configure.in deleted file mode 100644 index bbd406da6..000000000 --- a/src/lib/krb5/ccache/file/configure.in +++ /dev/null @@ -1,7 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -AC_HAVE_HEADERS(unistd.h) -AC_FUNC_CHECK(flock,AC_DEFINE(HAVE_FLOCK)) -AC_HAVE_FUNCS(fchmod chmod) -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/memory/ChangeLog b/src/lib/krb5/ccache/memory/ChangeLog index 064474728..523983a02 100644 --- a/src/lib/krb5/ccache/memory/ChangeLog +++ b/src/lib/krb5/ccache/memory/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Mon Sep 15 15:15:33 1997 Ezra Peisach <epeisach@mit.edu> * mcc-proto.h, mcc_reslv.c (krb5_mcc_resolve): Incoming name diff --git a/src/lib/krb5/ccache/memory/Makefile.in b/src/lib/krb5/ccache/memory/Makefile.in index 41694a02a..7f5bea619 100644 --- a/src/lib/krb5/ccache/memory/Makefile.in +++ b/src/lib/krb5/ccache/memory/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\..\.. diff --git a/src/lib/krb5/ccache/memory/configure.in b/src/lib/krb5/ccache/memory/configure.in deleted file mode 100644 index 106deb0dd..000000000 --- a/src/lib/krb5/ccache/memory/configure.in +++ /dev/null @@ -1,4 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/ccache/stdio/ChangeLog b/src/lib/krb5/ccache/stdio/ChangeLog index f8351fb8d..13739ebfb 100644 --- a/src/lib/krb5/ccache/stdio/ChangeLog +++ b/src/lib/krb5/ccache/stdio/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Oct 29 15:57:31 1997 Theodore Y. Ts'o <tytso@mit.edu> * scc_maybe.c: Added kludge for the Macintosh, since fopen() diff --git a/src/lib/krb5/ccache/stdio/Makefile.in b/src/lib/krb5/ccache/stdio/Makefile.in index 7ae76451e..d2eeab859 100644 --- a/src/lib/krb5/ccache/stdio/Makefile.in +++ b/src/lib/krb5/ccache/stdio/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) STLIBOBJS = \ diff --git a/src/lib/krb5/ccache/stdio/configure.in b/src/lib/krb5/ccache/stdio/configure.in deleted file mode 100644 index 106deb0dd..000000000 --- a/src/lib/krb5/ccache/stdio/configure.in +++ /dev/null @@ -1,4 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in index eeb2b8a0f..245746fa8 100644 --- a/src/lib/krb5/configure.in +++ b/src/lib/krb5/configure.in @@ -1,8 +1,7 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(error_tables asn.1 ccache keytab krb rcache free os posix) +AC_CONFIG_SUBDIRS(error_tables asn.1 ccache keytab krb rcache free os posix) AC_PROG_INSTALL -DO_SUBDIRS dnl USE_ANAME ANAME_DBDEP="$kaname_dbdep" diff --git a/src/lib/krb5/error_tables/ChangeLog b/src/lib/krb5/error_tables/ChangeLog index a3d187665..6fd14ef79 100644 --- a/src/lib/krb5/error_tables/ChangeLog +++ b/src/lib/krb5/error_tables/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Feb 5 22:58:09 1998 Theodore Y. Ts'o <tytso@mit.edu> * krb5_err.et: Add a comment about the low 128 error codes being diff --git a/src/lib/krb5/error_tables/Makefile.in b/src/lib/krb5/error_tables/Makefile.in index c17991fa9..9a5096741 100644 --- a/src/lib/krb5/error_tables/Makefile.in +++ b/src/lib/krb5/error_tables/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/free/ChangeLog b/src/lib/krb5/free/ChangeLog index ec0dcb41c..6c7daec5d 100644 --- a/src/lib/krb5/free/ChangeLog +++ b/src/lib/krb5/free/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sat Feb 22 22:26:56 1997 Richard Basch <basch@lehman.com> * Makefile.in: Use some of the new library list build rules in diff --git a/src/lib/krb5/free/Makefile.in b/src/lib/krb5/free/Makefile.in index 3f0eb099a..7aa0bec02 100644 --- a/src/lib/krb5/free/Makefile.in +++ b/src/lib/krb5/free/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/keytab/ChangeLog b/src/lib/krb5/keytab/ChangeLog index d5b1a876c..4e627f3f7 100644 --- a/src/lib/krb5/keytab/ChangeLog +++ b/src/lib/krb5/keytab/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 16:47:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for the file subdirectory + and move all of the configure.in tests from in the + subdirectory into this configure.in. + Thu Nov 21 11:55:16 EST 1996 Richard Basch <basch@lehman.com> * Makefile.in: win32 build diff --git a/src/lib/krb5/keytab/Makefile.in b/src/lib/krb5/keytab/Makefile.in index 336394e88..8dda51c5e 100644 --- a/src/lib/krb5/keytab/Makefile.in +++ b/src/lib/krb5/keytab/Makefile.in @@ -1,3 +1,7 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) +LOCAL_SUBDIRS = file + CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/keytab/configure.in b/src/lib/krb5/keytab/configure.in index 88579b5b1..fbc2e544f 100644 --- a/src/lib/krb5/keytab/configure.in +++ b/src/lib/krb5/keytab/configure.in @@ -1,6 +1,7 @@ AC_INIT(configure.in) CONFIG_RULES -CONFIG_DIRS(file) -DO_SUBDIRS KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE +K5_GEN_MAKEFILE(., libobj) +K5_GEN_MAKEFILE(file, libobj) +K5_OUTPUT_FILES + diff --git a/src/lib/krb5/keytab/db/ChangeLog b/src/lib/krb5/keytab/db/ChangeLog new file mode 100644 index 000000000..78d6801f0 --- /dev/null +++ b/src/lib/krb5/keytab/db/ChangeLog @@ -0,0 +1,10 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Mon Feb 2 17:05:10 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in: Remove SubDirLibrary rules (we will need to fix + this directory when we decide to build it again.) + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile diff --git a/src/lib/krb5/keytab/db/Makefile.in b/src/lib/krb5/keytab/db/Makefile.in index ded3ff546..78c4addf0 100644 --- a/src/lib/krb5/keytab/db/Makefile.in +++ b/src/lib/krb5/keytab/db/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\..\..\.. diff --git a/src/lib/krb5/keytab/db/configure.in b/src/lib/krb5/keytab/db/configure.in index 7eff1bc8b..b643c05fe 100644 --- a/src/lib/krb5/keytab/db/configure.in +++ b/src/lib/krb5/keytab/db/configure.in @@ -1,5 +1,9 @@ AC_INIT(configure.in) CONFIG_RULES -V5_SHARED_LIB_OBJS -SubdirLibraryRule([${OBJS}]) +dnl +dnl We're currently not building this directory, and the shared library +dnl calls needs to be redone if/when we include this. +dnl +dnl V5_SHARED_LIB_OBJS +dnl SubdirLibraryRule([${OBJS}]) V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/keytab/file/ChangeLog b/src/lib/krb5/keytab/file/ChangeLog index 6e40e9bf7..edcfebcc8 100644 --- a/src/lib/krb5/keytab/file/ChangeLog +++ b/src/lib/krb5/keytab/file/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:03:20 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 28 10:53:10 1997 Ezra Peisach <epeisach@kangaroo.mit.edu> * ktf_wreslv.c, ktf_resolv.c:Initialize version element of diff --git a/src/lib/krb5/keytab/file/Makefile.in b/src/lib/krb5/keytab/file/Makefile.in index a4362ba42..39e909cd2 100644 --- a/src/lib/krb5/keytab/file/Makefile.in +++ b/src/lib/krb5/keytab/file/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\..\.. diff --git a/src/lib/krb5/keytab/file/configure.in b/src/lib/krb5/keytab/file/configure.in deleted file mode 100644 index 106deb0dd..000000000 --- a/src/lib/krb5/keytab/file/configure.in +++ /dev/null @@ -1,4 +0,0 @@ -AC_INIT(configure.in) -CONFIG_RULES -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog index 0a99bfa2b..957ba4397 100644 --- a/src/lib/krb5/krb/ChangeLog +++ b/src/lib/krb5/krb/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Feb 5 23:48:34 1998 Theodore Y. Ts'o <tytso@mit.edu> * rd_cred.c (krb5_rd_cred): diff --git a/src/lib/krb5/krb/Makefile.in b/src/lib/krb5/krb/Makefile.in index 87f93ea19..41cc0a8b2 100644 --- a/src/lib/krb5/krb/Makefile.in +++ b/src/lib/krb5/krb/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index e95b95eb3..0a0e7bb20 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:19 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 30 15:56:15 1998 Tom Yu <tlyu@mit.edu> * changepw.c (krb5_change_password): KRB5_USE_INET -> diff --git a/src/lib/krb5/os/Makefile.in b/src/lib/krb5/os/Makefile.in index aeea59e76..61c6ded8b 100644 --- a/src/lib/krb5/os/Makefile.in +++ b/src/lib/krb5/os/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) KRB5_RUN_ENV = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog index c60660f16..b0f7edb47 100644 --- a/src/lib/krb5/posix/ChangeLog +++ b/src/lib/krb5/posix/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:02:00 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Sep 18 17:56:29 1997 Tom Yu <tlyu@mit.edu> * strcasecmp.c: Replace USE_STRING_H with something more sane. diff --git a/src/lib/krb5/posix/Makefile.in b/src/lib/krb5/posix/Makefile.in index 0859caa9d..d81d0fbd8 100644 --- a/src/lib/krb5/posix/Makefile.in +++ b/src/lib/krb5/posix/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5/rcache/ChangeLog b/src/lib/krb5/rcache/ChangeLog index 5a17d8ec4..e63a9e2c1 100644 --- a/src/lib/krb5/rcache/ChangeLog +++ b/src/lib/krb5/rcache/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:01:50 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Sep 25 21:28:41 1997 Tom Yu <tlyu@mit.edu> * rc_io.c: Replace KRB5_USE_INET with something more sane. diff --git a/src/lib/krb5/rcache/Makefile.in b/src/lib/krb5/rcache/Makefile.in index efcf3e4fd..21170a062 100644 --- a/src/lib/krb5/rcache/Makefile.in +++ b/src/lib/krb5/rcache/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOS##BUILDTOP = ..\..\.. diff --git a/src/lib/krb5util/ChangeLog b/src/lib/krb5util/ChangeLog index 1666316bf..914f76b28 100644 --- a/src/lib/krb5util/ChangeLog +++ b/src/lib/krb5util/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 17:01:22 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Jan 6 16:51:44 1998 Tom Yu <tlyu@mit.edu> * seteuid.c (krb5_seteuid): Don't check for _POSIX_SAVED_IDS, as diff --git a/src/lib/krb5util/Makefile.in b/src/lib/krb5util/Makefile.in index ecab50032..26ba3150e 100644 --- a/src/lib/krb5util/Makefile.in +++ b/src/lib/krb5util/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) ##DOSBUILDTOP = ..\.. diff --git a/src/lib/rpc/ChangeLog b/src/lib/rpc/ChangeLog index 8c200ef70..75e23af1d 100644 --- a/src/lib/rpc/ChangeLog +++ b/src/lib/rpc/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 17:00:16 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in, Makefile.in: Remove CopySrcHeader and CopyHeader + from configure.in and move equivalent functionality to + Makefile.in + Wed Jan 21 15:06:00 1998 Ezra Peisach <epeisach@mit.edu> * bindresvport.c: Include string.h for memset prototype. diff --git a/src/lib/rpc/Makefile.in b/src/lib/rpc/Makefile.in index 9a61ebd49..bf0ffff75 100644 --- a/src/lib/rpc/Makefile.in +++ b/src/lib/rpc/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 ##DOSBUILDTOP = ..\.. @@ -178,6 +180,34 @@ all-windows:: $(OBJS) install-unix:: install-libs +BUILD_HDRS = types.h +SRC_HDRS = auth.h auth_gssapi.h auth_unix.h clnt.h netdb.h pmap_clnt.h \ + pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h svc.h svc_auth.h \ + xdr.h + +includes:: $(SRC_HDRS) $(BUILD_HDRS) + mkdir -p $(HDRDIR) + for i in $(SRC_HDRS) ; do \ + if cmp $(srcdir)/$$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $(srcdir)/$$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + for i in $(BUILD_HDRS) ; do \ + if cmp $$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + +clean-unix:: + $(RM) $(HDRS) + for i in $(SRC_HDRS) $(BUILD_HDRS) ; do \ + $(RM) $(HDRDIR)/$$i ; \ + done + check-windows:: clean-unix:: clean-liblinks clean-libs clean-libobjs diff --git a/src/lib/rpc/configure.in b/src/lib/rpc/configure.in index 87130bf74..d89148ea1 100644 --- a/src/lib/rpc/configure.in +++ b/src/lib/rpc/configure.in @@ -1,7 +1,6 @@ AC_INIT(auth_gssapi.c) CONFIG_RULES -CONFIG_DIRS(unit-test) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(unit-test) AC_PROG_ARCHIVE AC_PROG_ARCHIVE_ADD AC_PROG_RANLIB @@ -71,24 +70,9 @@ extern void endrpcent();], [int i;], k5_cv_type_endrpcent=void, k5_cv_type_endrpcent=int)])dnl AC_MSG_RESULT($k5_cv_type_endrpcent) AC_DEFINE_UNQUOTED(ENDRPCENT_TYPE, $k5_cv_type_endrpcent) - DECLARE_SYS_ERRLIST - -CopySrcHeader(auth.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(auth_gssapi.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(auth_unix.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(clnt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(netdb.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_clnt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_prot.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(pmap_rmt.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(rpc.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(rpc_msg.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(svc.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(svc_auth.h,[$](BUILDTOP)/include/rpc) -CopyHeader(types.h,[$](BUILDTOP)/include/rpc) -CopySrcHeader(xdr.h,[$](BUILDTOP)/include/rpc) - KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY_WITH_DEPS -V5_AC_OUTPUT_MAKEFILE( ,types.h:types.hin) +K5_GEN_MAKEFILE(., lib libobj) +K5_GEN_FILE(types.h:types.hin) +K5_OUTPUT_FILES diff --git a/src/lib/rpc/unit-test/ChangeLog b/src/lib/rpc/unit-test/ChangeLog index 62225f225..2d7a2beb2 100644 --- a/src/lib/rpc/unit-test/ChangeLog +++ b/src/lib/rpc/unit-test/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:59:48 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Thu Oct 9 20:58:35 1997 Tom Yu <tlyu@mit.edu> * configure.in, Makefile.in: Add test to disable udp test under diff --git a/src/lib/rpc/unit-test/Makefile.in b/src/lib/rpc/unit-test/Makefile.in index 95cf25206..ec2ad9e6f 100644 --- a/src/lib/rpc/unit-test/Makefile.in +++ b/src/lib/rpc/unit-test/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I. PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog index e1a72be80..dcb4e6dc2 100644 --- a/src/slave/ChangeLog +++ b/src/slave/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:59:30 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Jan 21 15:18:24 1998 Ezra Peisach <epeisach@mit.edu> * kprop.c, kpropd.c (main): returns int, not void. ANSI X3.159-1989 diff --git a/src/slave/Makefile.in b/src/slave/Makefile.in index e14e92138..dc07e3a8c 100644 --- a/src/slave/Makefile.in +++ b/src/slave/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/tests/ChangeLog b/src/tests/ChangeLog index eecbbff61..4fa0b1279 100644 --- a/src/tests/ChangeLog +++ b/src/tests/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 16:47:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in: Create the makefiles for all of the subdirectories + and move all of the configure.in tests from the + subdirectories into this configure.in. + Wed Nov 19 10:54:01 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (kdb_check): Remove temporary file generated during test. diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index 9a5bca5f8..944288406 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -1,3 +1,7 @@ +thisconfigdir=./ +BUILDTOP=$(U) +LOCAL_SUBDIRS = resolve asn.1 create hammer verify gssapi dejagnu + CFLAGS = $(CCOPTS) RUN_SETUP = @KRB5_RUN_ENV@ KRB5_KDC_PROFILE=kdc.conf KRB5_CONFIG=$(SRCTOP)/config-files/krb5.conf KRB5_RUN_ENV= @KRB5_RUN_ENV@ diff --git a/src/tests/asn.1/ChangeLog b/src/tests/asn.1/ChangeLog index ca980084b..54f988a24 100644 --- a/src/tests/asn.1/ChangeLog +++ b/src/tests/asn.1/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:46:31 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sun Aug 17 14:26:19 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (SRCS): Add $(srcdir). diff --git a/src/tests/asn.1/Makefile.in b/src/tests/asn.1/Makefile.in index 0c5b93ab2..efaa54aa1 100644 --- a/src/tests/asn.1/Makefile.in +++ b/src/tests/asn.1/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/tests/asn.1/configure.in b/src/tests/asn.1/configure.in deleted file mode 100644 index e75a82c7c..000000000 --- a/src/tests/asn.1/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(krb5_encode_test.c) -CONFIG_RULES -KRB5_RUN_FLAGS -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/configure.in b/src/tests/configure.in index 258b17141..ea62f3ee0 100644 --- a/src/tests/configure.in +++ b/src/tests/configure.in @@ -1,6 +1,22 @@ AC_INIT(configure.in) CONFIG_RULES KRB5_RUN_FLAGS -CONFIG_DIRS(resolve asn.1 create hammer verify gssapi dejagnu) -DO_SUBDIRS -V5_AC_OUTPUT_MAKEFILE +KRB5_BUILD_PROGRAM +AC_HEADER_STDC +AC_CHECK_FUNCS(strchr) +AC_CHECK_HEADERS(unistd.h stdlib.h sys/param.h sys/socket.h) +AC_CONST +AC_PROG_INSTALL +AC_CHECK_PROG(RUNTEST,runtest,runtest) +AC_RETSIGTYPE +CHECK_SIGNALS +K5_GEN_MAKEFILE(.) +K5_GEN_MAKEFILE(resolve) +K5_GEN_MAKEFILE(asn.1) +K5_GEN_MAKEFILE(create) +K5_GEN_MAKEFILE(hammer) +K5_GEN_MAKEFILE(verify) +K5_GEN_MAKEFILE(gssapi) +K5_GEN_MAKEFILE(dejagnu) +K5_OUTPUT_FILES + diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog index 86f6e3a73..1ffc4911d 100644 --- a/src/tests/create/ChangeLog +++ b/src/tests/create/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:46:04 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sun Aug 17 14:26:57 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (SRCS): Add $(SRCS) line. diff --git a/src/tests/create/Makefile.in b/src/tests/create/Makefile.in index 72773527c..256a2a8b5 100644 --- a/src/tests/create/Makefile.in +++ b/src/tests/create/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in deleted file mode 100644 index 2f106fc98..000000000 --- a/src/tests/create/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(kdb5_mkdums.c) -CONFIG_RULES -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/dejagnu/ChangeLog b/src/tests/dejagnu/ChangeLog index a0e52c43b..32abbbd0a 100644 --- a/src/tests/dejagnu/ChangeLog +++ b/src/tests/dejagnu/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:45:49 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 7 08:02:13 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (runenv.vars): Use tr to remove newlines in multiple diff --git a/src/tests/dejagnu/Makefile.in b/src/tests/dejagnu/Makefile.in index 6a75a5f4e..decd46265 100644 --- a/src/tests/dejagnu/Makefile.in +++ b/src/tests/dejagnu/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) HAVE_RUNTEST = @RUNTEST@ RUNTESTFLAGS = KRB5_RUN_ENV= @KRB5_RUN_ENV@ diff --git a/src/tests/dejagnu/configure.in b/src/tests/dejagnu/configure.in deleted file mode 100644 index bdf362182..000000000 --- a/src/tests/dejagnu/configure.in +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(Makefile.in) -CONFIG_RULES -AC_PROG_INSTALL -AC_CHECK_PROG(RUNTEST,runtest,runtest) -AC_RETSIGTYPE -CHECK_SIGNALS -KRB5_RUN_FLAGS -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/gssapi/ChangeLog b/src/tests/gssapi/ChangeLog index bfdbc51ea..be6b3b71b 100644 --- a/src/tests/gssapi/ChangeLog +++ b/src/tests/gssapi/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:45:28 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sun Feb 9 01:40:15 1997 Tom Yu <tlyu@mit.edu> * Makefile.in: diff --git a/src/tests/gssapi/Makefile.in b/src/tests/gssapi/Makefile.in index 6e75130e9..ec48ab976 100644 --- a/src/tests/gssapi/Makefile.in +++ b/src/tests/gssapi/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -DUSE_AUTOCONF_H PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/tests/gssapi/configure.in b/src/tests/gssapi/configure.in deleted file mode 100644 index 45cdb51c4..000000000 --- a/src/tests/gssapi/configure.in +++ /dev/null @@ -1,8 +0,0 @@ -AC_INIT(t_imp_name.c) -CONFIG_RULES -AC_CHECK_HEADERS(unistd.h stdlib.h) -AC_CHECK_HEADER(string.h,AC_DEFINE(USE_STRING_H)) -AC_CONST -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/hammer/ChangeLog b/src/tests/hammer/ChangeLog index 865c25f5d..f39421f30 100644 --- a/src/tests/hammer/ChangeLog +++ b/src/tests/hammer/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:45:05 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sun Aug 17 14:26:57 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (SRCS): Add $(SRCS) line. diff --git a/src/tests/hammer/Makefile.in b/src/tests/hammer/Makefile.in index f4afeebbc..d6317dd68 100644 --- a/src/tests/hammer/Makefile.in +++ b/src/tests/hammer/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/tests/hammer/configure.in b/src/tests/hammer/configure.in deleted file mode 100644 index ee62c087a..000000000 --- a/src/tests/hammer/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(kdc5_hammer.c) -CONFIG_RULES -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/resolve/ChangeLog b/src/tests/resolve/ChangeLog index ba8cc14d1..6af715a76 100644 --- a/src/tests/resolve/ChangeLog +++ b/src/tests/resolve/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:44:41 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Wed Feb 26 23:12:24 1997 Tom Yu <tlyu@mit.edu> * Makefile.in: Add $(LIBS) so that compile doesn't blow out under diff --git a/src/tests/resolve/Makefile.in b/src/tests/resolve/Makefile.in index d9f6b34a6..33a9c45db 100644 --- a/src/tests/resolve/Makefile.in +++ b/src/tests/resolve/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDES) RUN_SETUP = @KRB5_RUN_ENV@ PROG_LIBPATH=-L$(TOPLIBD) diff --git a/src/tests/resolve/configure.in b/src/tests/resolve/configure.in deleted file mode 100644 index 5a6f90db4..000000000 --- a/src/tests/resolve/configure.in +++ /dev/null @@ -1,8 +0,0 @@ -AC_INIT(resolve.c) -CONFIG_RULES -AC_HEADER_STDC -AC_CHECK_FUNCS(strchr) -AC_CHECK_HEADERS(sys/param.h sys/socket.h) -KRB5_RUN_FLAGS -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/tests/verify/ChangeLog b/src/tests/verify/ChangeLog index deee45301..560645cfd 100644 --- a/src/tests/verify/ChangeLog +++ b/src/tests/verify/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 2 16:44:21 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sun Aug 17 14:26:57 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (SRCS): Add $(SRCS) line. diff --git a/src/tests/verify/Makefile.in b/src/tests/verify/Makefile.in index afc353938..32e22fc54 100644 --- a/src/tests/verify/Makefile.in +++ b/src/tests/verify/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./../ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) diff --git a/src/tests/verify/configure.in b/src/tests/verify/configure.in deleted file mode 100644 index 711a78b60..000000000 --- a/src/tests/verify/configure.in +++ /dev/null @@ -1,5 +0,0 @@ -AC_INIT(kdb5_verify.c) -CONFIG_RULES -AC_PROG_INSTALL -KRB5_BUILD_PROGRAM -V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/ChangeLog b/src/util/ChangeLog index 1d4f93a1a..2d3fead10 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,12 @@ +Mon Feb 2 16:16:45 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + +Wed Jan 28 17:26:46 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove conditional AppendRule only + for AIX, and make it happen all the time in Makefile.in + Wed Nov 19 10:52:38 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (clean-unix): Remove db lib symlinks. diff --git a/src/util/Makefile.in b/src/util/Makefile.in index 90b48a8d7..139228d54 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U) CFLAGS = $(CCOPTS) MAC_SUBDIRS = profile et @@ -45,6 +47,12 @@ makeshlib: $(srcdir)/makeshlib.sh Makefile $(RM) $@ $@.tmp $(SLIBSH) $(srcdir)/makeshlib.sh >$@.tmp&&chmod a+x $@.tmp&&mv $@.tmp $@ + +# +# We only need this for AIX, but we generate it for all systems. +# +all-unix:: aix.bincmds + aix.bincmds: Makefile echo libpath $(KRB5_LIBDIR):`pwd`/$(TOPLIBD):/usr/lib:/lib >aix.bincmds clean:: diff --git a/src/util/autoconf/autoconf.info b/src/util/autoconf/autoconf.info index 1d35d50cb..433c6ca77 100644 --- a/src/util/autoconf/autoconf.info +++ b/src/util/autoconf/autoconf.info @@ -1,4 +1,4 @@ -This is Info file autoconf.info, produced by Makeinfo-1.55 from the +This is Info file autoconf.info, produced by Makeinfo-1.64 from the input file ./autoconf.texi. START-INFO-DIR-ENTRY @@ -3101,7 +3101,7 @@ automatically. Notify the user of an error that prevents `configure' from completing. This macro prints an error message on the standard error output and exits `configure' with a nonzero status. - eRROR-DESCRIPTION should be something like `invalid value $HOME + ERROR-DESCRIPTION should be something like `invalid value $HOME for \$HOME'. - Macro: AC_MSG_WARN (PROBLEM-DESCRIPTION) @@ -3338,7 +3338,7 @@ it is considered obsolete. - Macro: AC_PROVIDE (THIS-MACRO-NAME) Record the fact that THIS-MACRO-NAME has been called. - tHIS-MACRO-NAME should be the name of the macro that is calling + THIS-MACRO-NAME should be the name of the macro that is calling `AC_PROVIDE'. An easy way to get it is from the `m4' builtin variable `$0', like this: @@ -5053,12 +5053,12 @@ Autoconf checks. * Menu: -* AC_MACRODIR: Invoking autoupdate. +* AC_MACRODIR <1>: Invoking autoupdate. +* AC_MACRODIR <2>: Invoking autoheader. +* AC_MACRODIR <3>: Invoking autoreconf. +* AC_MACRODIR <4>: Invoking autoconf. +* AC_MACRODIR <5>: Invoking ifnames. * AC_MACRODIR: Invoking autoscan. -* AC_MACRODIR: Invoking autoreconf. -* AC_MACRODIR: Invoking ifnames. -* AC_MACRODIR: Invoking autoheader. -* AC_MACRODIR: Invoking autoconf. * CONFIG_FILES: Invoking config.status. * CONFIG_HEADERS: Invoking config.status. * CONFIG_SHELL: Invoking config.status. @@ -5087,18 +5087,17 @@ how this is done. * build_cpu: System Type Variables. * build_os: System Type Variables. * build_vendor: System Type Variables. +* CC <1>: UNIX Variants. * CC: Particular Programs. -* CC: UNIX Variants. -* CC: Particular Programs. +* CFLAGS <1>: Particular Programs. * CFLAGS: Preset Output Variables. -* CFLAGS: Particular Programs. * configure_input: Preset Output Variables. * CPP: Particular Programs. * CPPFLAGS: Preset Output Variables. * CXX: Particular Programs. * CXXCPP: Particular Programs. +* CXXFLAGS <1>: Particular Programs. * CXXFLAGS: Preset Output Variables. -* CXXFLAGS: Particular Programs. * datadir: Preset Output Variables. * DEFS: Preset Output Variables. * exec_prefix: Preset Output Variables. @@ -5115,17 +5114,14 @@ how this is done. * KMEM_GROUP: Particular Functions. * LDFLAGS: Preset Output Variables. * LEX: Particular Programs. -* LEXLIB: Particular Programs. * LEX_OUTPUT_ROOT: Particular Programs. +* LEXLIB: Particular Programs. * libdir: Preset Output Variables. * libexecdir: Preset Output Variables. +* LIBOBJS <1>: Structures. +* LIBOBJS <2>: Generic Functions. * LIBOBJS: Particular Functions. -* LIBOBJS: Particular Functions. -* LIBOBJS: Particular Functions. -* LIBOBJS: Generic Functions. -* LIBOBJS: Structures. -* LIBS: UNIX Variants. -* LIBS: UNIX Variants. +* LIBS <1>: UNIX Variants. * LIBS: Preset Output Variables. * LN_S: Particular Programs. * localstatedir: Preset Output Variables. @@ -5165,9 +5161,15 @@ use these names in `#if' directives. * Menu: +* __CHAR_UNSIGNED__: Compiler Characteristics. +* _ALL_SOURCE: UNIX Variants. +* _MINIX: UNIX Variants. +* _POSIX_1_SOURCE: UNIX Variants. +* _POSIX_SOURCE: UNIX Variants. +* _POSIX_VERSION: Particular Headers. +* C_ALLOCA: Particular Functions. * CLOSEDIR_VOID: Particular Functions. * const: Compiler Characteristics. -* C_ALLOCA: Particular Functions. * DGUX: Particular Functions. * DIRENT: Particular Headers. * GETGROUPS_T: Particular Typedefs. @@ -5186,11 +5188,11 @@ use these names in `#if' directives. * HAVE_MMAP: Particular Functions. * HAVE_NDIR_H: Particular Headers. * HAVE_RESTARTABLE_SYSCALLS: System Services. -* HAVE_STRCOLL: Particular Functions. -* HAVE_STRFTIME: Particular Functions. * HAVE_ST_BLKSIZE: Structures. * HAVE_ST_BLOCKS: Structures. * HAVE_ST_RDEV: Structures. +* HAVE_STRCOLL: Particular Functions. +* HAVE_STRFTIME: Particular Functions. * HAVE_SYS_DIR_H: Particular Headers. * HAVE_SYS_NDIR_H: Particular Headers. * HAVE_SYS_WAIT_H: Particular Headers. @@ -5221,9 +5223,9 @@ use these names in `#if' directives. * size_t: Particular Typedefs. * STDC_HEADERS: Particular Headers. * SVR4: Particular Functions. +* SYS_SIGLIST_DECLARED: Particular Headers. * SYSDIR: Particular Headers. * SYSNDIR: Particular Headers. -* SYS_SIGLIST_DECLARED: Particular Headers. * TIME_WITH_SYS_TIME: Structures. * TM_IN_SYS_TIME: Structures. * uid_t: Particular Typedefs. @@ -5234,13 +5236,6 @@ use these names in `#if' directives. * VOID_CLOSEDIR: Particular Headers. * WORDS_BIGENDIAN: Compiler Characteristics. * YYTEXT_POINTER: Particular Programs. -* _ALL_SOURCE: UNIX Variants. -* _MINIX: UNIX Variants. -* _POSIX_1_SOURCE: UNIX Variants. -* _POSIX_SOURCE: UNIX Variants. -* _POSIX_SOURCE: UNIX Variants. -* _POSIX_VERSION: Particular Headers. -* __CHAR_UNSIGNED__: Compiler Characteristics. File: autoconf.info, Node: Macro Index, Prev: Preprocessor Symbol Index, Up: Top @@ -5260,12 +5255,17 @@ list easier to use, the macros are listed without their preceding `AC_'. * ARG_PROGRAM: Transforming Names. * ARG_WITH: External Software. * BEFORE: Suggested Ordering. +* C_BIGENDIAN: Compiler Characteristics. +* C_CHAR_UNSIGNED: Compiler Characteristics. +* C_CONST: Compiler Characteristics. +* C_CROSS: Test Programs. +* C_INLINE: Compiler Characteristics. +* C_LONG_DOUBLE: Compiler Characteristics. * CACHE_CHECK: Caching Results. * CACHE_VAL: Caching Results. * CANONICAL_HOST: Canonicalizing. * CANONICAL_SYSTEM: Canonicalizing. * CHAR_UNSIGNED: Old Macro Names. -* CHECKING: Printing Messages. * CHECK_FUNC: Generic Functions. * CHECK_FUNCS: Generic Functions. * CHECK_HEADER: Generic Headers. @@ -5276,18 +5276,13 @@ list easier to use, the macros are listed without their preceding `AC_'. * CHECK_SIZEOF: Compiler Characteristics. * CHECK_TOOL: Generic Programs. * CHECK_TYPE: Generic Typedefs. +* CHECKING: Printing Messages. * COMPILE_CHECK: Examining Libraries. * CONFIG_AUX_DIR: Input. * CONFIG_HEADER: Configuration Headers. * CONFIG_SUBDIRS: Subdirectories. * CONST: Old Macro Names. * CROSS_CHECK: Old Macro Names. -* C_BIGENDIAN: Compiler Characteristics. -* C_CHAR_UNSIGNED: Compiler Characteristics. -* C_CONST: Compiler Characteristics. -* C_CROSS: Test Programs. -* C_INLINE: Compiler Characteristics. -* C_LONG_DOUBLE: Compiler Characteristics. * DECL_SYS_SIGLIST: Particular Headers. * DECL_YYTEXT: Particular Programs. * DEFINE: Defining Symbols. @@ -5368,11 +5363,6 @@ list easier to use, the macros are listed without their preceding `AC_'. * PREFIX: Old Macro Names. * PREFIX_PROGRAM: Default Prefix. * PREREQ: Versions. -* PROGRAMS_CHECK: Old Macro Names. -* PROGRAMS_PATH: Old Macro Names. -* PROGRAM_CHECK: Old Macro Names. -* PROGRAM_EGREP: Old Macro Names. -* PROGRAM_PATH: Old Macro Names. * PROG_AWK: Particular Programs. * PROG_CC: Particular Programs. * PROG_CC_C_O: Particular Programs. @@ -5386,6 +5376,11 @@ list easier to use, the macros are listed without their preceding `AC_'. * PROG_MAKE_SET: Output. * PROG_RANLIB: Particular Programs. * PROG_YACC: Particular Programs. +* PROGRAM_CHECK: Old Macro Names. +* PROGRAM_EGREP: Old Macro Names. +* PROGRAM_PATH: Old Macro Names. +* PROGRAMS_CHECK: Old Macro Names. +* PROGRAMS_PATH: Old Macro Names. * PROVIDE: Prerequisite Macros. * REMOTE_TAPE: Old Macro Names. * REPLACE_FUNCS: Generic Functions. @@ -5396,12 +5391,15 @@ list easier to use, the macros are listed without their preceding `AC_'. * REVISION: Versions. * RSH: Old Macro Names. * SCO_INTL: UNIX Variants. -* SETVBUF_REVERSED: Old Macro Names. * SET_MAKE: Old Macro Names. -* SIZEOF_TYPE: Old Macro Names. +* SETVBUF_REVERSED: Old Macro Names. * SIZE_T: Old Macro Names. +* SIZEOF_TYPE: Old Macro Names. +* ST_BLKSIZE: Old Macro Names. +* ST_BLOCKS: Old Macro Names. +* ST_RDEV: Old Macro Names. +* STAT_MACROS_BROKEN <1>: Old Macro Names. * STAT_MACROS_BROKEN: Structures. -* STAT_MACROS_BROKEN: Old Macro Names. * STDC_HEADERS: Old Macro Names. * STRCOLL: Old Macro Names. * STRUCT_ST_BLKSIZE: Structures. @@ -5409,9 +5407,6 @@ list easier to use, the macros are listed without their preceding `AC_'. * STRUCT_ST_RDEV: Structures. * STRUCT_TIMEZONE: Structures. * STRUCT_TM: Structures. -* ST_BLKSIZE: Old Macro Names. -* ST_BLOCKS: Old Macro Names. -* ST_RDEV: Old Macro Names. * SUBST: Setting Output Variables. * SUBST_FILE: Setting Output Variables. * SYS_INTERPRETER: System Services. @@ -5420,8 +5415,8 @@ list easier to use, the macros are listed without their preceding `AC_'. * SYS_SIGLIST_DECLARED: Old Macro Names. * TEST_CPP: Old Macro Names. * TEST_PROGRAM: Old Macro Names. -* TIMEZONE: Old Macro Names. * TIME_WITH_SYS_TIME: Old Macro Names. +* TIMEZONE: Old Macro Names. * TRY_COMPILE: Examining Syntax. * TRY_CPP: Examining Declarations. * TRY_LINK: Examining Libraries. @@ -5561,7 +5556,7 @@ Node: Deuteronomy208175 Node: Old Macro Names210839 Node: Environment Variable Index213888 Node: Output Variable Index214890 -Node: Preprocessor Symbol Index219813 -Node: Macro Index224745 +Node: Preprocessor Symbol Index219573 +Node: Macro Index224450 End Tag Table diff --git a/src/util/autoconf/standards.info b/src/util/autoconf/standards.info index 60180a022..b021a4c99 100644 --- a/src/util/autoconf/standards.info +++ b/src/util/autoconf/standards.info @@ -1,4 +1,4 @@ -This is Info file standards.info, produced by Makeinfo-1.55 from the +This is Info file standards.info, produced by Makeinfo-1.64 from the input file ./standards.texi. START-INFO-DIR-ENTRY diff --git a/src/util/configure.in b/src/util/configure.in index 302ca71a3..ba97bdc96 100644 --- a/src/util/configure.in +++ b/src/util/configure.in @@ -10,14 +10,8 @@ fi AC_SUBST(HAVE_GCC) HOST_TYPE=$krb5_cv_host AC_SUBST(HOST_TYPE) -case $HOST_TYPE in -*-*-aix*) - AppendRule(all::aix.bincmds) - ;; -esac SHLIB_TAIL_COMP=$krb5_cv_shlibs_tail_comp AC_SUBST(SHLIB_TAIL_COMP) -CONFIG_DIRS(et ss profile pty dyn db2 send-pr) -DO_SUBDIRS +AC_CONFIG_SUBDIRS(et ss profile pty dyn db2 send-pr) V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/dyn/ChangeLog b/src/util/dyn/ChangeLog index 015c04d4a..492eb562e 100644 --- a/src/util/dyn/ChangeLog +++ b/src/util/dyn/ChangeLog @@ -1,3 +1,10 @@ +Wed Jan 28 17:50:30 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove CopySrcHeader from + configure.in, and move functionality to Makefile.in + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Sat Dec 6 22:50:03 1997 Ezra Peisach <epeisach@mit.edu> * dyn_delete.c: Include <string.h> diff --git a/src/util/dyn/Makefile.in b/src/util/dyn/Makefile.in index 293e9b4f2..d8ef45069 100644 --- a/src/util/dyn/Makefile.in +++ b/src/util/dyn/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) RELDIR=../util/dyn CFLAGS = $(CCOPTS) $(DEFS) @@ -41,6 +43,18 @@ all-windows:: $(OBJS) all-unix:: includes +includes:: dyn.h + if cmp $(srcdir)/dyn.h \ + $(BUILDTOP)/include/dyn.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/dyn.h; \ + $(CP) $(srcdir)/dyn.h \ + $(BUILDTOP)/include/dyn.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/dyn.h + check-windows:: clean-mac:: clean-windows:: diff --git a/src/util/dyn/configure.in b/src/util/dyn/configure.in index e4db7dbfe..7b4770c1b 100644 --- a/src/util/dyn/configure.in +++ b/src/util/dyn/configure.in @@ -7,5 +7,4 @@ AC_PROG_INSTALL AC_CHECK_FUNCS(memmove) KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY -CopySrcHeader(dyn.h,[$](BUILDTOP)/include) V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/et/ChangeLog b/src/util/et/ChangeLog index aafa770c5..66483d139 100644 --- a/src/util/et/ChangeLog +++ b/src/util/et/ChangeLog @@ -1,3 +1,10 @@ +Wed Jan 28 17:54:57 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove CopySrcHeader from + configure.in, and move functionality to Makefile.in + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Tue Oct 7 07:43:05 1997 Ezra Peisach <epeisach@mit.edu> * Makefile.in (SRCS): Add $(srcdir) as prefix to srcs. diff --git a/src/util/et/Makefile.in b/src/util/et/Makefile.in index 9f6afef19..4c615be55 100644 --- a/src/util/et/Makefile.in +++ b/src/util/et/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) RELDIR=../util/et CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) SED = sed @@ -78,6 +80,18 @@ test_et: test_et.o test1.o test2.o $(LIBOBJS) all-unix:: compile_et includes +includes:: com_err.h + if cmp $(srcdir)/com_err.h \ + $(BUILDTOP)/include/com_err.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/com_err.h; \ + $(CP) $(srcdir)/com_err.h \ + $(BUILDTOP)/include/com_err.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/com_err.h + # The real compile_et just isn't portable. (But then again, anything using # lex and yacc isn't portable by definition. :-( ) # diff --git a/src/util/et/configure.in b/src/util/et/configure.in index 427d1adc0..43c679ffd 100644 --- a/src/util/et/configure.in +++ b/src/util/et/configure.in @@ -23,7 +23,6 @@ dnl AC_CHECK_FUNCS(strerror) AC_HEADER_STDARG AC_HAVE_HEADERS(stdlib.h) -CopySrcHeader(com_err.h,$(BUILDTOP)/include) KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/profile/ChangeLog b/src/util/profile/ChangeLog index 0a1bdf04f..e9bbb870b 100644 --- a/src/util/profile/ChangeLog +++ b/src/util/profile/ChangeLog @@ -1,3 +1,10 @@ +Wed Jan 28 17:58:10 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove CopyHeader from + configure.in, and move functionality to Makefile.in + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + Fri Jan 23 20:55:06 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> * prof_parse.c (parse_std_line, parse_quoted_string, diff --git a/src/util/profile/Makefile.in b/src/util/profile/Makefile.in index 36b07245c..80735e766 100644 --- a/src/util/profile/Makefile.in +++ b/src/util/profile/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) ##DOS##BUILDTOP = ..\.. ##DOS##OBJFILE=profile.lst ##DOS##LIBNAME=profile.lib @@ -37,6 +39,17 @@ all-unix:: includes test_parse test_profile all-unix:: all-libs all-windows:: +includes:: profile.h + if cmp profile.h \ + $(BUILDTOP)/include/profile.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/profile.h; \ + $(CP) profile.h $(BUILDTOP)/include/profile.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/profile.h + ##DOS##LIBOBJS = $(OBJS) diff --git a/src/util/profile/configure.in b/src/util/profile/configure.in index 8b27253c8..b9245edce 100644 --- a/src/util/profile/configure.in +++ b/src/util/profile/configure.in @@ -9,5 +9,4 @@ AC_HAVE_FUNCS(stat) AC_PROG_AWK KRB5_BUILD_LIBOBJS KRB5_BUILD_LIBRARY -CopyHeader(profile.h,$(BUILDTOP)/include) V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/pty/ChangeLog b/src/util/pty/ChangeLog index 39b963047..20ac3de4a 100644 --- a/src/util/pty/ChangeLog +++ b/src/util/pty/ChangeLog @@ -1,3 +1,11 @@ +Mon Feb 2 16:18:08 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * configure.in, Makefile.in: Remove CopySrcHeader and CopyHeader + from configure.in and move equivalent functionality to + Makefile.in + Sun Dec 7 00:05:28 1997 Tom Yu <tlyu@mit.edu> * getpty.c (pty_getpty): Fix goof in previous, which introduced diff --git a/src/util/pty/Makefile.in b/src/util/pty/Makefile.in index 9901136c3..05862ac7a 100644 --- a/src/util/pty/Makefile.in +++ b/src/util/pty/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) RELDIR=../util/pty CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) @@ -54,6 +56,20 @@ clean-mac:: ## +includes:: libpty.h + if cmp $(srcdir)/libpty.h \ + $(BUILDTOP)/include/libpty.h >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(BUILDTOP)/include/libpty.h; \ + $(CP) $(srcdir)/libpty.h \ + $(BUILDTOP)/include/libpty.h) ; \ + fi + +clean-unix:: + $(RM) $(BUILDTOP)/include/libpty.h + + + clean-unix:: clean-liblinks clean-libs clean-libobjs clean-files clean-mac:: clean-files diff --git a/src/util/pty/configure.in b/src/util/pty/configure.in index 95d77db1c..71adc940d 100644 --- a/src/util/pty/configure.in +++ b/src/util/pty/configure.in @@ -1,7 +1,6 @@ AC_INIT(getpty.c) CONFIG_RULES AC_PROG_AWK -CopySrcHeader(libpty.h,[$](BUILDTOP)/include) dnl LinkFileDir([$](TOPLIBD)/libpty.a,libpty.a,../util/pty) AC_PROG_INSTALL AC_PROG_ARCHIVE diff --git a/src/util/send-pr/Makefile.in b/src/util/send-pr/Makefile.in index 18ec50e8b..e6583a663 100644 --- a/src/util/send-pr/Makefile.in +++ b/src/util/send-pr/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) # # Makefile for building a standalone send-pr. # diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog index cecc9e3bc..6313d2b73 100644 --- a/src/util/ss/ChangeLog +++ b/src/util/ss/ChangeLog @@ -1,3 +1,14 @@ +Wed Jan 28 17:38:29 1998 Theodore Ts'o <tytso@rsts-11.mit.edu> + + * configure.in, Makefile.in: Remove CopySrcHeader and CopyHeader + from configure.in and move equivalent functionality to + Makefile.in + + * Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile + + * cmd_tbl.lex.l, ct.y, requests.c, ss.h: Remove #include of + <mit-sipb-copyright.h>, since it's not needed. + Tue Nov 18 19:22:34 1997 Tom Yu <tlyu@mit.edu> * configure.in: Update to new library build system. diff --git a/src/util/ss/Makefile.in b/src/util/ss/Makefile.in index 405ceeb14..9692689fc 100644 --- a/src/util/ss/Makefile.in +++ b/src/util/ss/Makefile.in @@ -1,3 +1,5 @@ +thisconfigdir=./ +BUILDTOP=$(U)$(U) CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) SED = sed @@ -84,6 +86,34 @@ install:: includes:: mk_cmds ct_c.sed ct_c.awk ss_err.h +HDRDIR=$(BUILDTOP)/include/ss +HDRS = $(HDRDIR)/ss.h \ + $(HDRDIR)/mit-sipb-copyright.h \ + $(HDRDIR)/ss_err.h + +BUILD_HDRS = ss_err.h +SRC_HDRS = ss.h + +includes:: $(SRC_HDRS) $(BUILD_HDRS) + mkdir -p $(HDRDIR) + for i in $(SRC_HDRS) ; do \ + if cmp $(srcdir)/$$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $(srcdir)/$$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + for i in $(BUILD_HDRS) ; do \ + if cmp $$i $(HDRDIR)/$$i >/dev/null 2>&1; then :; \ + else \ + (set -x; $(RM) $(HDRDIR)/$$i; \ + $(CP) $$i $(HDRDIR)/$$i) ; \ + fi ; \ + done + +clean-unix:: + $(RM) $(HDRS) + std_rqs.c: std_rqs.ct ss_err.h: ss_err.et diff --git a/src/util/ss/cmd_tbl.lex.l b/src/util/ss/cmd_tbl.lex.l index 166f76deb..b47085e98 100644 --- a/src/util/ss/cmd_tbl.lex.l +++ b/src/util/ss/cmd_tbl.lex.l @@ -32,7 +32,6 @@ end return l_end(); */ #include <string.h> #include "ct.tab.h" -#include "mit-sipb-copyright.h" #ifndef HAS_STRDUP extern char *strdup(); diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in index 7701bcb40..0da56d2aa 100644 --- a/src/util/ss/configure.in +++ b/src/util/ss/configure.in @@ -12,9 +12,6 @@ CHECK_SIGPROCMASK AC_RETSIGTYPE AC_HEADER_STDARG AC_CHECK_HEADERS(stdlib.h) -CopySrcHeader(ss.h,$(BUILDTOP)/include/ss) -CopySrcHeader(mit-sipb-copyright.h,$(BUILDTOP)/include/ss) -CopyHeader(ss_err.h,$(BUILDTOP)/include/ss) KRB5_BUILD_LIBRARY_STATIC KRB5_BUILD_LIBOBJS V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/ss/ct.y b/src/util/ss/ct.y index f1941fc84..0727492cf 100644 --- a/src/util/ss/ct.y +++ b/src/util/ss/ct.y @@ -6,7 +6,6 @@ */ #include <stdio.h> #include <string.h> -#include "mit-sipb-copyright.h" #ifndef HAS_STRDUP extern char *strdup(); diff --git a/src/util/ss/requests.c b/src/util/ss/requests.c index bfe69f120..5b10356ce 100644 --- a/src/util/ss/requests.c +++ b/src/util/ss/requests.c @@ -6,7 +6,6 @@ * For copyright information, see mit-sipb-copyright.h. */ -#include "mit-sipb-copyright.h" #include <stdio.h> #include "ss_internal.h" diff --git a/src/util/ss/ss.h b/src/util/ss/ss.h index ca3197d8b..5f3df3f3a 100644 --- a/src/util/ss/ss.h +++ b/src/util/ss/ss.h @@ -7,7 +7,6 @@ #ifndef _ss_h #define _ss_h __FILE__ -#include <ss/mit-sipb-copyright.h> #include <ss/ss_err.h> extern int errno; |