* mac-config.cache: Correct some entries.

* mac-mf.sed:  Improve conversion of pathnames, $(srcdir),
support linking MPW tools (for make check, kinit).
* mac-pre.in (.c.o):  Add -sym on for debugging.
(LDFLAGS):  Remove ToolLibs.o.
(RANLIB, ARCHIVE):  Make these work.
(MAKE):  Make recursive makes work, with BuildProgram.

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

diff --git a/src/config/ChangeLog b/src/config/ChangeLog
index 92bac42cc6f87a2f6748bbaf9fd3c70cc1ee3b7b..0e5c6b2a7118d9e045c0145baad68a3ca8e26112 100644 (file)
--- a/src/config/ChangeLog
+++ b/src/config/ChangeLog
@@ -1,3 +1,13 @@
+Tue Mar 28 17:58:55 1995  John Gilmore  (gnu at toad.com)
+
+       * mac-config.cache:  Correct some entries.
+       * mac-mf.sed:  Improve conversion of pathnames, $(srcdir),
+       support linking MPW tools (for make check, kinit).
+       * mac-pre.in (.c.o):  Add -sym on for debugging.
+       (LDFLAGS):  Remove ToolLibs.o.
+       (RANLIB, ARCHIVE):  Make these work.
+       (MAKE):  Make recursive makes work, with BuildProgram.
+
 Thu Mar 16 20:55:18 1995  John Gilmore  (gnu at toad.com)
 
        First cut at Macintosh configuration support.

diff --git a/src/config/mac-config.cache b/src/config/mac-config.cache
index 85183cd8fdac6fa6ff1085481e1a5440857fde25..a2d914ce0a394fda3bdad1878a29f3bd74a6aac1 100644 (file)
--- a/src/config/mac-config.cache
+++ b/src/config/mac-config.cache
@@ -22,9 +22,10 @@
 : ${ac_cv_func_ftime='no'}
 : ${ac_cv_func_getcwd='no'}
 : ${ac_cv_func_getdtablesize='no'}
-: ${ac_cv_func_getopt='yes'}
+: ${ac_cv_func_getopt='no'}
 : ${ac_cv_func_getpid='no'}
 : ${ac_cv_func_gettosbyname='no'}
+: ${ac_cv_func_getuid='no'}
 : ${ac_cv_func_getutent='no'}
 : ${ac_cv_func_grantpt='no'}
 : ${ac_cv_func_herror='no'}
@@ -46,11 +47,11 @@
 : ${ac_cv_func_sigprocmask='no'}
 : ${ac_cv_func_sigsetjmp='no'}
 : ${ac_cv_func_srand='yes'}
-: ${ac_cv_func_srand48='yes'}
-: ${ac_cv_func_srandom='yes'}
+: ${ac_cv_func_srand48='no'}
+: ${ac_cv_func_srandom='no'}
 : ${ac_cv_func_strcasecmp='no'}
 : ${ac_cv_func_strdup='no'}
-: ${ac_cv_func_strerror='no'}
+: ${ac_cv_func_strerror='yes'}
 : ${ac_cv_func_strftime='yes'}
 : ${ac_cv_func_strsave='no'}
 : ${ac_cv_func_tcsetattr='no'}

diff --git a/src/config/mac-mf.sed b/src/config/mac-mf.sed
index 8b0a957c70e48aea97a1675bf9730d58d42aefe4..5a44424fc7fc446d94b7f9d3508cd2d5bda7da89 100644 (file)
--- a/src/config/mac-mf.sed
+++ b/src/config/mac-mf.sed
@@ -31,9 +31,17 @@
 /\./s,\.\./:,::,g
 # Convert ../../ to ::: 
 /\./s,\.\./\.\./,:::,g
+# Convert /../ to ::
+/\./s,/\.\./,::,g
+# Convert ../ to ::
 /\./s,\.\./,::,g
+# Convert ..; to ::;
 /\./s,\.\.;,::;,g
+# Convert /./ to :
+/\.\//s,/\./,:,g
+# Convert ./ to :
 /\.\//s,\./,:,g
+# All other slashes turn into colons.
 /\//s,/,:,g
 
 /=/s/ = \.$/ = :/
@@ -46,9 +54,13 @@
 /BASEDIR/s/^BASEDIR =.*$/BASEDIR = "{srcroot}"/
 /{BASEDIR}:/s/{BASEDIR}:/{BASEDIR}/g
 # The original lines screw up -I$(srcdir)/../des  by eliminating a colon.
