Use AC_HEADER_STDARG and use that test to set STDARG.

The old test assumed that either STDARG was defined or __STDC__ - which
is not sufficient.

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

9 files changed, 21 insertions, 5 deletions

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index d330acc55e..24f6d3d64a 100644
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 18 12:12:44 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* secure.c, ftp.c, ftp_var.h: Define STDARG if HAVE_STDARG_H is
+		defined (in addition to the other tests)
+
+	* configure.in: Add AC_HEADER_STDARG
+
 Fri Feb 16 15:50:51 1996  Mark Eichin  <eichin@cygnus.com>
 
 	* ftp.c (do_auth): return status handling fixes from kbalk@hp.com.
diff --git a/src/appl/gssftp/ftp/configure.in b/src/appl/gssftp/ftp/configure.in
index 95fff062c6..76b7cbee31 100644
--- a/src/appl/gssftp/ftp/configure.in
+++ b/src/appl/gssftp/ftp/configure.in
@@ -9,6 +9,7 @@ CHECK_WAIT_TYPE
 DECLARE_SYS_ERRLIST
 AC_FUNC_VFORK
 AC_HAVE_FUNCS(getcwd getdtablesize)
+AC_HEADER_STDARG
 AC_CHECK_HEADERS(sys/select.h)
 AC_HEADER_CHECK(termios.h,AC_FUNC_CHECK(cfsetispeed,AC_DEFINE(POSIX_TERMIOS)))
 AC_CHECK_HEADERS(stdlib.h)
diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index c186fe0077..a90987f9f5 100644
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -62,7 +62,7 @@ static char sccsid[] = "@(#)ftp.c	5.38 (Berkeley) 4/22/91";
 #include <fcntl.h>
 #include <pwd.h>
 #ifndef STDARG
-#if defined(__STDC__) && ! defined(VARARGS)
+#if (defined(__STDC__) && ! defined(VARARGS)) || defined(HAVE_STDARG_H)
 #define STDARG
 #endif
 #endif
diff --git a/src/appl/gssftp/ftp/ftp_var.h b/src/appl/gssftp/ftp/ftp_var.h
index afc7d360a2..007ccdd53b 100644
--- a/src/appl/gssftp/ftp/ftp_var.h
+++ b/src/appl/gssftp/ftp/ftp_var.h
@@ -134,6 +134,6 @@ extern	char *remglob();
 extern	int errno;
 extern	char *mktemp();
 
-#if defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS))
+#if (defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS))) || defined(HAVE_STDARG_H)
 extern command(char *, ...);
 #endif
diff --git a/src/appl/gssftp/ftp/secure.c b/src/appl/gssftp/ftp/secure.c
index f485d6b669..98e57978bf 100644
--- a/src/appl/gssftp/ftp/secure.c
+++ b/src/appl/gssftp/ftp/secure.c
@@ -120,7 +120,7 @@ looping_read(fd, buf, len)
 #endif
 
 
-#if defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS))
+#if defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS)) || defined(HAVE_STDARG_H)
 extern secure_error(char *, ...);
 #else
 extern secure_error();
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index f33fae7ae5..7797370a53 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 18 12:12:20 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* configure.in: Add AC_HEADER_STDARG
+
+	* ftpcmd.y, ftpd.c: Declard STDARG if HAVE_STDARG_H is
+		declared. 
+
 Fri Mar 15 14:16:41 1996  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* ftpd.c (auth_data): Do not fail if last gss_service is not
diff --git a/src/appl/gssftp/ftpd/configure.in b/src/appl/gssftp/ftpd/configure.in
index f7e4c8739e..a91cce0c32 100644
--- a/src/appl/gssftp/ftpd/configure.in
+++ b/src/appl/gssftp/ftpd/configure.in
@@ -9,6 +9,7 @@ CHECK_SIGPROCMASK
 CHECK_WAIT_TYPE
 DECLARE_SYS_ERRLIST
 AC_FUNC_VFORK
+AC_HEADER_STDARG
 AC_CHECK_HEADERS(unistd.h stdlib.h string.h)
 AC_REPLACE_FUNCS(getdtablesize)
 AC_HAVE_FUNCS(getcwd getusershell seteuid setreuid setresuid)
diff --git a/src/appl/gssftp/ftpd/ftpcmd.y b/src/appl/gssftp/ftpd/ftpcmd.y
index 31b5d62b43..7b6a85e66e 100644
--- a/src/appl/gssftp/ftpd/ftpcmd.y
+++ b/src/appl/gssftp/ftpd/ftpcmd.y
@@ -68,7 +68,7 @@ extern	char *auth_type;
 unsigned int maxbuf, actualbuf;
 unsigned char *ucbuf;
 
-#if defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS))
+#if defined(STDARG) || (defined(__STDC__) && ! defined(VARARGS)) || defined(HAVE_STDARG_H)
 extern reply(int, char *, ...);
 extern lreply(int, char *, ...);
 #endif
diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 51bcfc1375..e930a4a362 100644
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -78,7 +78,7 @@ static char sccsid[] = "@(#)ftpd.c	5.40 (Berkeley) 7/2/91";
 #include <stdlib.h>
 #include <string.h>
 #ifndef STDARG
-#if defined(__STDC__) && ! defined(VARARGS)
+#if (defined(__STDC__) && ! defined(VARARGS)) || defined(HAVE_STDARG_H)
 #define STDARG
 #endif
 #endif