Check for existance of <memory.h>.

(from Nathan Neulinger <nneul@umr.edu>)

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

40 files changed, 123 insertions, 5 deletions

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index dd9961674..800c9f87a 100644
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* configure.in, defs.h: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-03-20  Ken Raeburn  <raeburn@mit.edu>
 	    Jeffrey Altman  <jaltman@watsun.cc.columbia.edu>
 
diff --git a/src/appl/telnet/telnetd/configure.in b/src/appl/telnet/telnetd/configure.in
index e11b270bb..2c37a2eb3 100644
--- a/src/appl/telnet/telnetd/configure.in
+++ b/src/appl/telnet/telnetd/configure.in
@@ -22,7 +22,7 @@ if test -z "$ac_sysv_termio"; then
 fi
 fi
 AC_HEADER_TIME
-AC_CHECK_HEADERS(string.h arpa/nameser.h utmp.h sys/time.h sys/tty.h sac.h sys/ptyvar.h sys/filio.h sys/stream.h sys/utsname.h)
+AC_CHECK_HEADERS(string.h arpa/nameser.h utmp.h sys/time.h sys/tty.h sac.h sys/ptyvar.h sys/filio.h sys/stream.h sys/utsname.h memory.h)
 AC_CHECK_FUNCS(gettosbyname)
 dnl Make our operating system-specific security checks and definitions for
 dnl login.
diff --git a/src/appl/telnet/telnetd/defs.h b/src/appl/telnet/telnetd/defs.h
index 233743179..482c25c7d 100644
--- a/src/appl/telnet/telnetd/defs.h
+++ b/src/appl/telnet/telnetd/defs.h
@@ -154,7 +154,9 @@ typedef unsigned char cc_t;
 #  endif /* FD_ZERO */
 # endif	/* CRAY1 */
 
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 #endif	/* CRAY */
 
 #ifdef __hpux
diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog
index b0cfc603b..87457c7fc 100644
--- a/src/kadmin/ChangeLog
+++ b/src/kadmin/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* configure.in: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 1999-10-26  Wilfredo Sanchez  <tritan@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in
index 5148b262f..979a372c2 100644
--- a/src/kadmin/configure.in
+++ b/src/kadmin/configure.in
@@ -3,7 +3,7 @@ CONFIG_RULES
 AC_PROG_INSTALL
 AC_PROG_YACC
 AC_PROG_AWK
-AC_CHECK_HEADERS(unistd.h stdlib.h krb_db.h kdc.h alloca.h sys/time.h sys/select.h)
+AC_CHECK_HEADERS(unistd.h stdlib.h krb_db.h kdc.h alloca.h sys/time.h sys/select.h memory.h)
 AC_CHECK_FUNCS(ftime timezone getcwd strstr waitpid vsprintf)
 AC_REPLACE_FUNCS([memmove strftime])
 AC_HEADER_TIME
diff --git a/src/kadmin/dbutil/ChangeLog b/src/kadmin/dbutil/ChangeLog
index 051bd106f..1aa379e59 100644
--- a/src/kadmin/dbutil/ChangeLog
+++ b/src/kadmin/dbutil/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* ovload.c: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 1999-10-26  Wilfredo Sanchez  <tritan@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/kadmin/dbutil/ovload.c b/src/kadmin/dbutil/ovload.c
index 4e2d09b56..6cecac7d7 100644
--- a/src/kadmin/dbutil/ovload.c
+++ b/src/kadmin/dbutil/ovload.c
@@ -1,7 +1,9 @@
 #include    <unistd.h>
 #include    <string.h>
 #include    <stdlib.h>
+#ifdef HAVE_MEMORY_H
 #include    <memory.h>
+#endif
 
 #include    <kadm5/adb.h>
 #include    "import_err.h"
diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index c8d52e7d1..cbf49a162 100644
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* kadm_rpc_svc.c: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-03-16  Ken Raeburn  <raeburn@mit.edu>
 	    Matt Crawford  <crawdad@fnal.gov>
 
