Mass makefile/configure.in build system revamp
authorTheodore Tso <tytso@mit.edu>
Thu, 12 Feb 1998 16:23:00 +0000 (16:23 +0000)
committerTheodore Tso <tytso@mit.edu>
Thu, 12 Feb 1998 16:23:00 +0000 (16:23 +0000)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10424 dc483132-0cff-0310-8789-dd5450dbe970

269 files changed:
src/ChangeLog
src/Makefile.in
src/aclocal.m4
src/appl/ChangeLog
src/appl/Makefile.in
src/appl/bsd/ChangeLog
src/appl/bsd/Makefile.in
src/appl/configure.in
src/appl/gss-sample/ChangeLog
src/appl/gss-sample/Makefile.in
src/appl/gssftp/ChangeLog
src/appl/gssftp/Makefile.in
src/appl/gssftp/configure.in
src/appl/gssftp/ftp/ChangeLog
src/appl/gssftp/ftp/Makefile.in
src/appl/gssftp/ftpd/ChangeLog
src/appl/gssftp/ftpd/Makefile.in
src/appl/sample/ChangeLog
src/appl/sample/Makefile.in
src/appl/sample/configure.in
src/appl/sample/sclient/ChangeLog
src/appl/sample/sclient/Makefile.in
src/appl/sample/sclient/configure.in [deleted file]
src/appl/sample/sserver/ChangeLog
src/appl/sample/sserver/Makefile.in
src/appl/sample/sserver/configure.in [deleted file]
src/appl/simple/ChangeLog
src/appl/simple/Makefile.in
src/appl/simple/client/ChangeLog
src/appl/simple/client/Makefile.in
src/appl/simple/client/configure.in [deleted file]
src/appl/simple/configure.in
src/appl/simple/server/ChangeLog
src/appl/simple/server/Makefile.in
src/appl/simple/server/configure.in [deleted file]
src/appl/telnet/ChangeLog
src/appl/telnet/Makefile.in
src/appl/telnet/configure.in
src/appl/telnet/libtelnet/ChangeLog
src/appl/telnet/libtelnet/Makefile.in
src/appl/telnet/libtelnet/configure.in
src/appl/telnet/telnet/ChangeLog
src/appl/telnet/telnet/Makefile.in
src/appl/telnet/telnetd/ChangeLog
src/appl/telnet/telnetd/Makefile.in
src/appl/user_user/ChangeLog
src/appl/user_user/Makefile.in
src/clients/ChangeLog
src/clients/Makefile.in
src/clients/configure.in
src/clients/kdestroy/ChangeLog
src/clients/kdestroy/Makefile.in
src/clients/kdestroy/configure.in [deleted file]
src/clients/kinit/ChangeLog
src/clients/kinit/Makefile.in
src/clients/kinit/configure.in [deleted file]
src/clients/klist/ChangeLog
src/clients/klist/Makefile.in
src/clients/klist/configure.in [deleted file]
src/clients/kpasswd/ChangeLog
src/clients/kpasswd/Makefile.in
src/clients/kpasswd/configure.in [deleted file]
src/clients/ksu/ChangeLog
src/clients/ksu/Makefile.in
src/clients/ksu/configure.in [deleted file]
src/config-files/ChangeLog
src/config-files/Makefile.in
src/config/ChangeLog
src/config/pre.in
src/configure.in
src/gen-manpages/ChangeLog
src/gen-manpages/Makefile.in
src/include/ChangeLog
src/include/Makefile.in
src/include/configure.in
src/include/kerberosIV/ChangeLog
src/include/kerberosIV/Makefile.in
src/include/krb5/ChangeLog
src/include/krb5/Makefile.in
src/kadmin.v4/ChangeLog
src/kadmin.v4/Makefile.in
src/kadmin.v4/configure.in
src/kadmin.v4/server/ChangeLog
src/kadmin.v4/server/Makefile.in
src/kadmin.v4/server/configure.in
src/kadmin/ChangeLog
src/kadmin/Makefile.in
src/kadmin/cli/ChangeLog
src/kadmin/cli/Makefile.in
src/kadmin/configure.in
src/kadmin/dbutil/ChangeLog
src/kadmin/dbutil/Makefile.in
src/kadmin/kdbkeys/ChangeLog
src/kadmin/kdbkeys/Makefile.in
src/kadmin/kdbkeys/configure.in
src/kadmin/ktutil/ChangeLog
src/kadmin/ktutil/Makefile.in
src/kadmin/passwd/ChangeLog
src/kadmin/passwd/Makefile.in
src/kadmin/passwd/configure.in
src/kadmin/passwd/unit-test/ChangeLog [new file with mode: 0644]
src/kadmin/passwd/unit-test/Makefile.in
src/kadmin/server/ChangeLog
src/kadmin/server/Makefile.in
src/kadmin/testing/ChangeLog [new file with mode: 0644]
src/kadmin/testing/Makefile.in
src/kadmin/testing/configure.in
src/kadmin/testing/scripts/ChangeLog
src/kadmin/testing/scripts/Makefile.in
src/kadmin/testing/scripts/configure.in
src/kadmin/testing/util/ChangeLog
src/kadmin/testing/util/Makefile.in
src/kadmin/v4server/ChangeLog
src/kadmin/v4server/Makefile.in
src/kadmin/v4server/unit-test/ChangeLog
src/kadmin/v4server/unit-test/Makefile.in
src/kadmin/v5passwdd/ChangeLog
src/kadmin/v5passwdd/Makefile.in
src/kdc/ChangeLog
src/kdc/Makefile.in
src/krb524/ChangeLog
src/krb524/Makefile.in
src/lib/ChangeLog
src/lib/Makefile.in
src/lib/configure.in
src/lib/crypto/ChangeLog
src/lib/crypto/Makefile.in
src/lib/crypto/configure.in
src/lib/crypto/crc32/ChangeLog
src/lib/crypto/crc32/Makefile.in
src/lib/crypto/des/ChangeLog
src/lib/crypto/des/Makefile.in
src/lib/crypto/md4/ChangeLog
src/lib/crypto/md4/Makefile.in
src/lib/crypto/md5/ChangeLog
src/lib/crypto/md5/Makefile.in
src/lib/crypto/os/ChangeLog
src/lib/crypto/os/Makefile.in
src/lib/crypto/sha/ChangeLog
src/lib/crypto/sha/Makefile.in
src/lib/des425/ChangeLog
src/lib/des425/Makefile.in
src/lib/gssapi/ChangeLog
src/lib/gssapi/Makefile.in
src/lib/gssapi/configure.in
src/lib/gssapi/generic/ChangeLog
src/lib/gssapi/generic/Makefile.in
src/lib/gssapi/generic/configure.in [deleted file]
src/lib/gssapi/krb5/ChangeLog
src/lib/gssapi/krb5/Makefile.in
src/lib/gssapi/krb5/configure.in [deleted file]
src/lib/gssapi/mechglue/ChangeLog
src/lib/gssapi/mechglue/Makefile.in
src/lib/gssapi/mechglue/configure.in [deleted file]
src/lib/kadm/ChangeLog
src/lib/kadm/Makefile.in
src/lib/kadm/configure.in
src/lib/kadm5/ChangeLog
src/lib/kadm5/Makefile.in
src/lib/kadm5/clnt/ChangeLog
src/lib/kadm5/clnt/Makefile.in
src/lib/kadm5/clnt/configure.in
src/lib/kadm5/configure.in
src/lib/kadm5/srv/ChangeLog
src/lib/kadm5/srv/Makefile.in
src/lib/kadm5/srv/configure.in
src/lib/kadm5/unit-test/ChangeLog
src/lib/kadm5/unit-test/Makefile.in
src/lib/kdb/ChangeLog
src/lib/kdb/Makefile.in
src/lib/krb4/ChangeLog
src/lib/krb4/Makefile.in
src/lib/krb4/configure.in
src/lib/krb5/ChangeLog
src/lib/krb5/Makefile.in
src/lib/krb5/asn.1/ChangeLog
src/lib/krb5/asn.1/Makefile.in
src/lib/krb5/ccache/ChangeLog
src/lib/krb5/ccache/Makefile.in
src/lib/krb5/ccache/configure.in
src/lib/krb5/ccache/file/ChangeLog
src/lib/krb5/ccache/file/Makefile.in
src/lib/krb5/ccache/file/configure.in [deleted file]
src/lib/krb5/ccache/memory/ChangeLog
src/lib/krb5/ccache/memory/Makefile.in
src/lib/krb5/ccache/memory/configure.in [deleted file]
src/lib/krb5/ccache/stdio/ChangeLog
src/lib/krb5/ccache/stdio/Makefile.in
src/lib/krb5/ccache/stdio/configure.in [deleted file]
src/lib/krb5/configure.in
src/lib/krb5/error_tables/ChangeLog
src/lib/krb5/error_tables/Makefile.in
src/lib/krb5/free/ChangeLog
src/lib/krb5/free/Makefile.in
src/lib/krb5/keytab/ChangeLog
src/lib/krb5/keytab/Makefile.in
src/lib/krb5/keytab/configure.in
src/lib/krb5/keytab/db/ChangeLog [new file with mode: 0644]
src/lib/krb5/keytab/db/Makefile.in
src/lib/krb5/keytab/db/configure.in
src/lib/krb5/keytab/file/ChangeLog
src/lib/krb5/keytab/file/Makefile.in
src/lib/krb5/keytab/file/configure.in [deleted file]
src/lib/krb5/krb/ChangeLog
src/lib/krb5/krb/Makefile.in
src/lib/krb5/os/ChangeLog
src/lib/krb5/os/Makefile.in
src/lib/krb5/posix/ChangeLog
src/lib/krb5/posix/Makefile.in
src/lib/krb5/rcache/ChangeLog
src/lib/krb5/rcache/Makefile.in
src/lib/krb5util/ChangeLog
src/lib/krb5util/Makefile.in
src/lib/rpc/ChangeLog
src/lib/rpc/Makefile.in
src/lib/rpc/configure.in
src/lib/rpc/unit-test/ChangeLog
src/lib/rpc/unit-test/Makefile.in
src/slave/ChangeLog
src/slave/Makefile.in
src/tests/ChangeLog
src/tests/Makefile.in
src/tests/asn.1/ChangeLog
src/tests/asn.1/Makefile.in
src/tests/asn.1/configure.in [deleted file]
src/tests/configure.in
src/tests/create/ChangeLog
src/tests/create/Makefile.in
src/tests/create/configure.in [deleted file]
src/tests/dejagnu/ChangeLog
src/tests/dejagnu/Makefile.in
src/tests/dejagnu/configure.in [deleted file]
src/tests/gssapi/ChangeLog
src/tests/gssapi/Makefile.in
src/tests/gssapi/configure.in [deleted file]
src/tests/hammer/ChangeLog
src/tests/hammer/Makefile.in
src/tests/hammer/configure.in [deleted file]
src/tests/resolve/ChangeLog
src/tests/resolve/Makefile.in
src/tests/resolve/configure.in [deleted file]
src/tests/verify/ChangeLog
src/tests/verify/Makefile.in
src/tests/verify/configure.in [deleted file]
src/util/ChangeLog
src/util/Makefile.in
src/util/autoconf/autoconf.info
src/util/autoconf/standards.info
src/util/configure.in
src/util/dyn/ChangeLog
src/util/dyn/Makefile.in
src/util/dyn/configure.in
src/util/et/ChangeLog
src/util/et/Makefile.in
src/util/et/configure.in
src/util/profile/ChangeLog
src/util/profile/Makefile.in
src/util/profile/configure.in
src/util/pty/ChangeLog
src/util/pty/Makefile.in
src/util/pty/configure.in
src/util/send-pr/Makefile.in
src/util/ss/ChangeLog
src/util/ss/Makefile.in
src/util/ss/cmd_tbl.lex.l
src/util/ss/configure.in
src/util/ss/ct.y
src/util/ss/requests.c
src/util/ss/ss.h

