* Makefile.in (LDFLAGS): Remove, duplicates config/pre.in.

(CFLAGS):  Add -I options for file and stdio, to avoid paths in
#include statements.
(all-mac, clean-mac):  Add.
* ccdefops.c:  Avoid includes with pathnames, since they don't work
on the Mac.  Configure the default cache based on whether the
system has <sys/types.h> (which defines types for low-level file
operations, among other things).
* configure.in (CONFIG_DIRS):  Build stdio before file, for Mac
convenience (where file doesn't build).

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

4 files changed, 31 insertions, 8 deletions

diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog
index 6c836f48f..a5cb512d7 100644
--- a/src/lib/krb5/ccache/ChangeLog
+++ b/src/lib/krb5/ccache/ChangeLog
@@ -1,3 +1,16 @@
+Fri Mar 17 19:19:07 1995  John Gilmore  (gnu at toad.com)
+
+	* Makefile.in (LDFLAGS):  Remove, duplicates config/pre.in.
+	(CFLAGS):  Add -I options for file and stdio, to avoid paths in
+	#include statements.
+	(all-mac, clean-mac):  Add.
+	* ccdefops.c:  Avoid includes with pathnames, since they don't work
+	on the Mac.  Configure the default cache based on whether the
+	system has <sys/types.h> (which defines types for low-level file
+	operations, among other things).
+	* configure.in (CONFIG_DIRS):  Build stdio before file, for Mac
+	convenience (where file doesn't build).
+
 Wed Mar 15 20:23:17 1995 Keith Vetter (keithv@fusion.com)
 
 	* Makefile.in: cleaned up for the PC
diff --git a/src/lib/krb5/ccache/Makefile.in b/src/lib/krb5/ccache/Makefile.in
index 8ecc63f7a..e64869fe2 100644
--- a/src/lib/krb5/ccache/Makefile.in
+++ b/src/lib/krb5/ccache/Makefile.in
@@ -1,5 +1,4 @@
-CFLAGS = $(CCOPTS) $(DEFS)
-LDFLAGS = -g
+CFLAGS = $(CCOPTS) $(DEFS) -I$(C)file -I$(C)stdio
 
 ##DOSBUILDTOP = ..\..\..
 ##DOSLIBNAME=..\krb5.lib
@@ -16,7 +15,7 @@ SRCS=	$(srcdir)/ccbase.c \
 all:: $(OBJS) all-$(WHAT)
 
 all-unix::
-
+all-mac::
 all-windows::
 	cd FILE
 	@echo Making in ccache\file
@@ -26,11 +25,10 @@ all-windows::
 clean:: clean-$(WHAT)
 
 clean-unix::
-
+clean-mac:
 clean-windows::
 	cd FILE
 	@echo Making clean in ccache\file
 	-$(MAKE) -$(MFLAGS) clean
 	cd ..
 	@echo Making clean locally
-
diff --git a/src/lib/krb5/ccache/ccdefops.c b/src/lib/krb5/ccache/ccdefops.c
index 296d92ad6..df7497f80 100644
--- a/src/lib/krb5/ccache/ccdefops.c
+++ b/src/lib/krb5/ccache/ccdefops.c
@@ -25,7 +25,19 @@
  * so that the user can more easily override it.
  */
 
-#include "file/fcc.h"
-#include "stdio/scc.h"
+#include "k5-int.h"
 
+#ifdef HAVE_SYS_TYPES_H
+/* Systems that have <sys/types.h> probably have Unix-like files (off_t,
+   for example, which is needed by fcc.h).  */
+
+#include "fcc.h"		/* From file subdir */
 krb5_cc_ops *krb5_cc_dfl_ops = &krb5_cc_file_ops;
+
+#else
+/* Systems that don't have <sys/types.h> probably have stdio anyway.  */
+
+#include "scc.h"		/* From stdio subdir */
+krb5_cc_ops *krb5_cc_dfl_ops = &krb5_scc_ops;
+
+#endif
diff --git a/src/lib/krb5/ccache/configure.in b/src/lib/krb5/ccache/configure.in
index b25584488..844cec50f 100644
--- a/src/lib/krb5/ccache/configure.in
+++ b/src/lib/krb5/ccache/configure.in
@@ -2,7 +2,7 @@ AC_INIT(configure.in)
 WITH_CCOPTS
 CONFIG_RULES
 AC_SET_BUILDTOP
-CONFIG_DIRS(file stdio)
+CONFIG_DIRS(stdio file)
 AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB