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

28 files changed, 81 insertions, 31 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 69af8c10c7..3ab8ec1b16 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 18 17:51:39 1997  Tom Yu  <tlyu@mit.edu>
+
+	* acconfig.h: Remove USE_STRING_H, HAS_STRDUP, HAS_LABS
+
 Mon Aug 18 11:28:25 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* aclocal.m4 (KRB5_LIB_PARAMS): For the alpha, RUN_ENV needs to
diff --git a/src/acconfig.h b/src/acconfig.h
index b3b6c7aae5..f67b762138 100644
--- a/src/acconfig.h
+++ b/src/acconfig.h
@@ -9,8 +9,6 @@
 #undef ANSI_STDIO
 #undef HAS_SETVBUF
 #undef HAS_STDLIB_H
-#undef HAS_STRDUP
-#undef HAS_LABS
 #undef HAS_VOID_TYPE
 #undef KRB5_NO_PROTOTYPES
 #undef KRB5_PROVIDE_PROTOTYPES
@@ -23,7 +21,6 @@
 #undef POSIX_TERMIOS
 #undef POSIX_TYPES
 #undef USE_DIRENT_H
-#undef USE_STRING_H
 #undef WAIT_USES_INT
 #undef krb5_sigtype
 #undef HAS_UNISTD_H
diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog
index 68aa4ab306..8bdd01df75 100644
--- a/src/appl/gss-sample/ChangeLog
+++ b/src/appl/gss-sample/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 18 17:52:26 1997  Tom Yu  <tlyu@mit.edu>
+
+	* configure.in: Replace USE_STRING_H with something more sane.
+
+	* gss-server.c: Replace USE_STRING_H with something more sane.
+
 Fri Jun  6 15:05:57 1997  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* gss-server.c (server_establish_context): Rearrange server
diff --git a/src/appl/gss-sample/configure.in b/src/appl/gss-sample/configure.in
index 635fa9a661..1cda89b3b6 100644
--- a/src/appl/gss-sample/configure.in
+++ b/src/appl/gss-sample/configure.in
@@ -1,8 +1,7 @@
 AC_INIT(gss-client.c)
 CONFIG_RULES
 USE_ANAME
-AC_CHECK_HEADERS(unistd.h stdlib.h)
-AC_CHECK_HEADER(string.h,AC_DEFINE(USE_STRING_H))
+AC_CHECK_HEADERS(unistd.h stdlib.h string.h)
 AC_CONST
 AC_PROG_INSTALL
 KRB5_BUILD_PROGRAM
diff --git a/src/appl/gss-sample/gss-server.c b/src/appl/gss-sample/gss-server.c
index f195b45a06..ef9d495820 100644
--- a/src/appl/gss-sample/gss-server.c
+++ b/src/appl/gss-sample/gss-server.c
@@ -38,7 +38,7 @@ static char *rcsid = "$Header$";
 #include <gssapi/gssapi_generic.h>
 #include "gss-misc.h"
 
-#ifdef USE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
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
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog
index 1bfeee128a..25bbd67e6c 100644
--- a/src/kadmin/cli/ChangeLog
+++ b/src/kadmin/cli/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 18 17:54:10 1997  Tom Yu  <tlyu@mit.edu>
+
+	* memmove.c: Replace USE_STRING_H with something more sane.
+
 Fri Jul 25 15:45:24 1997  Tom Yu  <tlyu@mit.edu>
 
 	* dump.c: Update to new kdb API.
diff --git a/src/kadmin/cli/memmove.c b/src/kadmin/cli/memmove.c
index abc91e923e..71f5861556 100644
--- a/src/kadmin/cli/memmove.c
+++ b/src/kadmin/cli/memmove.c
@@ -40,7 +40,7 @@
 
 #include <krb5/osconf.h>
 #include <krb5/config.h>
-#ifdef USE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index 8cdc355bef..d834bdbd96 100644
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 18 17:54:40 1997  Tom Yu  <tlyu@mit.edu>
+
+	* kpasswd.c: Replace USE_STRING_H with something more sane.
+
 Thu Feb  6 00:28:54 1997  Richard Basch  <basch@lehman.com>
 
 	* adm_conn.c adm_rw.c:
