afsconfig-updates-20010515

updates to and to use afsconfig.h

diff --git a/src/afsconfig.h.in b/src/afsconfig.h.in
index 8511204..8cccb57 100644 (file)
--- a/src/afsconfig.h.in
+++ b/src/afsconfig.h.in
@@ -13,6 +13,7 @@
 #define HAVE_STRING_H
 
 #ifdef AFS_NT40_ENV
+#define HAVE_WINDOWS_H
 #define HAVE_MALLOC_H
 #define HAVE_WINSOCK2_H
 #define HAVE_DIRECT_H
@@ -51,4 +52,21 @@
 #define HAVE_SYS_MOUNT_H
 #endif
 
+#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_ENV) || defined(AFS_LINUX22_ENV)
+#define HAVE_STRINGS_H
+#define HAVE_STRING_H
+#else
+#define HAVE_STRING_H
+#endif
+
+#if defined(AFS_SUN_ENV) && !defined(AFS_SUN5_ENV)
+#define HAVE_TERMIOS_H
+#elif defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#define HAVE_TERMIOS_H
+#endif
+
+#if defined(AFS_SGI_ENV) || defined(AFS_LINUX20_ENV) || defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV)
+#define HAVE_SIGNAL_H
+#endif
+
 #endif /* AFSCONFIG_H */

diff --git a/src/des/Makefile b/src/des/Makefile
index 5cb0fc2..51013f8 100644 (file)
--- a/src/des/Makefile
+++ b/src/des/Makefile
@@ -36,8 +36,8 @@ DBG   =
 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,

diff --git a/src/des/andrew-conf.h b/src/des/andrew-conf.h
index 74a316d..ed4cc4a 100644 (file)
--- a/src/des/andrew-conf.h
+++ b/src/des/andrew-conf.h
@@ -3,6 +3,7 @@
  */
 
 #include <afs/param.h>
+#include <afsconfig.h>
 #ifdef vax
 #include "conf-bsdvax.h"
 #else

diff --git a/src/des/cksum.c b/src/des/cksum.c
index e85add7..2244356 100644 (file)
--- a/src/des/cksum.c
+++ b/src/des/cksum.c
@@ -20,11 +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>
 #include "des_internal.h"

diff --git a/src/des/crypt.c b/src/des/crypt.c
index d16e2cc..d60375c 100644 (file)
--- a/src/des/crypt.c
+++ b/src/des/crypt.c
@@ -42,7 +42,12 @@ static char sccsid[] = "@(#)crypt.c  5.11 (Berkeley) 6/25/91";
 #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.

diff --git a/src/des/des_conf.h b/src/des/des_conf.h
index 8bdbe90..a643fb3 100644 (file)
--- a/src/des/des_conf.h
+++ b/src/des/des_conf.h
@@ -16,6 +16,7 @@
  */
 
 #include <afs/param.h>
+#include <afsconfig.h>
 #include <mit-cpyright.h>
 
 /* Machine-type and OS-type based configuration */

diff --git a/src/des/new_rnd_key.c b/src/des/new_rnd_key.c
index 2461ab9..557a8fe 100644 (file)
--- a/src/des/new_rnd_key.c
+++ b/src/des/new_rnd_key.c
@@ -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();

diff --git a/src/des/read_pssword.c b/src/des/read_pssword.c
index 9871c27..8eb307b 100644 (file)
--- a/src/des/read_pssword.c
+++ b/src/des/read_pssword.c
@@ -17,10 +17,12 @@
 #include "conf.h"
 
 #include <stdio.h>
-#if defined(AFS_SUN5_ENV) || defined(AFS_SGI_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 +36,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 +51,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
 

diff --git a/src/des/strng_to_key.c b/src/des/strng_to_key.c
index 550372c..43ee72b 100644 (file)
--- a/src/des/strng_to_key.c
+++ b/src/des/strng_to_key.c
@@ -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();

diff --git a/src/des/weak_key.c b/src/des/weak_key.c
index 0ebe45a..0b6b4d7 100644 (file)
--- a/src/des/weak_key.c
+++ b/src/des/weak_key.c
@@ -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:

diff --git a/src/libafsrpc/Makefile b/src/libafsrpc/Makefile
index 543e3c0..5140265 100644 (file)
--- a/src/libafsrpc/Makefile
+++ b/src/libafsrpc/Makefile
@@ -13,7 +13,7 @@ include ../config/Makefile.${SYS_NAME}
 
 CC=${MT_CC}
 INCLUDES = -I${SRCDIR}include -I.. -I../rx
-CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS}
+CFLAGS = ${OPTMZ} ${DBG} ${INCLUDES} -DRXDEBUG ${MT_CFLAGS} -I${TOP_SRCDIR}/config
 SFLAGS=-P -I${SRCDIR}include
 RX = ../rx
 CCRULE = ${CC} ${CFLAGS} -c $?