summaryrefslogtreecommitdiff
path: root/pngconf.h
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2006-04-15 06:37:45 -0500
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2009-04-06 16:08:53 -0500
commitd5d63601b9de3565dc796a157b369bd58ce978c9 (patch)
treec8c3724a023cd6b7ed21c745cdc77343fc40da67 /pngconf.h
parenta7d0c941697148896102cc801157b4485f6f2e61 (diff)
downloadlibpng-d5d63601b9de3565dc796a157b369bd58ce978c9.tar.gz
Imported from libpng-1.2.10beta1.tarv1.2.10beta1
Diffstat (limited to 'pngconf.h')
-rw-r--r--pngconf.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/pngconf.h b/pngconf.h
index cb0a24cd6..8f551dcf6 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.9 - April 14, 2006
+ * libpng version 1.2.10beta1 - April 15, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2005 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -30,8 +30,11 @@
#include "pngusr.h"
#endif
+/* PNG_CONFIGURE_LIBPNG is set by the "configure" script. */
+#ifdef PNG_CONFIGURE_LIBPNG
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include "png_conf.h"
+#endif
#endif
/*