diff --git a/src/kadmin/v5passwdd/kpasswd.c b/src/kadmin/v5passwdd/kpasswd.c
index 327c081a34..1a7d1c49b8 100644
--- a/src/kadmin/v5passwdd/kpasswd.c
+++ b/src/kadmin/v5passwdd/kpasswd.c
@@ -35,11 +35,11 @@
 #include "adm_defs.h"
 #include "adm.h"
 
-#ifdef	USE_STRING_H
+#ifdef	HAVE_STRING_H
 #include <string.h>
-#else	/* USE_STRING_H */
+#else	/* HAVE_STRING_H */
 #include <strings.h>
-#endif	/* USE_STRING_H */
+#endif	/* HAVE_STRING_H */
 
 
 /*
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index ec04ee0f4d..71e2cfa618 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 18 17:55:09 1997  Tom Yu  <tlyu@mit.edu>
+
+	* acquire_cred.c: Replace USE_STRING_H with something more sane.
+
+	* import_name.c: Replace USE_STRING_H with something more sane.
+
 Tue Jul 29 22:56:04 1997  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* inq_names.c (krb5_gss_inquire_names_for_mech): Add the 
diff --git a/src/lib/gssapi/krb5/acquire_cred.c b/src/lib/gssapi/krb5/acquire_cred.c
index 8f1935038d..402ac3ab2d 100644
--- a/src/lib/gssapi/krb5/acquire_cred.c
+++ b/src/lib/gssapi/krb5/acquire_cred.c
@@ -21,7 +21,7 @@
  */
 
 #include "gssapiP_krb5.h"
-#ifdef USE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
diff --git a/src/lib/gssapi/krb5/import_name.c b/src/lib/gssapi/krb5/import_name.c
index 92972dc53f..90206a7011 100644
--- a/src/lib/gssapi/krb5/import_name.c
+++ b/src/lib/gssapi/krb5/import_name.c
@@ -30,7 +30,7 @@
 #include <pwd.h>
 #endif
 
-#ifdef USE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog
index 01058953d0..ff2c9142b1 100644
--- a/src/lib/krb5/os/ChangeLog
+++ b/src/lib/krb5/os/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 18 17:56:00 1997  Tom Yu  <tlyu@mit.edu>
+
+	* hst_realm.c: Replace USE_STRING_H with something more sane.
+
 Mon Sep 15 15:21:12 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* ccdefname.c (krb5_cc_default_name): Returns a const char *.
diff --git a/src/lib/krb5/os/hst_realm.c b/src/lib/krb5/os/hst_realm.c
index 6ff814abf2..b782a03592 100644
--- a/src/lib/krb5/os/hst_realm.c
+++ b/src/lib/krb5/os/hst_realm.c
@@ -66,7 +66,7 @@
 #include "k5-int.h"
 #include <ctype.h>
 #include <stdio.h>
-#ifdef USE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
diff --git a/src/lib/krb5/posix/ChangeLog b/src/lib/krb5/posix/ChangeLog
index b5954ce926..c60660f16d 100644
--- a/src/lib/krb5/posix/ChangeLog
+++ b/src/lib/krb5/posix/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 18 17:56:29 1997  Tom Yu  <tlyu@mit.edu>
+
+	* strcasecmp.c: Replace USE_STRING_H with something more sane.
+
+	* memmove.c: Replace USE_STRING_H with something more sane.
+
 Sat Feb 22 22:42:10 1997  Richard Basch  <basch@lehman.com>
 
 	* Makefile.in: Use some of the new library list build rules in
diff --git a/src/lib/krb5/posix/memmove.c b/src/lib/krb5/posix/memmove.c
index 5126ed26c0..3650c3d5ab 100644
--- a/src/lib/krb5/posix/memmove.c
+++ b/src/lib/krb5/posix/memmove.c
@@ -42,7 +42,7 @@
 #ifdef HAS_SYS_TYPES_H
 #include <sys/types.h>
 #endif
-#ifdef USE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
diff --git a/src/lib/krb5/posix/strcasecmp.c b/src/lib/krb5/posix/strcasecmp.c
index cec8c1ed23..dda10ea314 100644
--- a/src/lib/krb5/posix/strcasecmp.c
+++ b/src/lib/krb5/posix/strcasecmp.c
@@ -32,7 +32,7 @@
  */
 
 #include "k5-int.h"
-#ifdef USE_STRING_H
+#ifdef HAVE_STRING_H
 #include <string.h>
 #else
 #include <strings.h>
diff --git a/src/mac/libraries/ChangeLog b/src/mac/libraries/ChangeLog
index 2bd1ed987d..f3a429d8fb 100644
--- a/src/mac/libraries/ChangeLog
+++ b/src/mac/libraries/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 18 17:59:05 1997  Tom Yu  <tlyu@mit.edu>
+
+	* autoconf.h: Replace USE_STRING_H with something more sane.
+
 Tue Jul 15 12:36:05 1997  Theodore Y. Ts'o  <tytso@mit.edu>
 
 	* KerberosHeaders.h: Remove (probably unneeded) size_t definition.
diff --git a/src/mac/libraries/KerberosHeaders.h b/src/mac/libraries/KerberosHeaders.h
index 2d95084ada..f8cc17d3a5 100644
--- a/src/mac/libraries/KerberosHeaders.h
+++ b/src/mac/libraries/KerberosHeaders.h
@@ -17,7 +17,7 @@
 #define ENOMEM -1
 #define HAVE_SRAND
 #define NO_PASSWORD
-#define HAS_LABS
+#define HAVE_LABS
 #define ANSI_STDIO
 
 #include <unix.h>
diff --git a/src/mac/libraries/autoconf.h b/src/mac/libraries/autoconf.h
index c5531dfb0a..f44a5db218 100644
--- a/src/mac/libraries/autoconf.h
+++ b/src/mac/libraries/autoconf.h
@@ -9,7 +9,7 @@
 #define NO_YYLINENO 1
 #define POSIX_TYPES 1
 #define USE_DIRENT_H 1
-#define USE_STRING_H 1
+#define HAVE_STRING_H 1
 #define WAIT_USES_INT 1
 #define krb5_sigtype void
 #define KRB5_USE_INET 1
diff --git a/src/util/ss/ChangeLog b/src/util/ss/ChangeLog
index 62b717c9af..1276069ace 100644
--- a/src/util/ss/ChangeLog
+++ b/src/util/ss/ChangeLog
@@ -1,3 +1,9 @@
+Thu Sep 18 20:44:03 1997  Tom Yu  <tlyu@mit.edu>
+
+	* utils.c: Replace HAS_STRDUP with something more sane.
+
+	* configure.in: Replace HAS_STRDUP with something more sane.
+
 Sun Aug 17 14:39:56 1997  Ezra Peisach  <epeisach@mit.edu>
 
 	* Makefile.in (SRCS): Add $(srcdir) as needed.
diff --git a/src/util/ss/configure.in b/src/util/ss/configure.in
index da5ed208d1..29c57ba3ba 100644
--- a/src/util/ss/configure.in
+++ b/src/util/ss/configure.in
@@ -7,7 +7,7 @@ AC_PROG_ARCHIVE
 AC_PROG_ARCHIVE_ADD
 AC_PROG_RANLIB
 HAVE_YYLINENO
-AC_FUNC_CHECK(strdup,AC_DEFINE(HAS_STRDUP))
+AC_CHECK_FUNCS(strdup)
 CHECK_DIRENT
 CHECK_WAIT_TYPE
 CHECK_SIGNALS
diff --git a/src/util/ss/utils.c b/src/util/ss/utils.c
index 3520601b70..9698e7043f 100644
--- a/src/util/ss/utils.c
+++ b/src/util/ss/utils.c
@@ -123,7 +123,7 @@ char *quote(string)
 	return(result);
 }
 
-#ifndef HAS_STRDUP
+#ifndef HAVE_STRDUP
 /* make duplicate of string and return pointer */
 char *strdup(s)
 	register char *s;