diff --git a/src/kadmin/server/kadm_rpc_svc.c b/src/kadmin/server/kadm_rpc_svc.c
index 5d9e8c33e..8e78bcca8 100644
--- a/src/kadmin/server/kadm_rpc_svc.c
+++ b/src/kadmin/server/kadm_rpc_svc.c
@@ -12,7 +12,9 @@ static char *rcsid = "$Header$";
 #include <stdio.h>
 #include <gssrpc/rpc.h>
 #include <syslog.h>
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 #include <kadm5/kadm_rpc.h>
 #include <krb5.h>
 #include <kadm5/admin.h>
diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog
index ccc416c91..f451cbe0d 100644
--- a/src/lib/crypto/ChangeLog
+++ b/src/lib/crypto/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* configure.in, nfold.c: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-01-24  Tom Yu  <tlyu@mit.edu>
 
 	* crypto_libinit.c: Add terminating newline; use 0 and 1 instead
diff --git a/src/lib/crypto/configure.in b/src/lib/crypto/configure.in
index 0dfa334f3..18ac53753 100644
--- a/src/lib/crypto/configure.in
+++ b/src/lib/crypto/configure.in
@@ -5,6 +5,8 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 AC_PROG_INSTALL
 
+AC_CHECK_HEADERS(memory.h)
+
 KRB5_RUN_FLAGS
 KRB5_BUILD_PROGRAM
 KRB5_BUILD_LIBOBJS
diff --git a/src/lib/crypto/nfold.c b/src/lib/crypto/nfold.c
index 3b1f5a0fd..9c1fe2686 100644
--- a/src/lib/crypto/nfold.c
+++ b/src/lib/crypto/nfold.c
@@ -25,7 +25,9 @@
  */
 
 #include "k5-int.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /*
 n-fold(k-bits):
diff --git a/src/lib/gssapi/ChangeLog b/src/lib/gssapi/ChangeLog
index 1e0213f8a..7dc9b00e7 100644
--- a/src/lib/gssapi/ChangeLog
+++ b/src/lib/gssapi/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* configure.in: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 Tue Feb 22 10:23:19 2000  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (clean-unix): Add clean-libobjs.
diff --git a/src/lib/gssapi/configure.in b/src/lib/gssapi/configure.in
index ed1f09f4f..1ed12a17e 100644
--- a/src/lib/gssapi/configure.in
+++ b/src/lib/gssapi/configure.in
@@ -7,7 +7,7 @@ AC_PROG_ARCHIVE_ADD
 AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h)
+AC_CHECK_HEADERS(stdlib.h sys/types.h limits.h memory.h)
 AC_SIZE_T
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
diff --git a/src/lib/gssapi/generic/ChangeLog b/src/lib/gssapi/generic/ChangeLog
index de71a5085..78e0e4d96 100644
--- a/src/lib/gssapi/generic/ChangeLog
+++ b/src/lib/gssapi/generic/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* util_token.c: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 1999-10-26  Wilfredo Sanchez  <tritan@mit.edu>
 
 	* Makefile.in: Clean up usage of CFLAGS, CPPFLAGS, DEFS, DEFINES,
diff --git a/src/lib/gssapi/generic/util_token.c b/src/lib/gssapi/generic/util_token.c
index 9e186a153..38d1fb198 100644
--- a/src/lib/gssapi/generic/util_token.c
+++ b/src/lib/gssapi/generic/util_token.c
@@ -21,7 +21,9 @@
  */
 
 #include "gssapiP_generic.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /*
  * $Id$
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 3f7d99509..ccb16f49a 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,10 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* accept_sec_context.c, gssapiP_krb5.h, init_sec_context.c,
+	k5unseal.c, util_cksum.c, util_crypt.c, util_seed.c: Check for
+	existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-5-19	Alexandra Ellwood <lxs@mit.edu>
 
 	* acquire_cred.c: Changed to use krb5int_cc_default.  This function 
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index fc920ec27..075d0e4c8 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -48,7 +48,9 @@
 
 #include "k5-int.h"
 #include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /*
  * $Id$