index 7db491195829b67e3e810201b8b40fc349526231..ffc14585f8a84f104c996d19f0496e626c1547d9 100644 (file)
@@ -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.
index 82ec6f410c0bd093f99f1ab5fdef799fa5dbaacb..33b7b11ed74b2a95d11f0cdc50d469745b0bf2d4 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(C)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = .
index df4b67a585520636b1a1fa95f7e27c3572f430c6..25e0c3a875b3023f512247a4a9a17fb155306434 100644 (file)
@@ -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
@@ -27,33 +29,6 @@ else
   AC_MSG_ERROR([can not find config/ directory in $ac_reltopdir])
 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
@@ -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
index 708b53bee0d2f9d3e711d31c77cef8db30097e37..dc6accc3ff86db360da30c85c4f0ae6ba4c5ad26 100644 (file)
@@ -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
index 16fdba5d28870abc27c04840840abce3d8c7a750..37ad0fec6400547017a9464acb652532aa5237f1 100644 (file)
@@ -1 +1,3 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 CFLAGS = $(CCOPTS)
index 3beb9cf4104295675c4d59be8190850ce175854b..0dbf84b3815ab088eabcc4f84fc5d01f7e10713e 100644 (file)
@@ -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
index 368ceb8f1d8ac848168759886fa788bc45fe8f78..9ea3cb74c0230f11a1ea4d591bc403e2acb1cbde 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(DEFINES)
 LOCALINCLUDE=@KRB4_INCLUDES@
 PROG_LIBPATH=-L$(TOPLIBD)
index 8622fa98cb807c0751b6efcf681e088bc1813fef..54e2af32796d7c04fbef53b8aad7c6d37bca9df2 100644 (file)
@@ -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
index 8bdd01df7522a0ea9a7ca2c7423d873828f45d75..893ff8816dea37a1b60b697094b4626c6db1d9a7 100644 (file)
@@ -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.
index 948b83e874a95950b63e525a4bc80e5887081ea0..ee16300157673a8535632798d92709f53c3ffe72 100644 (file)
@@ -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)
index ea47f84384d20500735ee5064924d1c0646ff436..86fe3771a34aa29d5476bf8625aea4a1a29c48c0 100644 (file)
@@ -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.
index 76388e8c6e4a7ec5d2bdd70f0fb0b25369520775..89ff07c04c40ce36e1266497df04b79aa5e68e64 100644 (file)
@@ -1,2 +1,4 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS)
 LDFLAGS = -g
index 373180bc0d19514b0a1d091c013fd9f45fe84171..11fa91ae96f365065b94a9058823cef2ffbde404 100644 (file)
@@ -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
index 2e42d579b679bc0834b44b80b02fd28f1502a068..8c3c1a81c6ad8b01b104875e418c84fe1cc42f55 100644 (file)
@@ -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:
index e2927804b4fc0111045d6b41b46e5ae5e4d1e2a4..5e971b13100668f528f18c503787e2e9a08df65f 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 #
 # appl/gssftp/ftp/Makefile.in
 #
