Makefile.in: Set the myfulldir and mydir variables (which are relative

	to buildtop and thisconfigdir, respectively.)  Add a MY_SUBDIRS macro
	set to '.' to indicate that there are no subdirectories to be
	processed by the Makefile.

configure.in: Removed and tests moved to parent directory.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11035 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index af894dad1509a2800e028cc1ef7e6f2d3e9b1425..a467f996e36007665732daa72812b58c97e555cd 100644 (file)
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,12 @@
+1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * Makefile.in: Set the myfulldir and mydir variables (which are
+               relative to buildtop and thisconfigdir, respectively.)
+               Add a MY_SUBDIRS macro set to '.' to indicate that there
+               are no subdirectories to be processed by the Makefile.
+
+       * configure.in: Removed and tests moved to parent directory.
+
 1998-10-26  Marc Horowitz  <marc@mit.edu>
 
        * kdb_dbc.h, kdb.h: update kdb api to be compatible with the new

diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index f126ca6ed1e0ab35f36b8a15a0b3f12f56432d97..eaeb77f6544eec4eab4e66f9fbfcdb4abf6d5f99 100644 (file)
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -1,4 +1,7 @@
-thisconfigdir=.
+thisconfigdir=./..
+myfulldir=include/krb5
+mydir=krb5
+MY_SUBDIRS=.
 BUILDTOP=$(REL)$(U)$(S)$(U)
 KRB5RCTMPDIR= @KRB5_RCTMPDIR@
 

diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
deleted file mode 100644 (file)
index b007dbd..0000000
--- a/src/include/krb5/configure.in
+++ /dev/null
@@ -1,115 +0,0 @@
-AC_INIT(kdb.h)
-CONFIG_RULES
-AC_CONFIG_HEADER(autoconf.h)
-AC_PROG_LEX
-AC_PROG_INSTALL
-HAVE_YYLINENO
-AC_CHECK_FUNCS(strdup labs setvbuf)
-CHECK_DIRENT
-CHECK_WAIT_TYPE
-AC_TYPE_UID_T
-dnl stuff from config.h
-AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK([tcsetattr],AC_DEFINE(POSIX_TERMIOS)))
-
-KRB5_POSIX_LOCKS
-
-KRB5_SIGTYPE
-
-dnl
-dnl
-AC_CHECK_HEADERS(stdlib.h string.h stddef.h unistd.h)
-AC_CHECK_HEADERS(sys/types.h sys/file.h sys/param.h sys/stat.h)
-AC_CHECK_HEADERS(macsock.h xom.h)
-AC_HEADER_STDARG
-
-dnl check for ANSI stdio, esp "b" option to fopen().  This (unfortunately)
-dnl requires a run check...
-AC_C_CROSS
-AC_MSG_CHECKING([for ANSI stdio])
-AC_CACHE_VAL(krb5_cv_has_ansi_stdio,
-[AC_TRY_RUN(
-[#include <stdio.h>
-int main()
-{
-  FILE *conftest;
-  if ((conftest = fopen("conftest.dat", "w")) == NULL) exit(1);
-  if (fclose(conftest)) exit(1);
-  if ((conftest = fopen("conftest.dat", "rb+")) == NULL) exit(1);
-  if (fputs("testing ANSI for stdio\n", conftest) == EOF) exit(1);
-  exit(0);
-}],
-krb5_cv_has_ansi_stdio=yes, krb5_cv_has_ansi_stdio=no,
-krb5_cv_has_ansi_stdio=yes)])dnl assume ANSI in cross environment
-AC_MSG_RESULT($krb5_cv_has_ansi_stdio)
-if test $krb5_cv_has_ansi_stdio = yes; then
-AC_DEFINE(ANSI_STDIO)
-fi
-dnl
-KRB5_CHECK_PROTOS
-dnl
-dnl
-AC_MSG_CHECKING([prototypes in structs])
-AC_CACHE_VAL(krb5_cv_struct_prototypes,
-[AC_TRY_COMPILE(
-[typedef int i_t; typedef struct foo { int (*foofn)(i_t, i_t); } *footype;],
-[],
-krb5_cv_struct_prototypes=yes, krb5_cv_struct_prototypes=no)])
-AC_MSG_RESULT($krb5_cv_struct_prototypes)
-if test $krb5_cv_struct_prototypes = no; then
-AC_DEFINE(KRB5_NO_NESTED_PROTOTYPES)
-fi
-dnl
-
-AC_MSG_CHECKING([void])
-AC_CACHE_VAL(krb5_cv_has_void_type,
-[AC_TRY_COMPILE(
-[void x();], [], 
-krb5_cv_has_void_type=yes, krb5_cv_has_void_type=no)])
-AC_MSG_RESULT($krb5_cv_has_void_type)
-if test $krb5_cv_has_void_type = yes; then
-AC_DEFINE(HAS_VOID_TYPE)
-fi
-dnl
-
-AC_CONST
-
-dnl Word sizes...
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-
-dnl then from osconf.h, we have
-AC_HEADER_TIME
-AC_CHECK_HEADERS(sys/time.h)
-AC_CHECK_TYPE(time_t, long)
-
-AC_CHECK_HEADERS(netinet/in.h)
-
-dnl
-dnl Determine where to put the replay cache.
-dnl
-AC_MSG_CHECKING([for replay cache directory])
-AC_CACHE_VAL(krb5_cv_sys_rcdir,
-[
-for t_dir in /var/tmp /usr/tmp /var/usr/tmp /tmp ; do
-       test -d $t_dir || continue
-       krb5_cv_sys_rcdir=$t_dir
-       break
-done])dnl
-AC_MSG_RESULT($krb5_cv_sys_rcdir)
-KRB5_RCTMPDIR=$krb5_cv_sys_rcdir
-AC_SUBST(KRB5_RCTMPDIR)
-
-
-AC_ARG_ENABLE([athena],
-[  --enable-athena         build with MIT Project Athena configuration],
-AC_DEFINE(KRB5_ATHENA_COMPAT),)
-
-if test "$KRB4_LIB" = ''; then
-       AC_MSG_RESULT(No Kerberos 4 compatibility)
-else
-       AC_MSG_RESULT(Kerberos 4 compatibility enabled)
-       AC_DEFINE(KRB5_KRB4_COMPAT)
-fi
-AC_PROG_INSTALL
-V5_AC_OUTPUT_MAKEFILE