Version bumped to 1.5.2.

[mdsms.git] / acconfig.h

diff --git a/acconfig.h b/acconfig.h
index 890db9d..a366e48 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -30,18 +30,6 @@
 /* Disable runtime assertion checks. */
 #undef NDEBUG
 
-/* Provide stub for MAX-function if needed. */
-#undef HAVE_MAX
-#ifndef HAVE_MAX
-#define MAX(a,b) ((a)>(b)?(a):(b))
-#endif
-
-/* Provide stub for MIN-function if needed. */
-#undef HAVE_MIN
-#ifndef HAVE_MIN
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-
 /* LINE_MAX from <limits.h>, provide default if not defined. */
 #undef HAVE_LINE_MAX
 #undef LINE_MAX
@@ -54,6 +42,10 @@
 #undef HAVE_CBAUDEX
 #undef CBAUDEX
 
+/* CRTSCTS define, may be missing. */
+#undef HAVE_CRTSCTS
+#undef CRTSCTS
+
 /* FD_SETSIZE define, may be missing. */
 #undef HAVE_FD_SETSIZE
 
@@ -82,81 +74,114 @@
 
 @BOTTOM@
 
-#ifndef DONT_NEED_DECLARATIONS
+#ifdef WANT_DECLARATIONS
 
 /* Declaration for gethostname(3)? */
 #undef NEED_DECLARATION_GETHOSTNAME
 #ifdef NEED_DECLARATION_GETHOSTNAME
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 int gethostname(char *name, size_t len);
 #endif
 
 /* Declaration for kill(2)? */
 #undef NEED_DECLARATION_KILL
 #ifdef NEED_DECLARATION_KILL
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 int kill(pid_t pid, int sig);
 #endif
 
 /* Declaration for snprintf(3)? */
 #undef NEED_DECLARATION_SNPRINTF
 #ifdef NEED_DECLARATION_SNPRINTF
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
 int snprintf(char *str, size_t n, const char *format, ...);
 #endif
 
 /* Declaration for vsnprintf(3)? */
 #undef NEED_DECLARATION_VSNPRINTF
 #ifdef NEED_DECLARATION_VSNPRINTF
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
 int vsnprintf(char *str, size_t n, const char *format, va_list ap);
 #endif
 
 /* Declaration for strdup(3)? */
 #undef NEED_DECLARATION_STRDUP
 #ifdef NEED_DECLARATION_STRDUP
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 char *strdup(const char *s);
 #endif
 
 /* Declaration for usleep(3)? */
 #undef NEED_DECLARATION_USLEEP
 #ifdef NEED_DECLARATION_USLEEP
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 void usleep(unsigned long usec);
 #endif
 
 /* Declaration for strcasecmp(3)? */
 #undef NEED_DECLARATION_STRCASECMP
 #ifdef NEED_DECLARATION_STRCASECMP
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 int strcasecmp(const char *s1, const char *s2);
 #endif
 
 /* Declaration for siginterrupt(3)? */
 #undef NEED_DECLARATION_SIGINTERRUPT
 #ifdef NEED_DECLARATION_SIGINTERRUPT
+#ifdef HAVE_SIGNAL_H
 #include <signal.h>
+#endif
 int siginterrupt(int sig, int flag);
 #endif
 
 /* Declaration for popen(3)? */
 #undef NEED_DECLARATION_POPEN
 #ifdef NEED_DECLARATION_POPEN
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
 FILE *popen(const char *command, const char *type);
 #endif
 
 /* Declaration for pclose(3)? */
 #undef NEED_DECLARATION_PCLOSE
 #ifdef NEED_DECLARATION_PCLOSE
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
 int pclose(FILE *stream);
 #endif
 
-#endif /* !DONT_NEED_DECLARATIONS */
+/* Declaration for gettext(3)? */
+#undef NEED_DECLARATION_GETTEXT
+#ifdef NEED_DECLARATION_GETTEXT
+#ifdef HAVE_LIBINTL_H
+#include <libintl.h>
+#endif
+extern const char *gettext(const char *msgid);
+#endif
+
+#endif /* WANT_DECLARATIONS */
 
 /* snprintf(3) unsafe emulation */
 #ifdef HAVE_SNPRINTF
@@ -201,7 +226,7 @@ extern char *sys_errlist[];
 #define offsetof(a,b) ((size_t)&((a *)0)->b)
 #endif
 
-#ifndef DONT_NEED_DECLARATIONS
+#ifdef WANT_DECLARATIONS
 /*
  * Handles all of the internationalization configuration options.
  * Author: Tom Tromey <tromey@creche.cygnus.com>
@@ -228,4 +253,4 @@ extern char *sys_errlist[];
 #    define _(String) (String)
 #    define N_(String) (String)
 #endif /* ENABLE_NLS */
-#endif /* !DONT_NEED_DECLARATIONS */
+#endif /* WANT_DECLARATIONS */