[464] in Kerberos-V5-bugs
K5.3 Imake and Configure Suggestions and Solaris 2.3 Aix 3.2.4
daemon@ATHENA.MIT.EDU (Doug Engert)
Mon May 2 12:15:07 1994
Date: Mon, 02 May 94 11:14:52 CDT
From: "Doug Engert" <DEEngert@anl.gov>
To: <krb5-bugs@MIT.EDU>
Cc: <auth-pilot@es.net>
I would like to report the following bugs/suggestions for the
Imakefiles and config files used with Kerberos 5.3 beta. Attached
is a context diff file for these.
I have built Kerberos 5.3 for the SunOS 4.1.x, and partially for
the AIX 3.2.4 and Solairs 2.3 systems, using a common source. We
use the X11R5 lndir script to point to the common source, and use
install with DESTDIR= to install into a different AFS directory.
We then use depot from CMU to build symbolic links.
The particular changes included with this context diff file are:
o Separate the install from install.man. This helps in the
install process especially for testing.
o Add a APPL_BSD_DEF define which will be set in the site.def
and used when building appl/bsd
o Set a default RanLibary to /bin/true since if ranlib is not
needed on some system, Imake does not build a good makefile.
This showed up on the Solaris 2.3
o Remove some spaces in calls such as:
Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
which cause problems if you use a DESTDIR= for install since
the space becomes part of the path after the DESTDIR part.
o The sun.cf file has changes to build Kerberos on Solaris 2.3
without using the bsdinclude or bsdlib, i.e. as a SVR4 system.
There are many changes needed to the code in addition to the
config file changes. More on this later.
o The .cf files defines a OS_TelnetName which is used in
building Telnet
o The site.def file defines a DESTDIR which must be overridden
during install. #define DestDir /tmp/You.Must.Define.DESTDIR
This is a crude way to do it, but since we must have the
DESTDIR because we build it and install it into AFS it forces
us to do the right thing.
o Most of the site.def file is local to us, but look at the
StandardDefines for Solaris. I had to add -DBSD_COMP
-DWAIT_USES_INT -DUSE_DIRENT_H -DNEED_SYS_FCNTL_H -DNOTTYENT
to get it to compile. More on this later.
o The Project.tmpl files a a number of changes for ran lib,
since on Solaris 2.3 it is not needed.
o Also added $(DESTDIR) in a few places where it was missing.
Attached to this note is a diff for the above. A full diff file
for all of our changes as of 5/2/94 can be found in AFS at:
/afs/anl.gov/appl/kerb-5.3/build/other/k5.cdiff.940502 feel free
to look at this if you want. If you would like me to itemize the
rest of the changes as I did above, or if there is a better way
to report on what I have done, let me know.
Included in it are changes to get cross realm authentication to
work, as well as the many changes for Solaris 2.3 mostly for
include files. As of now, I only have the rlogind working on
Solaris, and have only build the lib, util and appl/bsd parts of
the distribution.
I also have changes to the isode which I can also document. Most of these
are for Solaris 2.3 as well.
(I am not on the krb5-bugs list, if it is a list, can you add me to it?)
Douglas E. Engert
Systems Programming
Argonne National Laboratory
9700 South Cass Avenue
Argonne, Illinois 60439
(708) 252-5444
Internet: DEEngert@anl.gov
----- ------ ----- ----- ----- ----- ----- ----- ----- -----
*** ./appl/telnet/libtelnet/,Imakefile Wed Apr 27 09:02:29 1994
--- ./appl/telnet/libtelnet/Imakefile Thu Mar 31 13:53:12 1994
***************
*** 54,56 ****
--- 54,69 ----
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
fi
+ install::
+ @-if [ -f ../Config.local ]; \
+ then \
+ echo make -f ../Config.local WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ make -f ../Config.local WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ else \
+ echo make -f ../Config.generic WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ make -f ../Config.generic WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ fi
*** ./appl/telnet/telnet/,Imakefile Wed Apr 27 09:03:56 1994
--- ./appl/telnet/telnet/Imakefile Thu Mar 31 13:52:04 1994
***************
*** 51,53 ****
--- 51,66 ----
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
fi
+ install::
+ @-if [ -f ../Config.local ]; \
+ then \
+ echo make -f ../Config.local WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ make -f ../Config.local WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ else \
+ echo make -f ../Config.generic WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ make -f ../Config.generic WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ fi
*** ./appl/telnet/telnetd/,Imakefile Wed Apr 27 09:04:18 1994
--- ./appl/telnet/telnetd/Imakefile Thu Mar 31 13:51:06 1994
***************
*** 50,53 ****
--- 50,67 ----
make -f ../Config.generic WHAT=$@ CC="${CC}" \
DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
fi
+
+ install::
+ @-if [ -f ../Config.local ]; \
+ then \
+ echo make -f ../Config.local WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ make -f ../Config.local WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ else \
+ echo make -f ../Config.generic WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ make -f ../Config.generic WHAT=$@ CC="${CC}" \
+ DESTDIR=$(DESTDIR) DEST=$(DEST) $(TELNET_OPSYS); \
+ fi
*** ./config/,Imake.tmpl Mon Mar 7 14:52:04 1994
--- ./config/Imake.tmpl Thu Mar 17 14:07:25 1994
***************
*** 780,785 ****
--- 780,787 ----
ETAGS = EtagsCmd
STDC_TOP_INCLUDES = STDCTopIncludes
+ APPL_BSD_DEF = Appl_Bsd_Def
+
#if ConstructMFLAGS
MFLAGS = -$(MAKEFLAGS)
#endif
*** ./config/,Imake.rules Mon Mar 7 14:52:03 1994
--- ./config/Imake.rules Thu Apr 14 11:46:50 1994
***************
*** 356,362 ****
#if DoRanlibCmd
#define RanLibrary(args) $(RANLIB) args
#else
! #define RanLibrary(args) /**/
#endif
/*
--- 356,364 ----
#if DoRanlibCmd
#define RanLibrary(args) $(RANLIB) args
#else
! /* ANL - need some command here since Imake makes bad makefile */
! #define RanLibrary(args) /bin/true
! /* #define RanLibrary(args) */ /**/
#endif
/*
*** ./lib/gssapi/generic/,Imakefile Mon Mar 7 14:54:27 1994
--- ./lib/gssapi/generic/Imakefile Mon Mar 14 14:50:02 1994
***************
*** 79,85 ****
SubdirLibraryRule($(OBJS))
! Krb5InstallHeaders($(EXPORTED_HEADERS), $(KRB5_INCDIR)/krb5)
includes::
@-mkdir $(EHDRDIR)
--- 79,85 ----
SubdirLibraryRule($(OBJS))
! Krb5InstallHeaders($(EXPORTED_HEADERS),$(KRB5_INCDIR)/krb5)
includes::
@-mkdir $(EHDRDIR)
*** ./lib/krb5/asn.1/,Imakefile Mon Mar 7 14:54:47 1994
--- ./lib/krb5/asn.1/Imakefile Mon Mar 14 14:48:14 1994
***************
*** 167,173 ****
CopyHeader(KRB5_defs.h,$(EHDRDIR))
CopyHeader(KRB5_pre_defs.h,$(EHDRDIR))
! Krb5InstallHeaders(KRB5_defs.h KRB5_pre_defs.h KRB5-types.h, $(KRB5_INCDIR)/krb5/asn.1)
clean::
$(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
--- 167,173 ----
CopyHeader(KRB5_defs.h,$(EHDRDIR))
CopyHeader(KRB5_pre_defs.h,$(EHDRDIR))
! Krb5InstallHeaders(KRB5_defs.h KRB5_pre_defs.h KRB5-types.h,$(KRB5_INCDIR)/krb5/asn.1)
clean::
$(RM) KRB5.ph KRB5_defs.h KRB5_pre_defs.h KRB5-types.h KRB5_tables.c
*** ./lib/krb5/error_tables/,Imakefile Mon Mar 7 14:55:30 1994
--- ./lib/krb5/error_tables/Imakefile Mon Mar 14 14:37:16 1994
***************
*** 54,60 ****
DependTarget()
! Krb5InstallHeaders($(ETHDRS), $(KRB5_INCDIR)/krb5)
SpecialObjectRule(isode_err.o,isode_err.c,)
SpecialObjectRule(krb5_err.o,krb5_err.c,)
--- 54,60 ----
DependTarget()
! Krb5InstallHeaders($(ETHDRS),$(KRB5_INCDIR)/krb5)
SpecialObjectRule(isode_err.o,isode_err.c,)
SpecialObjectRule(krb5_err.o,krb5_err.c,)
*** ./lib/krb5/krb/,Imakefile Mon Mar 7 14:55:58 1994
--- ./lib/krb5/krb/Imakefile Fri Apr 15 13:13:29 1994
***************
*** 24,29 ****
--- 24,34 ----
#
NormalLibraryObjectRule()
+ # ANL - compat_recv.c needs krb.h so provide it
+ # There should be a better way for this
+
+ INCLUDES=-I$(TOP)/include/kerberosIV
+
OBJS= addr_comp.o \
addr_order.o \
addr_srch.o \
*** ./,Imakefile Mon Mar 7 14:50:54 1994
--- ./Imakefile Mon Mar 14 15:05:01 1994
***************
*** 53,59 ****
install-mkdirs:
-mkdir $(INSTALLMKDIRS)
! install::
$(MAKE) $(MFLAGS) install.man
/**/# rebuild the Makefiles in the master source tree
--- 53,59 ----
install-mkdirs:
-mkdir $(INSTALLMKDIRS)
! install.man::
$(MAKE) $(MFLAGS) install.man
/**/# rebuild the Makefiles in the master source tree
*** ./,sun.cf Thu Mar 17 15:27:34 1994
--- ./sun.cf Fri Apr 22 11:23:31 1994
***************
*** 19,24 ****
--- 19,25 ----
* They aren't too important, so ignore them for now.
*
*/
+ #ifndef SVR4
#define OSName SunOS 4.1
#define OS_SunOS4 1
***************
*** 35,44 ****
#define HasPutenv YES
#define HaveSetenv YES
#define HasBsearch YES
! #define HasGcc NO
#define UseSysTimeH YES
#define IsPOSIX NO
#define Bitsize32 YES
#undef HasNdbm
#define HasNdbm YES
--- 36,50 ----
#define HasPutenv YES
#define HaveSetenv YES
#define HasBsearch YES
! #define HasGcc YES
#define UseSysTimeH YES
#define IsPOSIX NO
#define Bitsize32 YES
+ #define HasVfprintf YES
+ #define HasVsyslog YES
+ #define HasStrdup YES
+ #define HasStrerror NO
+ #define HasMemmove NO
#undef HasNdbm
#define HasNdbm YES
***************
*** 51,54 ****
--- 57,102 ----
#define LnCmd /usr/5bin/ln -sf
#define UseSedHack
+ #define OS_TelnetName sun4.1
+ #define Appl_Bsd_Def -DSERVE_V4 -DLOG_ALL_LOGINS
+
+ #else
+
+ #define OSName SunOS 5.3
+ #define OSMajorVersion 5
+ #define OSMinorVersion 3
+ #define SystemV YES
+ #define HasVoidSignalReturn YES
+ #define HasPosixTermios YES
+ #define HasPosixFileLocks YES
+ #define HasPosixTypes YES
+ #define HasStringH YES
+ #define HasStdlibH YES
+ #define HasInet YES
+ #define HasPutenv YES
+ #define HaveSetenv YES
+ #define HasBsearch YES
+ #define HasGcc YES
+ #define UseSysTimeH YES
+ #define IsPOSIX YES
+ #define Bitsize32 YES
+ #define HasVfprintf YES
+ #define HasVsyslog YES
+ #define HasStrdup YES
+ #define HasStrerror YES
+ #define HasMemmove YES
+
+ #undef HasNdbm
+ #define HasNdbm YES
+
+ #define ArCmd ar cru
+ #define LintLibFlag -o
+ #define DesDefines -DBIG -DMUSTALIGN -DMSBFIRST
+
+ #define LnCmd ln -sf
+
+ #define UseSedHack
+ #define OS_TelnetName sol2.3
+ #define Appl_Bsd_Def -DLOG_ALL_LOGINS -DSYSV -DSTREAMS
+ #endif
*** ./,site.def Mon Mar 7 14:52:14 1994
--- ./site.def Fri Apr 22 11:28:25 1994
***************
*** 24,30 ****
--- 24,37 ----
* *
*****************************************************************************/
+ /* ANL define DESTDIR for afs. This allows KRB5ROOT to stay as
+ * /krb5 so on clients this will be the directory for
+ * srvtab, and conf files, and when used with the bin, lib and man
+ * directories, it will let us install into $(DESTDIR)/krb5/bin etc
+ */
+ #define DestDir /tmp/You.Must.Define.DESTDIR
+
/* General */
#define InstKmemFlag -g kmem -m 2755
#define StripInstalledPrograms YES
***************
*** 117,125 ****
* If you want to use GCC, set HasGcc in the appropriate .cf files.
*/
#ifndef HasGcc
! #define HasGcc NO
#endif
/*
* If you want to use VPATH to do makefile building, set it here.
*/
--- 124,135 ----
* If you want to use GCC, set HasGcc in the appropriate .cf files.
*/
#ifndef HasGcc
! /* ANL - set yes as default */
! #define HasGcc YES
#endif
+ /* ANL - use the gcc cpp which is in the path */
+ #define CPPCmd cpp
/*
* If you want to use VPATH to do makefile building, set it here.
*/
***************
*** 133,140 ****
/* If you have the Hesiod software and libraries installed, and want to
use it in some application programs, then turn these on. If they're
not turned on, they are left empty in Project.tmpl */
! #define HesiodDefines -DHESIOD
! #define HesiodLibs /usr/athena/lib/libhesiod.a
#if 0
/* not yet in use, but maybe someday... */
--- 143,151 ----
/* If you have the Hesiod software and libraries installed, and want to
use it in some application programs, then turn these on. If they're
not turned on, they are left empty in Project.tmpl */
! /* ANL - #define HesiodDefines -DHESIOD
! * ANL - #define HesiodLibs /usr/athena/lib/libhesiod.a
! */
#if 0
/* not yet in use, but maybe someday... */
***************
*** 152,161 ****
library. This might want to be -lisode if you have it installed.
IsodeDir is put into the 'make' variable ISODE. */
! #define IsodeDir /mit/isode/isode-7.0
! #define IsodeLib /mit/isode/isode-7.0/@sys/lib/libisode.a
! #define IsodeIncls /mit/isode/isode-7.0/@sys/include
/*
* #define ISODE 7 only if you are using ISODE 7.0 or later.
*/
--- 163,183 ----
library. This might want to be -lisode if you have it installed.
IsodeDir is put into the 'make' variable ISODE. */
! /* ANL - #define IsodeDir /mit/isode/isode-7.0
! * ANL - #define IsodeLib /mit/isode/isode-7.0/@sys/lib/libisode.a
! * ANL - #define IsodeIncls /mit/isode/isode-7.0/@sys/include
! */
+ /* ANL - use the isode-7.0 provided by MIT for pepsy */
+ /* make sure we get the correct lib which is called libisode7.a */
+ #define IsodeDir /afs/anl.gov/appl/kerb-5.3/@sys/isode
+ #define IsodeLib -L/afs/anl.gov/appl/kerb-5.3/@sys/isode/lib -lisode7
+ #define IsodeIncls /afs/anl.gov/appl/kerb-5.3/@sys/isode/include
+
+ /* ANL - we have isode-8.0 in the /usr/afsws/local directories */
+ /* #define IsodeDir /usr/afsws/local */
+ /* #define IsodeLib -lisode */
+ /* #define IsodeIncls */ /**/
/*
* #define ISODE 7 only if you are using ISODE 7.0 or later.
*/
***************
*** 163,186 ****
/* Re-define PepsyCmd if pepsy isn't in your search path. */
! #define PepsyCmd IsodeDir/@sys/bin/pepsy
#define UseImakeInstalled /* -- turn on if you have imake installed */
#define UseMakedependInstalled /* -- turn on if you have makedepend installed */
!
! /* #define Krb4ApplCompat /* turn this on if you want selected applications to
work with both v4 & v5 code */
! /* #define Krb4KDCCompat /* turn this on if you want the KDC to provide v4
tickets from a v5 database */
/* #define Krb4Includes <empty> -- If you don't want to use our copy of the
Kerberos V4 include files, set this to
an empty name, by using the /**/
/* trick */
/* #define Krb4LibList -lquux -- If -lkrb -ldes is NOT the right thing
to get V4 libraries, define it here
to something else */
! /* #define Krb4LibList /usr/athena/lib/libkrb.a $(KLIBLOC) -l$(DES425LIB) */
/* #define Krb4KdbList /usr/athena/lib/libkdb.a */
/* the following might want to be put into a specific architecture
--- 185,215 ----
/* Re-define PepsyCmd if pepsy isn't in your search path. */
! /* ANL - #define PepsyCmd IsodeDir/@sys/bin/pepsy */
! #define PepsyCmd IsodeDir/bin/pepsy
! /* #define PepsyCmd pepsy */
+
#define UseImakeInstalled /* -- turn on if you have imake installed */
#define UseMakedependInstalled /* -- turn on if you have makedepend installed */
! /* ANL - try Krb4ApplCompat */
! #define Krb4ApplCompat /* turn this on if you want selected applications to
work with both v4 & v5 code */
! /* ANL - try Krb4ApplCompat */
! #define Krb4KDCCompat /* turn this on if you want the KDC to provide v4
tickets from a v5 database */
/* #define Krb4Includes <empty> -- If you don't want to use our copy of the
Kerberos V4 include files, set this to
an empty name, by using the /**/
/* trick */
+ /* ANL Use our version of the V4 include files */
+ /* #define Krb4Includes -I/usr/athena/include */
+
/* #define Krb4LibList -lquux -- If -lkrb -ldes is NOT the right thing
to get V4 libraries, define it here
to something else */
! #define Krb4LibList /usr/athena/lib/libkrb.a $(KLIBLOC) -l$(DES425LIB)
/* #define Krb4KdbList /usr/athena/lib/libkdb.a */
/* the following might want to be put into a specific architecture
***************
*** 225,246 ****
/* alternate library search paths, if needed for some system libraries */
/* #define LdLibLocations -L/usr/athena/lib */
/* additional include paths, if needed, such as those needed
to get special include files, like Kerberos V4 include files */
/* #define StandardIncludes -I/usr/athena/include */
#if defined(AIXArchitecture) && OSMajorVersion == 3
! #define StandardDefines -D_ALL_SOURCE
/* For all its flaws, gmake has one advantage over AIX make: it supports
VPATH in the way the Kerberos config files want. WARNING: if you combine
RCS and VPATH with gmake will will probably lose. */
! #define MakeCmd gmake
.SUFFIXES:
.SUFFIXES: .et .c .h .o
#undef LdLibLocations
! #define LdLibLocations -L/usr/athena/lib/shared -L/mit/krb5/rsaix/lib/shared
#endif
#define AthenaEnv NO /* Define this if you are in the
--- 254,309 ----
/* alternate library search paths, if needed for some system libraries */
/* #define LdLibLocations -L/usr/athena/lib */
+ /* ANL - add local libs */
+ #define LdLibLocations -L/usr/afsws/local/lib -L/usr/athena/lib
/* additional include paths, if needed, such as those needed
to get special include files, like Kerberos V4 include files */
/* #define StandardIncludes -I/usr/athena/include */
+ /* ANL - define standard includes */
+ #define StandardIncludes -I/usr/afsws/local/include -I/usr/athena/include
+
+ /* ANL for SUNOS 4.1.x we need the resolv lib to use DNS */
+ #if defined(SunArchitecture) && OSMajorVersion == 4
+ #undef LdLibLocations
+ #define LdLibLocations -L/usr/afsws/local/lib -L/usr/athena/lib -lresolv
+ #endif
+ /* ANL - Solaris 2.3, add -DBSD_COMP for ioclt to get socket stuff */
+ /* add in USE_DIRENT_H etc. to get around problem with */
+ /* ss/help.c and others */
+ /* for libs, added link on apollo to point libucbs.a -> libucb.a */
+ /* so we could get the static version of the ucb lib even with */
+ /* gcc calling the Sun loader. Without this it found the libucb.so */
+ /* and then /usr/ucblib is need in LD_LIB... */
+
+ #if defined(SunArchitecture) && OSMajorVersion == 5
+ #define StandardDefines -DBSD_COMP -DWAIT_USES_INT -DUSE_DIRENT_H -DNEED_SYS_FCNTL_H -DNOTTYENT
+ #undef StandardIncludes
+ #define StandardIncludes -I$(TOP)/include/kerberosIV
+ #undef LdLibLocations
+ /* #define LdLibLocations -lnsl -lsocket -L/usr/ucblib -lucbs */
+ #define LdLibLocations -lnsl -lsocket
+ #undef Krb4Includes
+ #define Krb4Includes /**/
+ #undef Krb4LibList
+ #define Krb4LibList /**/
+ #undef Krb4ApplCompat
+ #define InstallCmd /usr/ucb/install
+ #endif
+
#if defined(AIXArchitecture) && OSMajorVersion == 3
! #define StandardDefines -D_ALL_SOURCE -DWAIT_USES_INT -D_BSD
/* For all its flaws, gmake has one advantage over AIX make: it supports
VPATH in the way the Kerberos config files want. WARNING: if you combine
RCS and VPATH with gmake will will probably lose. */
! /* ANL - #define MakeCmd gmake */
.SUFFIXES:
.SUFFIXES: .et .c .h .o
#undef LdLibLocations
! /* ANL for AIX add in -ls for security with login */
! #define LdLibLocations -L/usr/afsws/local/lib -L/usr/athena/lib -ls -lodm -lcfg
#endif
#define AthenaEnv NO /* Define this if you are in the
*** ./,Project.tmpl Mon Mar 7 14:52:15 1994
--- ./Project.tmpl Thu Apr 14 10:04:33 1994
***************
*** 221,227 ****
$(ARADD) Concat3(lib,libname,.a) objlist @@\
$(TOUCH) Concat(foo,libname) @@\
Concat3(lib,libname,.a): Concat(foo,libname) @@\
! $(RANLIB) $@ @@\
clean:: @@\
$(RM) Concat(foo,libname) Concat3(lib,libname,.a)
#endif /* AdditiveLibraryTarget */
--- 221,227 ----
$(ARADD) Concat3(lib,libname,.a) objlist @@\
$(TOUCH) Concat(foo,libname) @@\
Concat3(lib,libname,.a): Concat(foo,libname) @@\
! RanLibrary($@) @@\
clean:: @@\
$(RM) Concat(foo,libname) Concat3(lib,libname,.a)
#endif /* AdditiveLibraryTarget */
***************
*** 232,238 ****
Concat(foo2,libname): Concat(foo,libname) @@\
$(TOUCH) $@ @@\
Concat3(lib,libname,.a): Concat(foo2,libname) @@\
! $(RANLIB) $@ @@\
clean:: @@\
$(RM) Concat(foo,libname) Concat(foo2,libname) Concat3(lib,libname,.a)
#endif
--- 232,238 ----
Concat(foo2,libname): Concat(foo,libname) @@\
$(TOUCH) $@ @@\
Concat3(lib,libname,.a): Concat(foo2,libname) @@\
! RanLibrary($@) @@\
clean:: @@\
$(RM) Concat(foo,libname) Concat(foo2,libname) Concat3(lib,libname,.a)
#endif
***************
*** 300,306 ****
Concat3(lib,libname,.a): objlist @@\
$(RM) $@ @@\
$(AR) $@ objlist @@\
! $(RANLIB) $@ @@\
$(RM) Concat3($(TOPLIBD)/lib,libname,.a) @@\
$(LN) Concat3(../$(CURRENT_DIR)/lib,libname,.a) Concat3($(TOP)/lib/lib,libname,.a)
#endif /* Krb5LibraryTarget */
--- 300,306 ----
Concat3(lib,libname,.a): objlist @@\
$(RM) $@ @@\
$(AR) $@ objlist @@\
! RanLibrary($@) @@\
$(RM) Concat3($(TOPLIBD)/lib,libname,.a) @@\
$(LN) Concat3(../$(CURRENT_DIR)/lib,libname,.a) Concat3($(TOP)/lib/lib,libname,.a)
#endif /* Krb5LibraryTarget */
***************
*** 308,316 ****
#ifndef Krb5InstallLibrary
#define Krb5InstallLibrary(libname,destdir) @@\
install:: Concat3(lib,libname,.a) @@\
! $(RM) Concat4(destdir,/lib,libname,.a) @@\
! $(CP) Concat3(lib,libname,.a) Concat4(destdir,/lib,libname,.a) @@\
! $(RANLIB) Concat4(destdir,/lib,libname,.a)
#endif
#ifndef Krb5InstallHeaders
--- 308,316 ----
#ifndef Krb5InstallLibrary
#define Krb5InstallLibrary(libname,destdir) @@\
install:: Concat3(lib,libname,.a) @@\
! $(RM) Concat4($(DESTDIR)destdir,/lib,libname,.a) @@\
! $(CP) Concat3(lib,libname,.a) Concat4($(DESTDIR)destdir,/lib,libname,.a) @@\
! RanLibrary(Concat4($(DESTDIR)destdir,/lib,libname,.a))
#endif
#ifndef Krb5InstallHeaders
***************
*** 317,323 ****
#define Krb5InstallHeaders(headers,destdir) @@\
install:: headers @@\
@set -x; for f in headers ; \ @@\
! do $(INSTALL) -c $(INSTDATFLAGS) $$f destdir/$$f ; \ @@\
done
#endif
--- 317,323 ----
#define Krb5InstallHeaders(headers,destdir) @@\
install:: headers @@\
@set -x; for f in headers ; \ @@\
! do $(INSTALL) -c $(INSTDATFLAGS) $$f $(DESTDIR)destdir/$$f ; \ @@\
done
#endif
***************
*** 328,334 ****
#ifndef Krb5InstallManPage
#define Krb5InstallManPage(file,destdir,suffix) @@\
install.man:: file.M @@\
! $(INSTALL) -c $(INSTMANFLAGS) file.M destdir/file.suffix
#endif /* Krb5InstallManPage */
/*
--- 328,334 ----
#ifndef Krb5InstallManPage
#define Krb5InstallManPage(file,destdir,suffix) @@\
install.man:: file.M @@\
! $(INSTALL) -c $(INSTMANFLAGS) file.M $(DESTDIR)destdir/file.suffix
#endif /* Krb5InstallManPage */
/*
***************
*** 633,639 ****
FILE_MANDIR = FileMandir
KRB5_LIBDIR = Krb5Libdir
KRB5_INCDIR = Krb5Incdir
! KRB5_INCSUBDIRS = concat(Krb5Incdir,/krb5) \
! concat(Krb5Incdir,/krb5/asn.1) \
! concat(Krb5Incdir,/kerberosIV)
KRB5_OTHERMKDIRS = Krb5Othermkdirs
--- 633,639 ----
FILE_MANDIR = FileMandir
KRB5_LIBDIR = Krb5Libdir
KRB5_INCDIR = Krb5Incdir
! KRB5_INCSUBDIRS = Concat(Krb5Incdir,/krb5) \
! Concat(Krb5Incdir,/krb5/asn.1) \
! Concat(Krb5Incdir,/kerberosIV)
KRB5_OTHERMKDIRS = Krb5Othermkdirs
*** ./,ibm.cf Mon Mar 7 14:52:05 1994
--- ./ibm.cf Thu Apr 14 14:21:42 1994
***************
*** 56,64 ****
#define OSMajorVersion 1
#define OSMinorVersion 2
#else
! #define OSName AIX 3.1
#define OSMajorVersion 3
! #define OSMinorVersion 1
#endif
#define Bitsize32
--- 56,64 ----
#define OSMajorVersion 1
#define OSMinorVersion 2
#else
! #define OSName AIX 3.2
#define OSMajorVersion 3
! #define OSMinorVersion 2
#endif
#define Bitsize32
***************
*** 82,88 ****
/* There is a compiler bug on the PS/2 running AIX 1.2.1:
extern int f(int); does not match int f(x) int x;{}
Therefore, narrow prototypes are needed. */
! #define WantPrototypes YES
#define NeedNarrowPrototypes YES
#define UseStdarg YES
#define UseVoid YES
--- 82,88 ----
/* There is a compiler bug on the PS/2 running AIX 1.2.1:
extern int f(int); does not match int f(x) int x;{}
Therefore, narrow prototypes are needed. */
! /* #define WantPrototypes YES */
#define NeedNarrowPrototypes YES
#define UseStdarg YES
#define UseVoid YES
***************
*** 98,110 ****
-Hon=long_enums (make enums 4 bytes long for vsc compatbility)
*/
#else
! #define CcCmd xlc
#define UseTimeH
#define UseSysTimeH
#define DesDefines -DBIG -DMSBFIRST -DMUSTALIGN
#define UseConst YES
#define LibraryRules "ibmLib.rules"
! #define HasSharedLibraries YES
#define IsPOSIX YES
#endif
--- 98,114 ----
-Hon=long_enums (make enums 4 bytes long for vsc compatbility)
*/
#else
! #define HasGcc YES
! #define OS_TelnetName aix3.2
! #define Appl_Bsd_Def -DSERVE_V4 -DLOG_ALL_LOGINS
! #define InstallCmd /usr/ucb/install
! /* #define CcCmd xlc */
#define UseTimeH
#define UseSysTimeH
#define DesDefines -DBIG -DMSBFIRST -DMUSTALIGN
#define UseConst YES
#define LibraryRules "ibmLib.rules"
! /* #define HasSharedLibraries YES */
#define IsPOSIX YES
#endif
***************
*** 114,118 ****
#endif /* RT */
! #define DefaultCDebugFlags OptimizedCDebugFlags
--- 118,122 ----
#endif /* RT */
! /* #define DefaultCDebugFlags OptimizedCDebugFlags */