index 18377bb55b04ecdd76cd9669a477b435bfef566f..da0540900f9f2352d72050c6986a32b48aba5f34 100644 (file)
@@ -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
index 303ae80ed7abc019ac24a6bc3e7b16c67f95b6aa..a23796410599a4ce7dbecdd7ed39ff9f992ce00a 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 #
 # appl/gssftp/ftpd/Makefile.in
 #
index b4b4f5077d022b706092f4e860e21f91b65b9dab..847b6da1e13c44b37b6108a5fcd8590860c7125e 100644 (file)
@@ -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>
index 16fdba5d28870abc27c04840840abce3d8c7a750..f3fd3c23bd4de1b3896731bd0429c33bf630d1cd 100644 (file)
@@ -1 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
+LOCAL_SUBDIRS = sclient sserver
+
 CFLAGS = $(CCOPTS)
index 8a4b84729927361573450e208943e15379983ecf..5bbd1eeccd16c3799f25bcd1bccf46cd14da5c64 100644 (file)
@@ -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
+
index afb3bd2d0addc848501508220897665c0aa55ec2..e7201b5cb1f9334ecebb82fe0a11aa9559bf9b29 100644 (file)
@@ -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
index 8763029a86b89f2171d5aa5d7692bb78e56fd8bc..fc0506fcead5a6b2934dfe8f0e96b5e3fad2a516 100644 (file)
@@ -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 (file)
index 0a1fcf4..0000000
+++ /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
index 591aef56d4a8bb22066479443350b61c1e00be30..48076d722a1ac2757cac52760f016bf33da45604 100644 (file)
@@ -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:
index 5be42c28a86fda6801886331405441a570cb770f..7351718906321057b6d1c9603ca6abce46a1cd73 100644 (file)
@@ -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 (file)
index af0f45a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(sserver.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index a2ae28f7dced6cd907e294b04aed83bb3a10e095..3c69c21d9df83321421c6953ac622c2a7a007df5 100644 (file)
@@ -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
index 16fdba5d28870abc27c04840840abce3d8c7a750..5c3584ff1638551ab961ddb2a91675c08635c51d 100644 (file)
@@ -1 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
+LOCAL_SUBDIRS = client server
+
 CFLAGS = $(CCOPTS)
index 72017595a575c8f0eedd9d4547abdecfb600b0a6..794f419385d30ecb3c0ba815616b73945e908c31 100644 (file)
@@ -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
index f9f530322a2db1520f6e992c24e04cbe16b81585..104c2b491a4fceb8bb646049817f9e310979d48d 100644 (file)
@@ -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 (file)
index 3d81282..0000000
+++ /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
index b155112dc077a82dd8f4cdd51fc6e9fbff7595ae..dc8492e68af6e1dece74d09663c071f1b8867eef 100644 (file)
@@ -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
+
+
index e6fd132f488b974a2bd8be67a8d171308fe4c9c1..1a11f94a4d36a61491576eaafa9573bfc44c6ffb 100644 (file)
@@ -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
index 332c2660e854fa4428e98119964b10514af3134e..e3118eaf276f6d750349bf7c818ce5d288169698 100644 (file)
@@ -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 (file)
index 61590e6..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(sim_server.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index 599cccf1a27cbe55e6b1affa88dbc816d0c654f4..3aa6a440827ffe27479c99a94d7e89179f78e0e9 100644 (file)
@@ -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
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..d319fd72dfadb288fe4821eb1f27778224991a2e 100644 (file)
@@ -0,0 +1,2 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
index 1b90cbc4753668f9d83381844a6715d145702221..9dccb58cac8bed128dce01ddc1cf3287c202e351 100644 (file)
@@ -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
index df22164b7a87bbc91b7f517d7b64a9b072d11af1..987b0296d1882f837261ac66f71f1f057056cd52 100644 (file)
@@ -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
index 614531d2b9eb31a42a67dc1a1aaa33582b0ae3bf..8ce564370cd50bcf70c4490ba842a31f8aff5082 100644 (file)
@@ -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.
index 01cf5d72e084717cd76f99def5648efd11f092c3..b2bc50ee9ce1bcf5ba287a2742743d0ffdbe269d 100644 (file)
@@ -14,5 +14,4 @@ else
        AC_MSG_RESULT(Kerberos 4 authentication enabled)
        AC_DEFINE(KRB4)
 fi
-USE_KRB4_LIBRARY
 V5_AC_OUTPUT_MAKEFILE
index 73189bb8c91e09d20a6b38d2da7488f475876978..0b4848b0c5254070afdd8041e214484456c78aaa 100644 (file)
@@ -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;
index ca7e743df379ead02568a8bd0e1a66fe7d7005de..9774601954e9df971771ffe464e5b86199322abe 100644 (file)
@@ -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.
index 31eaf8e476fd385e68f8f90efa07b85e7f248355..49f9bf061b388b00a9d934296701bba0438f6b36 100644 (file)
@@ -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
index d3dcfca8ddcc53ff7fc01d10ea1b575fac68a06f..2719cf071f05d2a32e8595a1b965094583d4d5d8 100644 (file)
@@ -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.
index e6706b4e9df7d5590154c98a34872a2d0a709542..9c1e6f76592b7d81c454df1c4931faf0fbe788d8 100644 (file)
@@ -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:
index fe2906ad1c2acb016d678fbce09f609aa738192d..e46e64923b5d7c4329614988d4da0be3d9a3c1c5 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -DDEBUG
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index 5972961ead11c6d0ca9cf55bcc54b552cd5b1a5c..352f018e2add046d64487abb5f7ce3ec4c405b08 100644 (file)
@@ -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.
index a9e9c5966eaa8fb56c18a273b92b34a71c093635..eded64f3c98592a6615871ec4ffb503363e38f83 100644 (file)
@@ -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
index b800259eaa533190b9c40b2f82d148e22f301580..51489ded3349c96b8500c15453960815710e8e93 100644 (file)
@@ -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
+
index ac8c543265915defa89501c2722307922bd185e5..5b0cbf6806ab10611a326954c3b15355a2b55ebd 100644 (file)
@@ -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
index 4e907b02dcab91168680173df1add57a5843594e..22c485c46e046b229eb90370b2e7be57cef8c669 100644 (file)
@@ -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 (file)
index 993b1be..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(kdestroy.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index 0f6719a7bea832f5b70697583029cdfe52e09991..8547cdf8df2f75aec4ddc5e0b123021832ef270b 100644 (file)
@@ -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
index b9799120a52b8c7869f7221ad4685d995a972f86..ae30d64a268ca8eb0287b33e3dccf3dc559420bf 100644 (file)
@@ -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 (file)
index 8fb057c..0000000
+++ /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
index 3571b121b25420aea739e71fa81e3b86a61b613b..4dfa65b80c8a9c458186054076beb25578a11803 100644 (file)
@@ -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
index 2954a4dc4a6b2f580c35d94ccdc415cb5d70c544..fc6e614cc8c1d2c8a11d9f35c456a7b1977eb020 100644 (file)
@@ -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 (file)
index f324b0a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(klist.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index ab2bf14d7118246889fa77608521800856a472fb..d59c8e0c8ed8ff98903db5e732d9873619286ab7 100644 (file)
@@ -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:
index 0970a98469bf51dd34a957261baae22cd660a999..8fe4321bc52ad7f373eb58d32e852730c5b84894 100644 (file)
@@ -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 (file)
index e5d2575..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(kpasswd.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index 896dab8a44594cb647e752d58d1d2f352f7f588c..3d8c51edc7b881a69198f11becf190882cf5c1ed 100644 (file)
@@ -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
index eeace51c4f4d0524133459974fc8cce8ead01a6e..256ad25f8086978029a23e6a3dc55730d285b702 100644 (file)
@@ -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 (file)
index 70d663b..0000000
+++ /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
index 8cd401cd2448b08de9b1b841a646592a97de93cd..cca13fdab720e317f44ccaf05ae8849b66062b1d 100644 (file)
@@ -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]
index e56430c7c3e43c5fc1f943885638b69f0d53ce5e..5b837ce357cb3f0884d6aa1094cd66c25332e6a3 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 all::
 
 install::
index a27f4dd3879dbd3c9596b310f806df5f2d869b5b..1d64f80dbc444d026bcd2616d2705088944c6e26 100644 (file)
@@ -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.
index 10fd880b0b98f7c0a7d66d9b4599f10e590a767f..561b1def58bf6f22011168103657099319239b51 100644 (file)
@@ -57,8 +57,9 @@ C=./
 S=/
 U=../
 
-SUBDIRS = @subdirs@
+SUBDIRS = @subdirs@ $(LOCAL_SUBDIRS)
 srcdir = @srcdir@
+SRCTOP = @srcdir@/$(BUILDTOP)
 VPATH = @srcdir@
 
 CPPFLAGS = @CPPFLAGS@
index 68fafd24d0e7b8eb3db85d9c446fb7441943383d..c7be4dbd3967a3e98c9001f3f39a2e4fb0c093d6 100644 (file)
@@ -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
index 3160470bd5fedffff8b8c88140dc4c1bac2ba7c1..dee186102defc98b20a749618c3e6c5e51f6e5b1 100644 (file)
@@ -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
index 59d50e730d8cd05ad5c2a08048acb590d0c643d0..cbd6a5a54ddcf65befd3748fd9a59184b1a0f326 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 all::
 
 install::
index 6bfd0b0e3cec6809fb9081bc21250b69f46f0586..bfc2ab1011a14a5cdf5eff7d13a25a9a26cc8312 100644 (file)
@@ -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 *,
index f9bbbb45f431e90faa1b1efa3b15d4557d9421b8..a6c6f8db14ded75d3c92adab1f06f3f50594c26a 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 ##DOSBUILDTOP = ..
 
 all-unix:: krb5.h adm_err.h
index 4b1c1f3fa81f9f45cc4f72abb54c28fa31413ad6..eb366ea5486ed12cc4ee5577a612eb5e96956d93 100644 (file)
@@ -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
index c3b576574bc911971183f1ce2fedb5a1ee24d159..da2d9406e38332e7d0ff058d6139aa229cc53380 100644 (file)
@@ -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
index e0959b3d2d770d04ec4f87e60e12d98cb1505a44..9a34576dd8b4b1de32c8b9b01d1cf604843a34ba 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 KRB4_HEADERS=krb.h des.h kadm.h mit-copyright.h
 
 all-unix:: krb_err.h
index af6652b8b9117d271a86a715e9083fb40e75cf3d..2101a766daec4e6aea895261444076212a0487f3 100644 (file)
@@ -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
index b3500dd4b74eb2c389d0c820e7d2adb866ac73c2..262996ef6e8c700482d09bc7bb29340d4f7d4405 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 KRB5RCTMPDIR= @KRB5_RCTMPDIR@
 
 ##DOSBUILDTOP = ..\..
index 5edb760a4e63b761e2acf9778c7c4b1f3242b914..0964fe56b74148713e13edba1b2807ec139eef2c 100644 (file)
@@ -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
index 2f64b25f20d1cfd2f227f42a376fba2ee441ed8d..1043979b4c938e72e4a7cba413c60e0e44c39055 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 CFLAGS = $(CCOPTS)
 
 all::
index 05c1320f356352272bc0a0a50410e8791fe11fd0..9523e0d2a8b699b4816bdae09e5d5176cfd5874e 100644 (file)
@@ -1,5 +1,4 @@
 AC_INIT(configure.in)
 CONFIG_RULES
-CONFIG_DIRS(server)
-DO_SUBDIRS
+AC_CONFIG_SUBDIRS(server)
 V5_AC_OUTPUT_MAKEFILE
index b411bb8a183222fa374ed6b66888b038e914a6a1..ba734f8ea9fa2c73aba36387d97b59a157a54f47 100644 (file)
@@ -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
index 39c13ee26f0bd2175827ec15dcf3a12da8fda414..55ef8a78aef9f019c6b9eb1309d5d1072338b0b9 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 LOCALINCLUDE=-I$(SRCTOP)/include/kerberosIV -I$(BUILDTOP)/include/kerberosIV -I.
index d4c10f9599158f457c1ba1f469bd2a22544bb429..403d6ebba0fe727cd804caa4faf9dfaee98a0f7f 100644 (file)
@@ -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
index 03f661972e00d949960956935ef37c2ba3792bba..ba0e30577f75f2b40547260a53441f960c3241a9 100644 (file)
@@ -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.
index 2f64b25f20d1cfd2f227f42a376fba2ee441ed8d..1043979b4c938e72e4a7cba413c60e0e44c39055 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 CFLAGS = $(CCOPTS)
 
 all::
index 190267c68756d0a0f96339058946cd487bb42a1f..12ea4119213fe1fe34f784456caad1fc274d893f 100644 (file)
@@ -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.
index 73a13f095a681726c3b20205de187b2fbbfed8a9..d46d60715a646324705d3437d5ddfd363b88fd9b 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index 1a86a4eeb1c0145ebd7d56ded00d5bcaf0cd955f..be60003d0bab3404d893572fd8bd790eb002fa7a 100644 (file)
@@ -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
index 03bf5d9e43b373aeda030e1fb47294d301b52b41..8db80a9668ef9874d8aec4a4a59d94889787e728 100644 (file)
@@ -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.
index 893812109b9763469f04c507d0f37f33ce9ced64..89420eefd7ae43469b46bd2b6c3ca5251c795255 100644 (file)
@@ -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)
index 206aea9beb3ac0a023f511f27742f63dbe087c43..b512e8a628f4d762e54d953aa3cba61a306eeac9 100644 (file)
@@ -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
index 5672bd0bf0466199fb418033b852ffbbafc2e7c5..a5d1ea30ceb07bc29e19a0351ef80ae64ceadb71 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 
 PROG = kdbkeys
index 6c027fc2772b21560a2cfb22c59d2ece154c63f6..fe426e8785160b74d055399650403a046101abba 100644 (file)
@@ -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
index 5fb5d77242c5a4937843e8d14990b23bf821fc63..a716a7cc65a8be5c93b40fea9e05a173e5b40cb8 100644 (file)
@@ -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.
index d0be5705fa15af6167efc631e13e71c85cb56b1a..c592ff5d13db9b5ee1f0cdc907785518cf97d7a2 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(KRB4_INCLUDES)
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
 PROG_RPATH=$(KRB5_LIBDIR)
index 39d5d3bb5baa2d32fecb6c98446365104d9f8614..85f78018f83db04030a85a52c226376287bc7e39 100644 (file)
@@ -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.
index c94b7246524acff8d08169ea8d0d6ee7728635ee..21758f512de685345d4c5063aebb587c9455229b 100644 (file)
@@ -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)
index d47ea63e8a0b3ad390dcdaad7ba031528c663202..cd597bbc30f49690ab3067d61cce2e494508d92a 100644 (file)
@@ -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 (file)
index 0000000..ff54296
--- /dev/null
@@ -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
+
index 8ffc57f2cc7ceda6abb57916ddd4296e6fb62cb3..a98d94acf8c0929033e1ae4f09e3e31126898df5 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 check unit-test:: unit-test-@DO_TEST@
 
 unit-test-:
index 79837230da1d99915f8e28c5e7f07adab884c676..a27bd4de4066e1e2a4e5a44646dd7cb0092e9fc8 100644 (file)
@@ -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.
index 9d552aabee0cfa0b7c4e0b816c686086684d354c..0e743f059561a860eaa45deaeabb4ce313261883 100644 (file)
@@ -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 (file)
index 0000000..40303f8
--- /dev/null
@@ -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
+
index 0b9d609fc525953780cd1f38712d34e0c9f1c044..ae1002d4b132453ae400b764a69f850c3df165dc 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS)
 
 all::
index d157c12bea4b13065eb494f3cb07cff227d29b6c..60dd52a5ab792c1787617a55731b966a194cb1e4 100644 (file)
@@ -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
index c21053d496c9ee4e98ce09d37d2c3206567df2d5..9133a4a5cce879aa66b513db89936718b42f369c 100644 (file)
@@ -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
index 65e646d7b0ff56c41475892e4f7dcbed78a8bd09..fda52fe6eae4777bd79d0912bc1be8df768ffd97 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 PERL=@PERL@
 
 .SUFFIXES: .plin .pl
index 84277a42d0d483ac1b8312a1b76cb92f784ca0e2..eda5f77df25dce42ba492b10682a30aa96644a53 100644 (file)
@@ -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
+
index c5d3d4cc58c2832f3074187a34f0cbc802707762..48b5e6369783b4348cf999f73be44edeaff4492c 100644 (file)
@@ -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
index 6c6cf630b3836a49d4b1f8eafd3031dfeae54c01..233fd8b6d6685c27bcd68707b89ef5b11a75c60a 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) $(TCL_INCLUDES)
 
 PROG_LIBPATH=-L$(TOPLIBD) $(TCL_LIBPATH)
