merged from lp:~donkult/apt/sid

[apt.git] / buildlib / config.h.in

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index 7e738af52e12a3f2f47e4373eb1cc5629853daa4..eddb162469aa8025cc2a5d1d874cb9efff9439c9 100644 (file)
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -2,6 +2,8 @@
    byte first (like Motorola and SPARC, unlike Intel and VAX).  */
 #undef WORDS_BIGENDIAN
 
+/* The following 4 are only used by inttypes.h shim if the system lacks
+   inttypes.h */
 /* The number of bytes in a usigned char.  */
 #undef SIZEOF_CHAR
 
@@ -14,15 +16,10 @@
 /* The number of bytes in a unsigned short.  */
 #undef SIZEOF_SHORT
 
-/* Define if we have libgpm. */
-#undef HAVE_LIBGPM
-
-/* Define if we have the SLang library from Davis. */
-#undef HAVE_LIBSLANG    
-
-/* Define if we have the X11 windowing system. */
-#undef HAVE_X11
+/* Define if we have the timegm() function */
+#undef HAVE_TIMEGM
 
+/* These two are used by the statvfs shim for glibc2.0 and bsd */
 /* Define if we have sys/vfs.h */
 #undef HAVE_VFS_H
 
@@ -32,22 +29,11 @@
 /* Define if we have enabled pthread support */
 #undef HAVE_PTHREAD
 
-/* Define if h_errno is in netdb.h */
-#undef HAVE_NETDB_H
-
-/* Define if socklen_t is in sys/socket.h  This does not mean we
-   shouldn't include sys/socket.h tho!  */
-#undef HAVE_SYS_SOCKET_H
-
-/* If there is no socklen_t, define this(might want to update
-   configure.in.  */
+/* If there is no socklen_t, define this for the netdb shim */
 #undef NEED_SOCKLEN_T_DEFINE
 
-/* Define on HP-UX */
-#undef NEED_XOPEN_NETDB_H
-
-/* Define the architecture name string */
-#undef ARCHITECTURE
+/* Define the arch name string */
+#undef COMMON_ARCH
 
 /* The version number string */
 #undef VERSION