[devel] Moved the 'config.h' support from pngconf.h to pngpriv.h
diff --git a/ANNOUNCE b/ANNOUNCE
index 0d3cbac..aad29f0 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -90,6 +90,7 @@
     PNG_USER_CHUNK_MALLOC_MAX nor PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
     is defined.
   Removed unused png_measure_compressed_chunk() from pngpriv.h and libpngpf.3
+  Moved the 'config.h' support from pngconf.h to pngpriv.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/pngconf.h b/pngconf.h
index d33cde7..f6b30a4 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -26,17 +26,6 @@
 #  include <limits.h>
 #endif
 
-/* Added at libpng-1.2.9 */
-
-/* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure"
- * script.
- */
-#ifdef PNG_CONFIGURE_LIBPNG
-#  ifdef HAVE_CONFIG_H
-#    include "config.h"
-#  endif
-#endif
-
 /*
  * Added at libpng-1.2.8
  *
diff --git a/pngpriv.h b/pngpriv.h
index 8efeff2..c74a96a 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -31,6 +31,18 @@
 
 #include <stdlib.h>
 
+/* Added at libpng-1.2.9 */
+/* Moved to pngpriv.h at libpng-1.5.0 */
+
+/* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure"
+ * script.
+ */
+#ifdef PNG_CONFIGURE_LIBPNG
+#  ifdef HAVE_CONFIG_H
+#    include "config.h"
+#  endif
+#endif
+
 /* The functions exported by PNG_EXTERN are internal functions, which
  * aren't usually used outside the library (as far as I know), so it is
  * debatable if they should be exported at all.  In the future, when it