index a4453cad24cd13a24b40f7ab75ad1b81b837ce69..02b4088bd5c6f4567d29b1c412cdd6e818674c58 100644 (file)
@@ -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
index 395d92ea95aa81af77ee1871e98303a0e7e9d15d..2a3106e18f926a0542e474dce466d0e44704b656 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) \
        -DKADM5 -DNEED_SOCKETS @HESIOD_DEFS@
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
index b489175de8bd3b46fd2f96e48422f848ff5a30da..5c678cfda60388d4507ca351ddda4d8530a0ca04 100644 (file)
@@ -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
index dbb2454da3ae05fceb29664004e3b8dbe26fb331..360ad350bc5e720b7d25253711a5270d81096527 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 #
 # $Id$
 #
index aa65ef1d25891c56414f0ce7d986da8e500b5148..c8ad938031ab7cd846d7e7097d6d8e50ef941221 100644 (file)
@@ -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
index 9d9a9756b019e8bd7606641250ff52514fd2858b..10f80a01c9fdf954ec37c55115ca0f8b67940e9e 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index 95e0eeddd9219908645d674eba9f45e1c09cf25e..efb48763d2389fde95dd560e88e54a5f531aca49 100644 (file)
@@ -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
index b21d7b6315fa3740b6735c9d357605b586092087..e063becb22c8650241ad25023cfc7881b058ccff 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)
index 75aadab26e7d77be2e1c2794d13473d80dcf4276..9435ffc9b9bdef117c4406fcd7dcf4ce3d85a6b7 100644 (file)
@@ -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:
index 05f991d4f5893d2866e8f03ec42e36f106fec300..2a466917f6994cae207208565f5e7a937f526772 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 # Copyright 1994 by OpenVision Technologies, Inc.
 # 
 # Permission to use, copy, modify, distribute, and sell this software
