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 6606a84d4642b8215092c4b3a6917cef0b895d00..b07d4f77f9d04d72a166a95322d1587ac5aa930b 100644 (file)
--- a/buildlib/config.h.in
+++ b/buildlib/config.h.in
@@ -16,18 +16,19 @@
 /* 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
@@ -38,11 +39,16 @@
 /* If there is no socklen_t, define this for the netdb shim */
 #undef NEED_SOCKLEN_T_DEFINE
 
-/* Define the architecture name string */
-#undef ARCHITECTURE
+/* Define to the size of the filesize containing structures */
+#undef _FILE_OFFSET_BITS
 
-/* The version number string */
-#undef VERSION
+/* Define the arch name string */
+#undef COMMON_ARCH
 
 /* The package name string */
 #undef PACKAGE
+
+/* The version number string */
+#undef PACKAGE_VERSION
+
+#define APT_8_CLEANER_HEADERS