[3162] in Kerberos
Two Imakefile changes for Kerberos V Beta3
daemon@ATHENA.MIT.EDU (Charles L. Athey III)
Fri Apr 22 14:05:49 1994
Date: Fri, 22 Apr 94 10:51:30 PDT
From: athey@lorien.ocf.llnl.gov (Charles L. Athey III)
To: kerberos@MIT.EDU
Cc: auth-pilot@es.net
In some previous messages the fact that krb.h, etc. were not found in
lib/krb5/krb/... was discussed.
> From grossa@sdsc.edu Wed Jan 19 22:04:53 1994
> Date: Wed, 19 Jan 94 21:48:45 PST
> To: tytso@mit.edu
> Subject: Re: Missing header file...? (kerberosVb3)
> > In lib/krb5/krb/compat_recv.c, a file named "krb.h" is included.
> > I looked throughout the distribution and could not find it. Can anyone
> ...
> This doesn't fix all of the problem as kerberosIV/krb.h includes
> kerberosIV/des.h and kerberosIV/mit-copyright.h . I went into
> include/ and made softlinks:
Ted later wrote:
> From tytso@mit.edu Thu Jan 20 12:24:53 1994
> Date: Thu, 20 Jan 94 15:01:14 EST
>
> Either add softlinks, or modify krb.h to reference kerberosIV/des.h
> instead of des.h, and kerberosIV/mit-copyright.h instead of
> mit-copyright.h (I've chosen the latter course of action for our source
> tree).
>
The problem with this solution is the you must have a "kerberosIV" directory
and we use an installed version of keberosIV. By making the following changes
I found that the it works well and is a more generic fix. I just added the
KRB4INCLUDES to the "end" of the include lists. It must be added to the end
or version IV includes would be used instead of the version V ones for files
like osconf.h
In lib/krb5/krb/Imakefile:
*** Imakefile_old Fri Apr 22 10:45:09 1994
--- Imakefile Wed Apr 20 16:02:18 1994
***************
*** 22,27 ****
--- 22,29 ----
# or implied warranty.
#
#
+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) $(KRB4INCLUDES)
+
NormalLibraryObjectRule()
OBJS= addr_comp.o \
============================================================================
In the lib/crypt/des directory if the s_table.h, ... include files are not
present when makedepend is run, ie. a make clean was done first, then the
makedepend runs with errors and --then-- the .h files are built. The
following change makes sure that the .h files are built --before-- the
makedepend is run.
In lib/crypt/des/Imakefile:
*** Imakefile_old Fri Apr 22 10:47:13 1994
--- Imakefile Fri Apr 22 10:24:54 1994
***************
*** 69,74 ****
--- 69,79 ----
includes:: depend
all::
+
+ depend:: key_perm.h odd.h p_table.h s_table.h
+
+ depend:: fp.c ip.c p.c
+
depend:: des.c $(SRCS)
SubdirLibraryRule($(OBJS))
***************
*** 130,136 ****
./make_st s_table.h
NormalLintTarget($(SRCS))
-
- depend:: key_perm.h odd.h p_table.h s_table.h
-
- depend:: fp.c ip.c p.c
--- 135,137 ----
Charles L. Athey III
Livermore Computer Center
Lawrence Livermore Nat'l. Lab.
P.O. Box 808 L-73 / 7000 East Ave.
Livermore, CA 94551-0808
(510) 422-7211
Internet: athey@llnl.gov
Compuserve: 70670,3361
Applelink: athey