index 27f5acf3c5a0f1385ee535420a2e1a2c3c103259..5eb39457db13f87e95613c93d51555f79589197f 100644 (file)
@@ -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
index 9b0fe776ae1e376b99700122ce6bca7ff638dbce..35b5b40480fbfafc8348f4691ba3b725cc7aaaeb 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..
index 80c359eb35abcf7bb8a5506ea73bf435f6cbeda3..3b36dd1cfc94807c965af53ab1f835bb0e03c556 100644 (file)
@@ -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
index efeba0dbe950a3e283d20aaf9d2cee8b3955cd29..ebc03cb36db4a47982853ad6fe5d71252d10294e 100644 (file)
@@ -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.
index 0cab7cd5c9d2d39696993064d46141e058a2265f..3e1eaba8cd543836f06eb8ba388750a90f2ae861 100644 (file)
@@ -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 = ..\..
index 04d628e18ac95655ab39ac51f553737c0be1bcda..ba9300cd9f21c5cf675e183880921ace6d60e941 100644 (file)
@@ -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
index c903fdd9e1992319843584c651e5e2378b697a3c..55707c38044271ca200e60a5d12e82934c5f7eee 100644 (file)
@@ -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
index 81bf5d8d51572e69987eff854be9177c445f3890..02379bee52d1604a2fcfd17b1999d8e9e0317c68 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index 2e816ff6fce4fad81262b65ba1447395c026a30e..848b01264b6d95521b7c4bb4e3398e7aa2e9e1e8 100644 (file)
@@ -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
index 37bc204ed76c2a1adf93af3296746d9f328f86b9..3c7df6460729c8855a6edc5838ec31be1057968f 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index bcac6ed4bd838da798d823b177bbce1d9982ea5a..8ee89d5c5b52f9d1fc3e5d79ca3e2599be3346e5 100644 (file)
@@ -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.
index fa92b4ccd229ed8fb23be1e071f478975d60b622..9c6cb96acb15bfd78e7c88eafd7286c831de9f31 100644 (file)
@@ -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)"
 
index 130adc451bcebddb4550b6002a85a9ea5bc94500..8955638a26bcc241a617510b02f949c507e4999c 100644 (file)
@@ -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.
index 03cc6ff96d32bed99995e42e246ae44b6a754341..267f3ca73090c4a2263950e43d02fea729543cc7 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
 ##DOS##BUILDTOP = ..\..\..
index dcdb92300f201ce2ab8c4f5f02f99dac698cd915..94d840ae14196e00d2184e1d6ca0658b85744a76 100644 (file)
@@ -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
index 2ccc99bc137017b3aba1d91a5fa0621aa91d188f..39da75a864486351e9fd457ec920c64ea9432ea7 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index 154f7b679846f3ca11bcbffc4e7d49a3c39b5d80..d80dbcc9d24aa589db77ac25a10d6e5bc1aeb209 100644 (file)
@@ -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
index 20f2ac906d40ffbbae8768c2514bba7eccbfef57..72276f9e2c11adba4f411a73e995b7178fcc4b4c 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../des
 
 ##DOS##BUILDTOP = ..\..\..
index 3951f45bf0e39a1be1a56219a4c89b505b2832ff..ed2228606c97720834d07ebafd540bb763b52762 100644 (file)
@@ -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
index 64f3a4da43bd3c1cbea5981d570f03d4f143dd72..55e5aeca553a88d70b52f19bf44d847f1a67fa82 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) -I$(srcdir)/../crypto/des -I$(srcdir)/../../include/kerberosIV
 
 ##DOS##BUILDTOP = ..\..
