merge from the lp:~mvo/apt/mvo branch

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

diff --git a/buildlib/config.h.in b/buildlib/config.h.in
index f882ca25d8e83102865024b1f6523df98deb5ee8..b07d4f77f9d04d72a166a95322d1587ac5aa930b 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
 
    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
 
 /* The number of bytes in a usigned char.  */
 #undef SIZEOF_CHAR
 


@@ -14,24 +16,39 @@
 /* The number of bytes in a unsigned short.  */
 #undef SIZEOF_SHORT
 
 /* The number of bytes in a unsigned short.  */
 #undef SIZEOF_SHORT
 

-/* Define if we have libgpm. */
-#undef HAVE_LIBGPM
+/* Define if we have the timegm() function */
+#undef HAVE_TIMEGM

 
 

-/* Define if we have the SLang library from Davis. */
-#undef HAVE_LIBSLANG    
+/* Define if we have the zlib library for gzip */
+#undef HAVE_ZLIB

 
 

-/* Define if we have the X11 windowing system. */
-#undef HAVE_X11
+/* Define if we have the bz2 library for bzip2 */
+#undef HAVE_BZ2
+
+/* These two are used by the statvfs shim for glibc2.0 and bsd */
+/* Define if we have sys/vfs.h */
+#undef HAVE_VFS_H
+#undef HAVE_STRUCT_STATFS_F_TYPE
+
+/* Define if we have sys/mount.h */
+#undef HAVE_MOUNT_H

 
 /* Define if we have enabled pthread support */
 #undef HAVE_PTHREAD
 
 
 /* Define if we have enabled pthread support */
 #undef HAVE_PTHREAD
 

-/* Define the architecture name string */
-#undef ARCHITECTURE
+/* If there is no socklen_t, define this for the netdb shim */
+#undef NEED_SOCKLEN_T_DEFINE

 
 

-/* The version number string */
-#undef VERSION
+/* Define to the size of the filesize containing structures */
+#undef _FILE_OFFSET_BITS
+
+/* Define the arch name string */
+#undef COMMON_ARCH

 
 /* The package name string */
 #undef PACKAGE
 
 
 /* The package name string */
 #undef PACKAGE
 

+/* The version number string */
+#undef PACKAGE_VERSION
+
+#define APT_8_CLEANER_HEADERS