-# Proposed fix:  Eliminate srcdir prefixes totally.
+# Proposed fix:  Eliminate srcdir prefixes totally; rplc by colon for
+# current directory.
 #/{srcdir}:/s/{srcdir}:/"{srcdir}"/g
-/{srcdir}:/s/{srcdir}://g
+# $(srcdir)/../foo turns to ::foo.
+/{srcdir}:/s/{srcdir}::/::/g
+# $(srcdir)/bar turns to :bar.
+/{srcdir}:/s/{srcdir}:/:/g
 #/"{srcdir}":/s/"{srcdir}":/"{srcdir}"/g
 
 # Comment out settings of anything set by mpw host config.
@@ -119,8 +131,8 @@
 # /-o/s/\([-a-z]*\)\.c -o "{o}".c.o/\1\.c -o "{o}"\1.c.o/
 
 # Change linking cc to link.
-/LDFLAGS/    s/{CC} \(.*\){CFLAGS}\(.*\){LDFLAGS}/Link \1 \2 {LDFLAGS}/
-/CFLAGS_LINK/s/{CC} \(.*\){CFLAGS_LINK}\(.*\){LDFLAGS}/Link \1 \2 {LDFLAGS}/
+/LDFLAGS/    s/{CC}\(.*\){CFLAGS}\(.*\){LDFLAGS}/Link \1 \2 {LDFLAGS}/
+/CFLAGS_LINK/s/{CC}\(.*\){CFLAGS_LINK}\(.*\){LDFLAGS}/Link \1 \2 {LDFLAGS}/
 
 # Comment out .PHONY rules.
 /\.PHONY/s/^\.PHONY/# \.PHONY/
@@ -149,7 +161,7 @@
 
 # Hackery, pure and simple
 # To speed up compiles, remove duplicated -i options.
-/-i/s/\(-i [^ ]*\) \1 /\1 /g
+/-i/s/-i {SRCTOP}\([^ ]*\) -i {BUILDTOP}\1 /-i {BUILDTOP}\1 /g
 
 # Note!  There are 8-bit characters in the three lines below:
 #      0xc4, 0xb6, 0xc5.

diff --git a/src/config/mac-pre.in b/src/config/mac-pre.in
index 2e8e7ec1b15aa2e3fe535d9fe182d5b8fe573e3e..f5069502bcdf4f75cf6b8fc96201dcfdcd187d8e 100644 (file)
--- a/src/config/mac-pre.in
+++ b/src/config/mac-pre.in
@@ -98,7 +98,7 @@ VPATH = @srcdir@
 # Default rule that puts each file into separate segment.
 
 .c.o: .c
-       {CC}  {DepDir}{Default}.c {CFLAGS} -s {Default} -o {TargDir}{Default}.c.o
+       {CC} -sym on {DepDir}{Default}.c {CFLAGS} -s {Default} -o {TargDir}{Default}.c.o
 
 CPPFLAGS = @CPPFLAGS@ -i {CIncludes}
 DEFS = @DEFS@ $(CPPFLAGS)
@@ -106,7 +106,7 @@ CC = c
 LD = link
 # The funny quoting in the LDFLAGS is to avoid xxx.o being mangled by
 # mac-mf.sed into xxx.c.o.
-LDFLAGS=-t MPST -c "MPS " -sym on {Libraries}"Runtime."o {CLibraries}"StdClib."o {Libraries}"ToolLibs."o {Libraries}"Interface."o
+LDFLAGS=-t MPST -c "MPS " -sym on {Libraries}"Runtime."o {CLibraries}"StdClib."o {Libraries}"Interface."o
 CCOPTS = @CCOPTS@
 LIBS = @LIBS@
 KRB5ROOT= @KRB5ROOT@
@@ -136,15 +136,15 @@ RM = Delete -y -i
 CP = Duplicate -y
 MV = mv -f
 CHMOD=chmod
-RANLIB = @RANLIB@
-ARCHIVE = @ARCHIVE@
+RANLIB = echo
+ARCHIVE = lib -o 
 ARADD = @ARADD@
 LN = Duplicate -y
 AWK = @AWK@
 LEX = @LEX@
 LEXLIB = @LEXLIB@
 YACC = @YACC@
-MAKE = BuildProgram
+MAKE = Set Echo 0; BuildProgram
 
 # FIXME:  This won't work for srcdir != objdir.  But on the Mac, there
 # is no easy way to build a relative or absolute path, because : means