index 1aad2af777436935c4237c8c29dbf9f385ad019d..de21f386764087309282f04a56818dda0bac2dc7 100644 (file)
@@ -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
index c4e311083fb213a3022d135f63606636f0e2817a..92129e0b75186a49b85a5b018415120fc69c18d4 100644 (file)
@@ -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
index c0fba38b55fe24bb781723fa0b76d3c094b5f365..2de4871947ac09876541a5575b5b70ce0b3c7d5f 100644 (file)
@@ -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
index 3e9021a0450b05e8608f316c7408a4cef231b809..14842021b2da7d94ca4f376fc365fb761d3fa2f1 100644 (file)
@@ -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
index dbe0f8b67f14b63f20ee0da20942cce2b0fe703f..feb41ff667f85d4b2d30440785e4ed73424d31d4 100644 (file)
@@ -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 (file)
index f879d41..0000000
+++ /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
index 1626ec2cfe3394e399d269bd8cf87e844bbeecd5..899ac007a5182b82736f14f60b00defbea20b68d 100644 (file)
@@ -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
index 2a16c7e4d7404eb824ceff2d0a730d87ba287c0a..083529a557983b13deaf07cce23d0177d47f7266 100644 (file)
@@ -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 (file)
index 8de9aa6..0000000
+++ /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
index 35c48afca58d69e779cb118138f6f690fdc46c16..b0f08da62afca78cbde0a13b330490b7f42c9afa 100644 (file)
@@ -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
index ae86a4fa7ebee8c4f9fa2da3e66a107b829430ca..33faf89103ed22d08bfaa8c8d1ee82a094e0fafa 100644 (file)
@@ -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 (file)
index bd9b4db..0000000
+++ /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
-
index 7f3afaed1246177cbdb1e386a19c74e49c58cd9a..fc26f0400d905267c53ec069632903c292eb6f29 100644 (file)
@@ -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
index 06fcb28d8253faf419188b1ca3cb8cb47ca6d7c7..d12c9ee7fbd420b50b40dbd9ce1133cfa7f948b4 100644 (file)
@@ -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)
index a3d4ab55e39ac9f383d8b1cf535ddb705c9b77b4..7dabe8aaf4f97a606ed9e8697defb113024945dc 100644 (file)
@@ -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
index 230b9cb51422edeff5b7cbc36d73e036bb4c1eda..163518ad70219cf46898afe5d11e0c5d34a61fee 100644 (file)
@@ -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.
index 8fbb06ed9f6ea568a2aac0be033b74dbb7b9864f..ed4fa2782d26b7f62c5930a23d45de4313477753 100644 (file)
@@ -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
 
index e3d65e2dc1f4c0238d519ff30a19904d72e1931c..9fef2a6e72e7121cbc245193943b1e7fdcfe3b94 100644 (file)
@@ -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
index e53d5887b06eb6df3db8541be5326296ebb3367c..9900ddc2330b1e993e36115d22fcc4ee61627a91 100644 (file)
@@ -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::
index d4e9736188b0bef361add678c9ceacdaf537bd6f..7594455bef3bd4ba1262ff7fb81814021d3b2692 100644 (file)
@@ -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
index f228eebc49224df5340f894b32d3136f710ac555..67fb8e75930547362671b8e0bfb0c2a1ccb2abf4 100644 (file)
@@ -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
index afd953d5ad2ea9ae8d89cfca1d971e9268873b8b..4fb1c9f95fee4b153eab6134a270ef90ea7c2b54 100644 (file)
@@ -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.
index cf53feff67b036b2dac17eca775c7584a99ac425..1b04cd4a02675cafbd55eaad8bbabfbfec37fe42 100644 (file)
@@ -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::
index b0c69ddf5002e6cfdda9775290bb72a6f0cab0dc..6730797a8d1de85b327616e7c5d292521dee6399 100644 (file)
@@ -28,6 +28,4 @@ esac
 
 KRB5_BUILD_LIBOBJS
 KRB5_BUILD_LIBRARY_WITH_DEPS
-
-CopySrcHeader(server_acl.h,[$](BUILDTOP)/include/kadm5)
 V5_AC_OUTPUT_MAKEFILE
index 3f9b54e26021c6d875048e2fcf72ea2a3850f462..659b2bcdd53f143761fa3eb1ac0b53f39349c8c2 100644 (file)
@@ -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
index 96289f896158ffda13c8c8176cb436b17b2b78f7..9030139486289c2b5fe1eb5ea662bec5218d3cac 100644 (file)
@@ -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)
index 4923b70bfa076a853e77697c4afb59113eb22e9a..bea687a753f37b5321fc08ef8ecd11e06437a61b 100644 (file)
@@ -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
index 370aa428e135335becbb687cae9e2d8f5332d114..113c319b8386d853030154d956329ca3c11ede45 100644 (file)
@@ -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 ;
index 04a3133600f134fdf53a92134cc2f416c7d63b4a..878169140c6ee2296fa7a1cb2462d67db7253970 100644 (file)
@@ -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
index 5a4fc78645168d809924966de697163c33d36c3e..410cca96097d585fd4dfbc130b2737a04a1e413d 100644 (file)
@@ -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
 
