summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@redhat.com>2009-01-09 00:54:05 +0100
committerChristoph Brill <egore911@egore911.de>2009-01-09 00:54:05 +0100
commitfe277cb2f00ae872b828ba46ea25c1cca0d76ccc (patch)
tree0aafc28fd1df5a40fb4573b038e978c88e00c89d
parent998886d4475ac3d06e251ef43c7a0cdc927b52b0 (diff)
[PATCH] libjpeg-autoconf.patchubuntu-patches
Work around bogosity in autoconf-2.62: it breaks #undef's that have a comment after them, a construct that has worked fine in every previous autoconf release. See bz #449471 and bz #449245.
-rw-r--r--jconfig.cfg15
1 files changed, 10 insertions, 5 deletions
diff --git a/jconfig.cfg b/jconfig.cfg
index 36a04fa..0c54bb6 100644
--- a/jconfig.cfg
+++ b/jconfig.cfg
@@ -28,11 +28,16 @@
#ifdef JPEG_CJPEG_DJPEG
-#define BMP_SUPPORTED /* BMP image file format */
-#define GIF_SUPPORTED /* GIF image file format */
-#define PPM_SUPPORTED /* PBMPLUS PPM/PGM image file format */
-#undef RLE_SUPPORTED /* Utah RLE image file format */
-#define TARGA_SUPPORTED /* Targa image file format */
+/* BMP image file format */
+#define BMP_SUPPORTED
+/* GIF image file format */
+#define GIF_SUPPORTED
+/* PBMPLUS PPM/PGM image file format */
+#define PPM_SUPPORTED
+/* Utah RLE image file format */
+#undef RLE_SUPPORTED
+/* Targa image file format */
+#define TARGA_SUPPORTED
#undef TWO_FILE_COMMANDLINE
#undef NEED_SIGNAL_CATCHER