Merge branch 'upstream'

[debian/amanda] / config / config.h.in

diff --git a/config/config.h.in b/config/config.h.in
index 74e81696eb4a3fbe03d133554682ece9b663cd3f..2196c493d609eca9cf5b6c9f22b71b18684f2de6 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -126,6 +126,9 @@
 /* Define as good substitute value for EOVERFLOW. */
 #undef EOVERFLOW
 
+/* Define to force to another user on client machines. */
+#undef FORCE_USERID
+
 /* Define to 1 if the `getpgrp' function requires zero arguments. */
 #undef GETPGRP_VOID
 
@@ -361,6 +364,9 @@
 /* Define to 1 if you have the `getaddrinfo' function. */
 #undef HAVE_GETADDRINFO
 
+/* Define to 1 if you have the `getgrgid_r' function. */
+#undef HAVE_GETGRGID_R
+
 /* Define to 1 if you have the `gethostbyname' function. */
 #undef HAVE_GETHOSTBYNAME
 
@@ -385,6 +391,9 @@
 /* Define if getpeername is declared. */
 #undef HAVE_GETPEERNAME_DECL
 
+/* Define to 1 if you have the `getpwuid_r' function. */
+#undef HAVE_GETPWUID_R
+
 /* Define to 1 if you have the `getsockname' function. */
 #undef HAVE_GETSOCKNAME
 
@@ -406,6 +415,9 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
+/* Define this if glibc's backtrace functionality (execinfo.h) is present */
+#undef HAVE_GLIBC_BACKTRACE
+
 /* Define to 1 if you have the <grp.h> header file. */
 #undef HAVE_GRP_H
 
@@ -467,6 +479,9 @@
 /* Define if isnormal is declared. */
 #undef HAVE_ISNORMAL_DECL
 
+/* Define to 1 if you have the `c' library (-lc). */
+#undef HAVE_LIBC
+
 /* Define to 1 if you have the `cam' library (-lcam). */
 #undef HAVE_LIBCAM
 
@@ -620,6 +635,12 @@
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
+/* Define to 1 if you have the <netinet/in_systm.h> header file. */
+#undef HAVE_NETINET_IN_SYSTM_H
+
+/* Define to 1 if you have the <netinet/ip.h> header file. */
+#undef HAVE_NETINET_IP_H
+
 /* Define to 1 if you have the `on_exit' function. */
 #undef HAVE_ON_EXIT
 
@@ -1495,6 +1516,9 @@
 /* Define if the Win32 multithreading API can be used. */
 #undef USE_WIN32_THREADS
 
+/* Define on UnixWare. */
+#undef UWARE_TAPEIO
+
 /* Define the location of the vdump program. */
 #undef VDUMP
 
@@ -1566,6 +1590,9 @@
 /* Target system has functional IPv6 support */
 #undef WORKING_IPV6
 
+/* Define on XENIX/ISC. */
+#undef XENIX_TAPEIO
+
 /* Define the location of the xfsdump program on Irix hosts. */
 #undef XFSDUMP
 
@@ -1689,9 +1716,12 @@
 /* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
-/* Type for socklen_t, if it is not defined by the system */
+/* type to use in place of socklen_t if not defined */
 #undef socklen_t
 
+/* type to use for socket length parameters; use instead of socklen_t */
+#undef socklen_t_equiv
+
 /* Define as a signed type of the same size as size_t. */
 #undef ssize_t