3 files changed, 9 insertions, 6 deletions
diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c
index fa66a113c..7cc68939c 100644
--- a/src/util/et/com_err.c
+++ b/src/util/et/com_err.c
@@ -7,10 +7,7 @@
 #include <stdio.h>
 #include "mit-sipb-copyright.h"
 
-/* Need <krb5/config.h> for STDARG_PROTOTYPES */
-/* #include <krb5/krb5.h> -- now tested locally*/
-
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef STDARG_PROTOTYPES
 #include <stdarg.h>
 #else
 #include <varargs.h>
diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 7bea01004..c5a3634bd 100644
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -10,12 +10,17 @@
 
 #ifndef __COM_ERR_H
 
-#ifdef __STDC__
-#ifndef __HIGHC__		/* gives us STDC but not stdarg */
+#ifdef UseStdarg
+#define STDARG_PROTOTYPES
+#endif
+
+#ifdef STDARG_PROTOTYPES
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
+
+#ifdef __STDC__
 /* ANSI C -- use prototypes etc */
 void com_err (const char *, long, const char *, ...);
 char const *error_message (long);
diff --git a/src/util/et/configure.in b/src/util/et/configure.in
index c1b7fc06d..8a40695ff 100644
--- a/src/util/et/configure.in
+++ b/src/util/et/configure.in
@@ -5,4 +5,5 @@ AC_PROG_RANLIB
 HAVE_YYLINENO
 DECLARE_SYS_ERRLIST
 CONFIG_RULES
+CHECK_STDARG
 AC_OUTPUT(Makefile,[EXTRA_RULES])