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

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index d330acc55e8d998a5a37e4c898216d6aa1ae366b..24f6d3d64a81761209d4fac76a797e03adfead9c 100644 (file)
--- 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 95fff062c606fe2226f8e165e9dd1913789c8584..76b7cbee31a0e1fdfd2474c128d7ae50a0f19616 100644 (file)
--- 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 c186fe0077b8b097f29e635ca70509d0ad8740ea..a90987f9f53b8e1036edb74b6bb24aa71c9bee31 100644 (file)
--- 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 afc7d360a2395d697427a67d258be6c05710fec4..007ccdd53b4810b4bbf22add2b7875162938b031 100644 (file)
--- 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 f485d6b6694b6cf442715eda31bad4c58ca46b63..98e57978bfa1ecbe79fb765d6f1f4df9188ef0e1 100644 (file)
--- 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 f33fae7ae5b41d40fc0054bb414f573bc6cb55b5..7797370a53d726ed6e7f437f89c1a1e8b51bb370 100644 (file)
--- 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 f7e4c8739e807c2f50a9896512b0fa78e3e229aa..a91cce0c32fa5ab131fc5c7218b5e5b1269c849d 100644 (file)
--- 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 31b5d62b43ece2a7eb7f56bee3bea66df46e5cce..7b6a85e66e45e4606ef3ef1be76205f92c6a81bf 100644 (file)
--- 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 51bcfc13750577875eac0877d27c23f5b22f8ac7..e930a4a3620d3ee406a26c03343044c9954822bc 100644 (file)
--- 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