index 10acfeda616f7453dd240c6a292bbb9a1fa35562..b79215db9c9d4cc58ba2c5245b8a65078a1debb1 100644 (file)
@@ -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
index d7a189a9582d7e51a4d1c38fe97904407e0e6181..acf26ac4c2e8c64a93458f841fe1ecfe6706de46 100644 (file)
@@ -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.
index aecf5b8aeab4bf2467bdbdd55785e40537544e88..fa6761a2603cf758196a0064a7152a4e2535709b 100644 (file)
@@ -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
index f018642ac967ed4c6a43795286a29ba23d23b51d..63c9715fb56a8b98a1a4c581608031e8a82e3f06 100644 (file)
@@ -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
index 7c06c62c4ef1f0faa28c1b0d0c7f78efa6d8de7e..a03e0372c5b753a8264fe37d7add15ea12e73f18 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS=$(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index 0ca88f34fa7b23b7b0ab9d25323537777d6829a6..226323f276aff50ff2b44c50ce212e8a27dc63e0 100644 (file)
@@ -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.
index d8824ebfb6c72a5c0f5f2226e1661388f6b7982d..18cbc53b9198dc5b2aa9b8edb8d5540aa9146a5d 100644 (file)
@@ -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 = ..\..\..
index f38d5062f01e62926e86f0bf9cfd666da4b9c36e..2807b7400874bda7fcfe2b7e26527a2df858c02c 100644 (file)
@@ -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
index 7d8b7ce15f5c26d397fabe7204d354ce309e0c8f..105579e6deecc8c96359eb896c90ba2504fa5c9a 100644 (file)
@@ -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.
index 3def8f1ec6d7604ed3295c33a9e629f36eab25a8..86be7027fcd8c6d68821acf1ca6b242f36d5b49b 100644 (file)
@@ -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 (file)
index bbd406d..0000000
+++ /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
index 064474728c3376e491c192bc360d2ef428a8d460..523983a0203fba6daef86d11c12e1f84bff25550 100644 (file)
@@ -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
index 41694a02a3d667592cf2448a37e377b5f7f0353f..7f5bea6197166ea50f659ab21047eed93d41d755 100644 (file)
@@ -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 (file)
index 106deb0..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
index f8351fb8d51cfd679ffbec2022d5c28dac13e204..13739ebfb5ae4ebc109dae572afa1e0353db7f59 100644 (file)
@@ -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()
index 7ae76451e4ee0c3f3d0501ad4c6261b75a6b4f61..d2eeab85909fe53bfa3e9566d6313c2c93c38757 100644 (file)
@@ -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 (file)
index 106deb0..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
index eeb2b8a0fd7ad0a7c83290df0bb78a39c464d5cf..245746fa866941ff7ff60d07028cef8235bde0a8 100644 (file)
@@ -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"
index a3d187665479eabdb980782447c282734299fb4c..6fd14ef79b44ede49f3003006b2c83a26c400f79 100644 (file)
@@ -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
index c17991fa98a018b510833f6816f5cae6588a78e4..9a509674123b47692c9e1e562c1b6ecc99e541dd 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index ec0dcb41c8cbde9a1c0e070a897e70daa80f2f38..6c7daec5d9cf641e8384890ead3da037d7b438d4 100644 (file)
@@ -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
index 3f0eb099a87cc1e0ecd90a6b5076a00c7355e3f4..7aa0bec0288e7a0d3e3bed84643f7fe89c018d85 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index d5b1a876c33233433b9d2415a5e04694592305d1..4e627f3f79c91912148e5b600d4c64315b752411 100644 (file)
@@ -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
index 336394e88da3619e584ac7e7456dc431338c995a..8dda51c5efc8cf1a9ec1eda00aa2787aecc3dc29 100644 (file)
@@ -1,3 +1,7 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
+LOCAL_SUBDIRS = file
+
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index 88579b5b1037e67739f229ff253477885f8eec74..fbc2e544fa844aa289ce4859036c6666ade6b474 100644 (file)
@@ -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 (file)
index 0000000..78d6801
--- /dev/null
@@ -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
index ded3ff546c10f6cfb47d7a9f62f0c2b27bac55aa..78c4addf0652b760ee18a2f3d34a955cba6c2ce3 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOSBUILDTOP = ..\..\..\..
index 7eff1bc8b9660aaf987e85d3eb16608bcb7c71f9..b643c05fe76b1c8fc47c7e7869542d0132422868 100644 (file)
@@ -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
index 6e40e9bf70c469adce60a85305d4be7d297b0621..edcfebcc83c5a9f1e97103f5e8f11709c2c6f267 100644 (file)
@@ -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
index a4362ba42c2e2564fc1beb9c76f99705da946b3c..39e909cd297b5fc6d4be03767ed4578f1bb430a6 100644 (file)
@@ -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 (file)
index 106deb0..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-AC_INIT(configure.in)
-CONFIG_RULES
-KRB5_BUILD_LIBOBJS
-V5_AC_OUTPUT_MAKEFILE
index 0a99bfa2b00a55011508c17997ede8850eb90461..957ba4397c048b9e10b951a6f0fac52ce52c7a68 100644 (file)
@@ -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): 
index 87f93ea19bedc17bb4b7e88059da6c7e2cdd39ec..41cc0a8b2bfd870ea1037ac90713e3ac48dee26b 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 RUN_SETUP = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
index e95b95eb380143cf587699abd21c239abf9f0fb9..0a0e7bb20b163d532008917ddb2fecfdf4e0cb01 100644 (file)
@@ -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 ->
index aeea59e761c6f612834cfbe2322bafaf3a6f8a0c..61c6ded8b824851271e8f9bccf35ad7bf0c7833f 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 KRB5_RUN_ENV = @KRB5_RUN_ENV@
 PROG_LIBPATH=-L$(TOPLIBD)
index c60660f16d93625da9f2729582ab87d1058432c9..b0f7edb47af50732b75707638600d9d951858735 100644 (file)
@@ -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.
index 0859caa9d00e6ace57bfcff14dbc7614b0c51288..d81d0fbd89e1fbeb7172fc237ca80880ec6a2be5 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index 5a17d8ec4941c9eb98b371cfe65cce4ef268c08a..e63a9e2c1cd226d970f0b669a08e039f46c563d8 100644 (file)
@@ -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.
index efcf3e4fdbe8b91e43dcb8cd861443b5b43ebd6b..21170a0627da3e151e86d3dcb338766713463b88 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS)
 
 ##DOS##BUILDTOP = ..\..\..
index 1666316bf5a8f46ff3b8d649d2f98a49b0c35f80..914f76b28983fa2d5692c1215039f59bf21183c2 100644 (file)
@@ -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
index ecab500328e07284b0443f7339054af8b6b62d5c..26ba3150ef00be6561d47de181e5e3aa33b3ddbf 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) 
 
 ##DOSBUILDTOP = ..\..