diff --git a/src/lib/gssapi/krb5/gssapiP_krb5.h b/src/lib/gssapi/krb5/gssapiP_krb5.h
index e344b4fbb..a22cd8ddd 100644
--- a/src/lib/gssapi/krb5/gssapiP_krb5.h
+++ b/src/lib/gssapi/krb5/gssapiP_krb5.h
@@ -28,7 +28,9 @@
  */
 
 #include <krb5.h>
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /* work around sunos braindamage */
 #ifdef major
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index d0c8bc944..8baad8c05 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -47,7 +47,9 @@
  */
 
 #include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 #include <stdlib.h>
 
 /*
diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
index 64a95396b..da5966f23 100644
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -47,7 +47,9 @@
  */
 
 #include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /*
  * $Id$
diff --git a/src/lib/gssapi/krb5/util_cksum.c b/src/lib/gssapi/krb5/util_cksum.c
index 10e6b657f..61fbc666d 100644
--- a/src/lib/gssapi/krb5/util_cksum.c
+++ b/src/lib/gssapi/krb5/util_cksum.c
@@ -25,7 +25,9 @@
  */
 
 #include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 krb5_error_code
 kg_checksum_channel_bindings(context, cb, cksum, bigend)
diff --git a/src/lib/gssapi/krb5/util_crypt.c b/src/lib/gssapi/krb5/util_crypt.c
index 93d46946c..8792e5fed 100644
--- a/src/lib/gssapi/krb5/util_crypt.c
+++ b/src/lib/gssapi/krb5/util_crypt.c
@@ -48,7 +48,9 @@
 
 #include "k5-int.h"
 #include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /*
  * $Id$
diff --git a/src/lib/gssapi/krb5/util_seed.c b/src/lib/gssapi/krb5/util_seed.c
index 206ee68a7..24ae7f3f4 100644
--- a/src/lib/gssapi/krb5/util_seed.c
+++ b/src/lib/gssapi/krb5/util_seed.c
@@ -21,7 +21,9 @@
  */
 
 #include "gssapiP_krb5.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /*
  * $Id$
diff --git a/src/lib/kadm5/ChangeLog b/src/lib/kadm5/ChangeLog
index 6df8c2f5c..b8dedb276 100644
--- a/src/lib/kadm5/ChangeLog
+++ b/src/lib/kadm5/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* configure.in, chpass_util.c, server_internal.h: Check for
+	existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-02-26  Tom Yu  <tlyu@mit.edu>
 
 	* kadm_rpc_xdr.c (xdr_cprinc3_arg): Don't XDR the nonexistent
diff --git a/src/lib/kadm5/chpass_util.c b/src/lib/kadm5/chpass_util.c
index dbf610ce3..367d8f201 100644
--- a/src/lib/kadm5/chpass_util.c
+++ b/src/lib/kadm5/chpass_util.c
@@ -8,7 +8,9 @@
 
 
 #include <stdio.h>
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 #include <time.h>
 
 #include <kadm5/admin.h>
diff --git a/src/lib/kadm5/clnt/ChangeLog b/src/lib/kadm5/clnt/ChangeLog
index 4864b0f4c..167294257 100644
--- a/src/lib/kadm5/clnt/ChangeLog
+++ b/src/lib/kadm5/clnt/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* client_init.c, client_principal.c, client_rpc.c: Check for
+	existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-02-26  Tom Yu  <tlyu@mit.edu>
 
 	* client_principal.c (kadm5_create_principal_3): Remove keepold
diff --git a/src/lib/kadm5/clnt/client_init.c b/src/lib/kadm5/clnt/client_init.c
index a3d261306..53d6e15af 100644
--- a/src/lib/kadm5/clnt/client_init.c
+++ b/src/lib/kadm5/clnt/client_init.c
@@ -36,7 +36,9 @@ static char *rcsid = "$Header$";
 
 #include <stdio.h>
 #include <netdb.h>
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 #include <string.h>
 #include <com_err.h>
 #include <sys/types.h>
