[OpenAFS-devel] afsconfig'ize des subdir, includes sgi fix I just sent
nneul@umr.edu
nneul@umr.edu
Tue, 15 May 2001 09:01:32 -0500
Index: des/Makefile
===================================================================
RCS file: /cvs/openafs/src/des/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- des/Makefile 2001/05/14 21:19:47 1.5
+++ des/Makefile 2001/05/15 14:01:31
@@ -36,8 +36,8 @@
GPROF =
# by default do not try to hide entry points
F_CC = -c ${GPROF} ${DBG} ${XCFLAGS}
-F_CPP = -I${K_INC} -I.
-MK_STR = " \$${CC} -I\$${SRC} \$${F_CPP} \$${F_CC}"
+F_CPP = -I${K_INC} -I. -I${TOP_SRCDIR}/config
+MK_STR = " \$${CC} -I\$${SRC} \$${F_CPP} \$${F_CC}" -I${TOP_SRCDIR}/config
LDFLAGS = ${XLDFLAGS}
# dont use optimizer, since it pessimizes on uvax2,
Index: des/andrew-conf.h
===================================================================
RCS file: /cvs/openafs/src/des/andrew-conf.h,v
retrieving revision 1.7
diff -u -r1.7 andrew-conf.h
--- des/andrew-conf.h 2001/04/30 06:54:28 1.7
+++ des/andrew-conf.h 2001/05/15 14:01:31
@@ -3,6 +3,7 @@
*/
#include <afs/param.h>
+#include <afsconfig.h>
#ifdef vax
#include "conf-bsdvax.h"
#else
Index: des/cksum.c
===================================================================
RCS file: /cvs/openafs/src/des/cksum.c,v
retrieving revision 1.4
diff -u -r1.4 cksum.c
--- des/cksum.c 2001/04/14 17:50:02 1.4
+++ des/cksum.c 2001/05/15 14:01:31
@@ -20,10 +20,12 @@
#include <afs/param.h>
#include <mit-cpyright.h>
#include <stdio.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_NT40_ENV)
-#include <string.h>
-#else
+
+#if defined(HAVE_STRINGS_H)
#include <strings.h>
+#endif
+#if defined(HAVE_STRING_H)
+#include <string.h>
#endif
#include <des.h>
Index: des/crypt.c
===================================================================
RCS file: /cvs/openafs/src/des/crypt.c,v
retrieving revision 1.2
diff -u -r1.2 crypt.c
--- des/crypt.c 2001/05/14 21:19:47 1.2
+++ des/crypt.c 2001/05/15 14:01:31
@@ -42,7 +42,13 @@
#include <windows.h>
#endif
#include <stdlib.h>
+
+#if defined(HAVE_STRINGS_H)
+#include <strings.h>
+#endif
+#if defined(HAVE_STRING_H)
#include <string.h>
+#endif
/*
* UNIX password, and DES, encryption.
Index: des/des_conf.h
===================================================================
RCS file: /cvs/openafs/src/des/des_conf.h,v
retrieving revision 1.1
diff -u -r1.1 des_conf.h
--- des/des_conf.h 2000/11/04 02:26:25 1.1
+++ des/des_conf.h 2001/05/15 14:01:31
@@ -16,6 +16,7 @@
*/
#include <afs/param.h>
+#include <afsconfig.h>
#include <mit-cpyright.h>
/* Machine-type and OS-type based configuration */
Index: des/new_rnd_key.c
===================================================================
RCS file: /cvs/openafs/src/des/new_rnd_key.c,v
retrieving revision 1.5
diff -u -r1.5 new_rnd_key.c
--- des/new_rnd_key.c 2001/04/30 06:54:29 1.5
+++ des/new_rnd_key.c 2001/05/15 14:01:31
@@ -16,12 +16,17 @@
#include <mit-cpyright.h>
#include <afs/param.h>
+#include <des.h>
+#include "des_internal.h"
#ifdef AFS_PTHREAD_ENV
#include <pthread.h>
#endif
+#if defined(HAVE_STRINGS_H)
+#include <strings.h>
+#endif
+#if defined(HAVE_STRING_H)
#include <string.h>
-#include <des.h>
-#include "des_internal.h"
+#endif
#include "stats.h"
extern void des_fixup_key_parity();
Index: des/read_pssword.c
===================================================================
RCS file: /cvs/openafs/src/des/read_pssword.c,v
retrieving revision 1.5
diff -u -r1.5 read_pssword.c
--- des/read_pssword.c 2001/05/14 21:19:48 1.5
+++ des/read_pssword.c 2001/05/15 14:01:31
@@ -17,10 +17,13 @@
#include "conf.h"
#include <stdio.h>
-#if defined(AFS_SUN5_ENV)
+
+#if defined(HAVE_STRINGS_H)
#include <strings.h>
#endif
+#if defined(HAVE_STRING_H)
#include <string.h>
+#endif
#ifdef BSDUNIX
#ifdef AFS_SUN5_ENV
@@ -34,8 +37,11 @@
#include <setjmp.h>
#endif
-#if defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#ifdef HAVE_SIGNAL_H
#include <signal.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@@ -46,14 +52,11 @@
static int intrupt;
#endif
-#if defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV)
+#ifdef HAVE_TERMIOS_H
#include <termios.h>
#endif
-#if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
-#include <termios.h>
-#endif
-#ifdef AFS_NT40_ENV
+#ifdef HAVE_WINDOWS_H
#include <windows.h>
#endif
Index: des/strng_to_key.c
===================================================================
RCS file: /cvs/openafs/src/des/strng_to_key.c,v
retrieving revision 1.4
diff -u -r1.4 strng_to_key.c
--- des/strng_to_key.c 2001/05/14 21:19:48 1.4
+++ des/strng_to_key.c 2001/05/15 14:01:31
@@ -22,10 +22,15 @@
#include <mit-cpyright.h>
#include <stdio.h>
-#include <string.h>
#include <afs/param.h>
#include <des.h>
#include "des_internal.h"
+#if defined(HAVE_STRINGS_H)
+#include <strings.h>
+#endif
+#if defined(HAVE_STRING_H)
+#include <string.h>
+#endif
extern int des_debug;
extern int des_debug_print();
Index: des/weak_key.c
===================================================================
RCS file: /cvs/openafs/src/des/weak_key.c,v
retrieving revision 1.2
diff -u -r1.2 weak_key.c
--- des/weak_key.c 2001/04/14 17:50:03 1.2
+++ des/weak_key.c 2001/05/15 14:01:31
@@ -12,9 +12,14 @@
* Originally written 8/85 by Steve Miller, MIT Project Athena.
*/
-#include <string.h>
#include <des.h>
#include "des_internal.h"
+#if defined(HAVE_STRINGS_H)
+#include <strings.h>
+#endif
+#if defined(HAVE_STRING_H)
+#include <string.h>
+#endif
/*
* The following are the weak DES keys: