remove occurences of USE_STRING_H, HAS_STRDUP, and HAS_LABS

(see ChangeLogs for details)

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

5 files changed, 22 insertions, 12 deletions

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index a2b90d42a1..2dd4e5af5d 100644
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,10 @@
+Thu Sep 18 17:52:59 1997  Tom Yu  <tlyu@mit.edu>
+
+	* win-mac.h: Replace USE_STRING_H with something more sane.
+
+	* k5-int.h: Replace USE_STRING_H, HAS_STRDUP, HAS_LABS with
+ 	something more sane.
+
 Mon Sep 15 14:54:55 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* krb5.hin: Add const to prototypes for krb5_cc_resolve,
diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 9eb30b4b1a..47edbce03f 100644
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -68,7 +68,7 @@
 #define INI_FILES	"Files"
 #define INI_KRB_CCACHE	"krb5cc"	/* Location of the ccache */
 #define INI_KRB5_CONF	"krb5.ini"	/* Location of krb5.conf file */
-#define HAS_LABS
+#define HAVE_LABS
 #endif
 
 
@@ -79,7 +79,7 @@
 #define SIZEOF_SHORT 2
 #define HAVE_SRAND
 #define NO_PASSWORD
-#define HAS_LABS
+#define HAVE_LABS
 #define ENOMEM -1
 #define ANSI_STDIO
 #ifndef _SIZET
@@ -145,7 +145,7 @@ typedef unsigned char	u_char;
 #define O_BINARY 0
 #endif
 
-#ifndef HAS_LABS
+#ifndef HAVE_LABS
 #define labs(x) abs(x)
 #endif
 
@@ -365,13 +365,13 @@ extern char *getenv();
 #endif /* ! __STDC__ */
 #endif /* HAS_STDLIB_H */
 
-#ifdef USE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
 #endif
 
-#ifndef HAS_STRDUP
+#ifndef HAVE_STRDUP
 extern char *strdup KRB5_PROTOTYPE((const char *));
 #endif
 
diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 353189e441..9226e5efec 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 18 20:42:03 1997  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Replace USE_STRING_H, HAS_STRDUP, HAS_LABS
+
 Mon Sep 15 15:01:49 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* kdb_dbm.h: Add const to argument of krb5_dbm_db_get_principal.
diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index 60ea056a56..2e6dcd8eb5 100644
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -4,8 +4,7 @@ AC_CONFIG_HEADER(autoconf.h)
 AC_PROG_LEX
 AC_PROG_INSTALL
 HAVE_YYLINENO
-AC_FUNC_CHECK(strdup,AC_DEFINE(HAS_STRDUP))
-AC_FUNC_CHECK(labs,AC_DEFINE(HAS_LABS))
+AC_CHECK_FUNCS(strdup labs)
 CHECK_DIRENT
 CHECK_WAIT_TYPE
 AC_TYPE_UID_T
@@ -21,7 +20,7 @@ KRB5_SIGTYPE
 
 dnl
 dnl
-AC_HEADER_CHECK(string.h,AC_DEFINE(USE_STRING_H))
+AC_CHECK_HEADERS(string.h)
 AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H),AC_DEFINE(NO_STDLIB_H))
 AC_CHECK_HEADERS(sys/types.h sys/file.h sys/param.h sys/stat.h macsock.h stddef.h xom.h dbm.h ndbm.h)
 AC_HEADER_STDARG
diff --git a/src/include/win-mac.h b/src/include/win-mac.h
index 8193ea47f1..516c719979 100644
--- a/src/include/win-mac.h
+++ b/src/include/win-mac.h
@@ -65,7 +65,7 @@
 
 #include <windows.h>   /* always include this here, to get correct FAR and NEAR */
 
-#define HAS_LABS
+#define HAVE_LABS
 
 #ifndef KRB5_CALLCONV
 #ifdef _MSC_VER
@@ -98,10 +98,10 @@ typedef unsigned char	u_char;
 
 #define KRB5_USE_INET
 #define MSDOS_FILESYSTEM
-#define USE_STRING_H 
+#define HAVE_STRING_H 
 #define HAVE_SRAND
 #define HAVE_ERRNO
-#define HAS_STRDUP
+#define HAVE_STRDUP
 #define NO_USERID
 #define NO_PASSWORD
 
@@ -233,7 +233,7 @@ HINSTANCE get_lib_instance(void);
 #define SIZEOF_SHORT 2
 #define HAVE_SRAND
 #define NO_PASSWORD
-#define HAS_LABS
+#define HAVE_LABS
 #define ENOMEM -1
 #define ANSI_STDIO
 #ifndef _SIZET