diff --git a/src/lib/kadm5/clnt/client_principal.c b/src/lib/kadm5/clnt/client_principal.c
index cd2bdf042..18ac45238 100644
--- a/src/lib/kadm5/clnt/client_principal.c
+++ b/src/lib/kadm5/clnt/client_principal.c
@@ -11,7 +11,9 @@ static char *rcsid = "$Header$";
 #include    <gssrpc/rpc.h>
 #include    <kadm5/admin.h>
 #include    <kadm5/kadm_rpc.h>
+#ifdef HAVE_MEMORY_H
 #include    <memory.h>
+#endif
 #include    "client_internal.h"
 
 kadm5_ret_t
diff --git a/src/lib/kadm5/clnt/client_rpc.c b/src/lib/kadm5/clnt/client_rpc.c
index 7c55ab461..8f309bb78 100644
--- a/src/lib/kadm5/clnt/client_rpc.c
+++ b/src/lib/kadm5/clnt/client_rpc.c
@@ -2,7 +2,9 @@
 #include <kadm5/kadm_rpc.h>
 #include <krb5.h>
 #include <kadm5/admin.h>
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /* Default timeout can be changed using clnt_control() */
 static struct timeval TIMEOUT = { 25, 0 };
diff --git a/src/lib/kadm5/configure.in b/src/lib/kadm5/configure.in
index 1225a0969..6c1bef999 100644
--- a/src/lib/kadm5/configure.in
+++ b/src/lib/kadm5/configure.in
@@ -6,7 +6,7 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LEX
 AC_PROG_AWK
-AC_CHECK_HEADERS(syslog.h)
+AC_CHECK_HEADERS(syslog.h memory.h)
 AC_CHECK_FUNCS(openlog syslog closelog strftime vsprintf)
 KRB5_AC_REGEX_FUNCS
 dnl
diff --git a/src/lib/kadm5/server_internal.h b/src/lib/kadm5/server_internal.h
index f80812603..598ae45a5 100644
--- a/src/lib/kadm5/server_internal.h
+++ b/src/lib/kadm5/server_internal.h
@@ -13,7 +13,9 @@
 #ifndef __KADM5_SERVER_INTERNAL_H__
 #define __KADM5_SERVER_INTERNAL_H__
 
+#ifdef HAVE_MEMORY_H
 #include    <memory.h>
+#endif
 #include    <stdlib.h>
 #include    "k5-int.h"
 #include    <krb5/kdb.h>
diff --git a/src/lib/kadm5/srv/ChangeLog b/src/lib/kadm5/srv/ChangeLog
index 2d1cb4263..1864a733f 100644
--- a/src/lib/kadm5/srv/ChangeLog
+++ b/src/lib/kadm5/srv/ChangeLog
@@ -1,3 +1,9 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* adb_free.c, adb_xdr.c, server_dict.c: Check for existance
+	of<memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-03-16  Ken Raeburn  <raeburn@mit.edu>
 	    Matt Crawford  <crawdad@fnal.gov>
 
diff --git a/src/lib/kadm5/srv/adb_free.c b/src/lib/kadm5/srv/adb_free.c
index 5cd461748..cfc107d06 100644
--- a/src/lib/kadm5/srv/adb_free.c
+++ b/src/lib/kadm5/srv/adb_free.c
@@ -4,6 +4,10 @@
  * $Header$
  * 
  * $Log$
+ * Revision 1.3  2000/06/01 02:02:03  tritan
+ * Check for existance of <memory.h>.
+ * (from Nathan Neulinger <nneul@umr.edu>)
+ *
  * Revision 1.2  1996/10/18 19:45:49  bjaspan
  * 	* svr_misc_free.c, server_dict.c, adb_policy.c, adb_free.c:
  *  	include stdlib.h instead of malloc.h [krb5-admin/35]
@@ -52,7 +56,9 @@ static char *rcsid = "$Header$";
 #endif
 
 #include	"adb.h"
+#ifdef HAVE_MEMORY_H
 #include	<memory.h>
+#endif
 #include	<stdlib.h>
 
 void
diff --git a/src/lib/kadm5/srv/adb_xdr.c b/src/lib/kadm5/srv/adb_xdr.c
index 5d1fd1302..b6ea89cfd 100644
--- a/src/lib/kadm5/srv/adb_xdr.c
+++ b/src/lib/kadm5/srv/adb_xdr.c
@@ -13,7 +13,9 @@ static char *rcsid = "$Header$";
 #include <gssrpc/rpc.h>
 #include "adb.h"
 #include "admin_xdr.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 bool_t
 xdr_krb5_key_data(XDR *xdrs, krb5_key_data *objp)
diff --git a/src/lib/kadm5/srv/server_dict.c b/src/lib/kadm5/srv/server_dict.c
index 8cec441b3..c1f2f62c3 100644
--- a/src/lib/kadm5/srv/server_dict.c
+++ b/src/lib/kadm5/srv/server_dict.c
@@ -17,7 +17,9 @@ static char *rcsid = "$Header$";
 #include    <stdlib.h>
 #include    <stdio.h>
 #include    <string.h>
+#ifdef HAVE_MEMORY_H
 #include    <memory.h>
+#endif
 #include    <syslog.h>
 #include    "server_internal.h"
 
diff --git a/src/lib/krb5/ChangeLog b/src/lib/krb5/ChangeLog
index a2ab81a2a..89f7f2ea1 100644
--- a/src/lib/krb5/ChangeLog
+++ b/src/lib/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* configure.in: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-03-14  Ken Raeburn  <raeburn@mit.edu>
 
 	* configure.in: Check for gethostbyname2.
diff --git a/src/lib/krb5/configure.in b/src/lib/krb5/configure.in
index 9b0c29d54..9e944dbbd 100644
--- a/src/lib/krb5/configure.in
+++ b/src/lib/krb5/configure.in
@@ -7,7 +7,7 @@ AC_CONST
 AC_TYPE_UID_T
 HAS_ANSI_VOLATILE
 AC_HEADER_STDARG
-AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h)
+AC_CHECK_HEADERS(unistd.h paths.h regex.h regexp.h regexpr.h fcntl.h memory.h)
 AC_CHECK_FUNCS(flock fchmod chmod strftime strptime geteuid setenv unsetenv getenv setsid gethostbyname2)
 AC_REPLACE_FUNCS(vfprintf vsprintf strdup strcasecmp strerror memmove daemon getuid sscanf syslog)
 KRB5_AC_REGEX_FUNCS
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index f2c20ed87..14fa9c3d8 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+2000-05-31  Wilfredo Sanchez  <tritan@mit.edu>
+
+	* fwd_tgt.c: Check for existance of <memory.h>.
+	[from Nathan Neulinger <nneul@umr.edu>]
+
 2000-5-19	Alexandra Ellwood <lxs@mit.edu>
 
 	* sendauth.c, fwd_tgt.c: Changed to use krb5int_cc_default.  This function 
diff --git a/src/lib/krb5/krb/fwd_tgt.c b/src/lib/krb5/krb/fwd_tgt.c
index 769b20be8..925071fc2 100644
--- a/src/lib/krb5/krb/fwd_tgt.c
+++ b/src/lib/krb5/krb/fwd_tgt.c
@@ -26,7 +26,9 @@
 
 #define NEED_SOCKETS
 #include "k5-int.h"
+#ifdef HAVE_MEMORY_H
 #include <memory.h>
+#endif
 
 /* helper function: convert flags to necessary KDC options */
 #define flags2options(flags) (flags & KDC_TKT_COMMON_MASK)