afsconfig-updates-20010515

updates to and to use afsconfig.h

diff --git a/src/afsconfig.h.in b/src/afsconfig.h.in
index 8511204005144e48ed39811f7c4fb83a497c0ff7..8cccb57482eefc194de3a1732f677ac946a6eae7 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 5cb0fc2d7e77340e6cca1535256f4e71ca4e3071..51013f81d07da032429ca64b86dbd7405db69975 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 74a316dfd99dcc01cfe5c4928641fab46e536e86..ed4cc4ab8ae3f70d2496f5c70bc3df0501f49889 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 e85add71030da932fedc160a7f5306edfe0b5e28..224435666d7d5eb6f3b943a42126676e56252e15 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 d16e2cce94b6b2bb98319d41e9adb6675993e723..d60375c50be50621a4e8046a6cd83aa30d8a57eb 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 8bdbe90d749100b6bdb0d65f50d0f6478bbbeef4..a643fb3e23cacd05230752568cf022f2c824f771 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 2461ab95dcd3ed641d46677f2c6f920aa8594a8b..557a8fec9328f02e0eaa44a3481500fa90a2e44d 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 9871c2701661d5aae0c185c1e453f17b42071502..8eb307b70932027b174fd1075e78cbd3b6e4e61b 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 550372cf5eea25b8ae26cb747372e988eefcedbd..43ee72bc4d1b3cbc19fd068f4e115d58f0c44909 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 0ebe45aaabee87665f717fba46283c896e8a1d15..0b6b4d7e3d9cef41afa2b6df420a5198bb2dc367 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 543e3c0077e69062f16148c59f2c355bfbed5374..5140265da41eee936c35776bdd70419124cface3 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 $?