index 8c200ef7000bf04acbcf8c8e2dfb8a5140be30b4..75e23af1d3551df4c85726e0206947b00e78f0db 100644 (file)
@@ -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.
index 9a61ebd49aa10bb55fd38a415fa6a49a01839000..bf0ffff75eb793bb0f64d2615efd292dfc479d27 100644 (file)
@@ -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
index 87130bf74951ef50a75abb893bb002d97bc5e9ae..d89148ea17a87d2d49894ddeff5b11d92ce0eb51 100644 (file)
@@ -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
index 62225f225e9c02d98e3064ea615224ae10e3b267..2d7a2beb2cf78479150c544425d6d3ace774e4be 100644 (file)
@@ -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
index 95cf25206d6dcf9f878813f51978ad1cc9505fec..ec2ad9e6fa1b9739998950c167dead849abd3000 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE) -I.
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index e1a72be8026d1abc60f295375045618f413057bc..dcb4e6dc2abf61bf5a2750bc688d2374a0d70c73 100644 (file)
@@ -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
index e14e9213876794dd006290199851f1af989aae9f..dc07e3a8c6fce1ea2412c8e3fc0a58dfbf409a81 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)
 CFLAGS = $(CCOPTS) $(DEFS) $(LOCALINCLUDE)
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
index eecbbff61321a9134fdd6ac7df0b6e23e6aa6b1b..4fa0b127955ce463493dbfbb18178ed9a5a20eb1 100644 (file)
@@ -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.
index 9a5bca5f83d62689701542add6ca1f0c3e8c5f58..944288406056ca37f04d861a3dd6554cb75a8a15 100644 (file)
@@ -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@
index ca980084b50c3381a27f25f7d16073d81e426049..54f988a24675bf027a4e329202e0c77c846b085d 100644 (file)
@@ -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).
index 0c5b93ab2d2803af801c5ec9c7e682ce67b5c9dc..efaa54aa1ba00980df86b7baaf4a2a894534d1a5 100644 (file)
@@ -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 (file)
index e75a82c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(krb5_encode_test.c)
-CONFIG_RULES
-KRB5_RUN_FLAGS
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index 258b171418ce64e52d84137f068fbfa63ef48182..ea62f3ee0e3ec8c3e657a73ff5dbbbdb70f9c3c4 100644 (file)
@@ -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
+
index 86f6e3a73981266097bb5ccc8c958424fd400c5a..1ffc4911df65a2eaeae36db78e76beb0cfdd0740 100644 (file)
@@ -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.
index 72773527c32d28bfb18c92f4fa0d18fd48652f23..256a2a8b5b5e493d1a727a25aab14fde6ee34b6b 100644 (file)
@@ -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 (file)
index 2f106fc..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(kdb5_mkdums.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index a0e52c43b400b135fbd16e1cc72d507177cf263e..32abbbd0a967fd37b0400b70ef8c59c10c7e6d33 100644 (file)
@@ -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
index 6a75a5f4e6b5ac61b7b940c0501bf5256156bc73..decd462655740e09d9a30e6e2fba61f557e51139 100644 (file)
@@ -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 (file)
index bdf3621..0000000
+++ /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
index bfdbc51ead5a5591fb8b23510d05e38c73158294..be6b3b71ba313fcc396e7b6128cc405c9a90af6d 100644 (file)
@@ -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:
index 6e75130e924d128282a56b7ef0ad074d0e471c97..ec48ab976098f98a54e6c286ed9ca15957266ba6 100644 (file)
@@ -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 (file)
index 45cdb51..0000000
+++ /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
index 865c25f5ddf72ea9e73cf94518c5c420a3b0f5a2..f39421f30222946c6fbdcf56dd54ee82bcc27694 100644 (file)
@@ -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.
index f4afeebbc2a695b92d4c859590c91a1ecaca56a3..d6317dd6883ff366a4f5adde3948a25de144c771 100644 (file)
@@ -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 (file)
index ee62c08..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(kdc5_hammer.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index ba8cc14d1d2055e5522ee07e1d4e084b8254d139..6af715a764e0e1b572251d9b9f38665c4d0167d8 100644 (file)
@@ -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
index d9f6b34a6283702e845caf869e4bf4b5a4898b52..33a9c45dbb5e8d1691fe48bc9f08aa2614202293 100644 (file)
@@ -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 (file)
index 5a6f90d..0000000
+++ /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
index deee45301ebe559c5711179e91470635489366c6..560645cfde9b14b2d83878aba6bbe4ff227f4adb 100644 (file)
@@ -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.
index afc353938a85770e1421a28ddce6d3e9e862d8be..32e22fc54a796bf71956b9e2dcc3c359159f0ad7 100644 (file)
@@ -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 (file)
index 711a78b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-AC_INIT(kdb5_verify.c)
-CONFIG_RULES
-AC_PROG_INSTALL
-KRB5_BUILD_PROGRAM
-V5_AC_OUTPUT_MAKEFILE
index 1d4f93a1af0fc71bbfc93c2fb64845e268efaefb..2d3fead10cd6cbb9e2de9206dcababfacb0c1711 100644 (file)
@@ -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.
index 90b48a8d706150232108658c96d22d51af3ce794..139228d5475810c0d060c1ced46af55bd3a9c426 100644 (file)
@@ -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::
index 1d35d50cb8e55f3df877b6d5819a7c4c72cd6e37..433c6ca77298778520ab1be251b1869548f0867f 100644 (file)
@@ -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.
 
 \1f
 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: Deuteronomy\7f208175
 Node: Old Macro Names\7f210839
 Node: Environment Variable Index\7f213888
 Node: Output Variable Index\7f214890
-Node: Preprocessor Symbol Index\7f219813
-Node: Macro Index\7f224745
+Node: Preprocessor Symbol Index\7f219573
+Node: Macro Index\7f224450
 \1f
 End Tag Table
index 60180a022ae63fac914ae8e083e37e111080a1eb..b021a4c993f99ef57a09c5a2a0e2e6c9784fa4ab 100644 (file)
@@ -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
index 302ca71a3f9aac441b85378050557661330851cf..ba97bdc960e4359e8086d8d97cadc06ecd90e3a7 100644 (file)
@@ -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
index 015c04d4a986a3dccbc0f0d797b63cec99b44a87..492eb562ef0599ac5e54b90cbef7dc030ff4b4b0 100644 (file)
@@ -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>
index 293e9b4f2bdeeaa8438ebaa84de19a8f2842a4a0..d8ef450697a9052d86711b914066fdd6759ffdde 100644 (file)
@@ -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::
index e4db7dbfec33e5201f2d1502bc5d48a9b69ff795..7b4770c1bc69bcc4bb45cc41ab72851f030dfc33 100644 (file)
@@ -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
index aafa770c5f4e617bf8c7eccc7ef2d76ee4b6d6e6..66483d139244eb8616753a8ff6afbccff1276a55 100644 (file)
@@ -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.
index 9f6afef194ef1b69bb7304524daefcf89816d91d..4c615be55d60e50075f1c15f544f98997914bc66 100644 (file)
@@ -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.  :-(  )
 #
index 427d1adc0a0711ab4e9caa1ab068e601f875a234..43c679ffdc91d9795339c73202e198955650746e 100644 (file)
@@ -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
index 0a1bdf04f15f5a18ad92bff8cd266029a3371f2e..e9bbb870b503f8a22f9ddd444ca34d582e396bda 100644 (file)
@@ -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,
index 36b07245c09795df5517dbf3d19d166c4107281c..80735e766399c8e59793d8e0577dea9f293dc660 100644 (file)
@@ -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)
 
 
index 8b27253c8b8f8b0998d227fc46d93a5f689f23e6..b9245edceaa45896c2d7cac2d969960b0f955744 100644 (file)
@@ -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
index 39b963047331e42e4be951871ecfd829d4189b5d..20ac3de4a213ceb88e039d51a82e6b43d99ae361 100644 (file)
@@ -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
index 9901136c393978f95c05a45792fce4b269b5fd3a..05862ac7a6075fa90dc5e42e94bac31f3ba9736a 100644 (file)
@@ -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
index 95d77db1c625fdb5e8ba6151d38cf8a47d6e381c..71adc940d5fe61d8557e7976638fcae04af3ea93 100644 (file)
@@ -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
index 18ec50e8baaba3ebb7ce5624c4e781174518bb69..e6583a6636dd7fb1974ece3f72b9cb74f9babb2e 100644 (file)
@@ -1,3 +1,5 @@
+thisconfigdir=./
+BUILDTOP=$(U)$(U)
 #
 # Makefile for building a standalone send-pr.
 #
index cecc9e3bc1e09387218dd66f2dc292c0f8fc73ce..6313d2b732e5719227ccd70b63b3239cc8468209 100644 (file)
@@ -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.
index 405ceeb14c67797188ed3313664018414a59a419..9692689fc24b5a6a6ba27732b6315c6763c7d86a 100644 (file)
@@ -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
index 166f76debc0ebf6b8c233f9d93237cef8d07946f..b47085e982c5db15104f4b6acbb3c0df0320ae38 100644 (file)
@@ -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();
index 7701bcb40c9874ac37f26ce60c05b7f5c7346d42..0da56d2aaeda2be61324db6222449bfc2595f0be 100644 (file)
@@ -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
index f1941fc84e8e5cf527d55b0dcf611e8871e8e82f..0727492cff490de7df39759833306cfc980b9133 100644 (file)
@@ -6,7 +6,6 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include "mit-sipb-copyright.h"
 
 #ifndef HAS_STRDUP
 extern char *strdup();
index bfe69f120bd4edfd9ef8790f43594142271cd5ed..5b10356ce77c54e1590620d05a4e885c4241b0c7 100644 (file)
@@ -6,7 +6,6 @@
  * For copyright information, see mit-sipb-copyright.h.
  */
 
-#include "mit-sipb-copyright.h"
 #include <stdio.h>
 #include "ss_internal.h"
 
index ca3197d8b9e9149e3f8d7e1c61a7bd3d1f06ae54..5f3df3f3ae17509e58b388c907fc00844f278b57 100644 (file)
@@ -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;