[devel] Renamed pnglconf.h to pnglibconf.h

scripts/options.awk

@@ -251,7 +251,7 @@ $1 == "setting" && (NF == 2 || NF >= 3 && ($3 == "requires" || $3 == "default"))
 
 # The order of the dependency lines (option, chunk, setting) is irrelevant
 # - the 'enables', 'requires' and 'if' settings will be used to determine
-# the correct order in the output and the final values in pnglconf.h are
+# the correct order in the output and the final values in pnglibconf.h are
 # not order dependent.  'requires' and 'if' entries take precedence over
 # 'enables' from other options; if an option requires another option it
 # won't be set regardless of any options that enable it unless the other
@@ -306,7 +306,7 @@ $1 ~ /^@/{
 }
 
 # For checking purposes names that start with "ok_" or "fail_" are
-# not output to pnglconf.h and must be either enabled or disabled
+# not output to pnglibconf.h and must be either enabled or disabled
 # respectively for the build to succeed.  This allows interdependencies
 # between options of the form "at least one of" or "at most one of"
 # to be checked.  For example:
@@ -526,7 +526,7 @@ END{
 	    print "#     endif" >out
 	    print "#   endif /*!command line*/" >out
 	    # If PNG_on is still set the option should be defined in
-	    # pnglconf.h
+	    # pnglibconf.h
 	    print "#   ifdef PNG_on" >out
 	    if (i ~ /^fail_/)
 	        print error, i, "if" iffs[i], "requires" requires[i] end >out

scripts/pnglibconf.dfa

@@ -1,10 +1,10 @@
-# scripts/pnglconf.dfa - library build configuration control
+# scripts/pnglibconf.dfa - library build configuration control
 #
-@/*- pnglconf.dfn intermediate file
-@ *  generated from scripts/pnglconf.dfa
+@/*- pnglibconf.dfn intermediate file
+@ *  generated from scripts/pnglibconf.dfa
 @ */
 #
-com pnglconf.h - library build configuration
+com pnglibconf.h - library build configuration
 com
 com libpng version PNGLIB_VERSION - April 2, 2010
 com
@@ -14,13 +14,13 @@ com This code is released under the libpng license.
 com For conditions of distribution and use, see the disclaimer
 com and license in png.h
 com
-file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H
+file pnglibconf.h scripts/pnglibconf.dfa PNGLCONF_H
 
 # This file is preprocessed by scripts/options.awk and the
-# C compiler to generate 'pnglconf.h' - a list of all the
+# C compiler to generate 'pnglibconf.h' - a list of all the
 # configuration options.  The file lists the various options
 # that can *only* be specified during the libpng build;
-# pnglconf.h freezes the definitons selected for the specific
+# pnglibconf.h freezes the definitons selected for the specific
 # build.
 #
 # The syntax is detailed in scripts/options.awk, this is a summary
@@ -56,13 +56,13 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H
 # detailed below and #define PNG_NO_<option> for each option you
 # don't want in that file in that file.  You can also turn on options
 # using PNG_<option>_SUPPORTED.  When you have finished rerun
-# configure and rebuild pnglconf.h file with -DPNG_USER_CONFIG:
+# configure and rebuild pnglibconf.h file with -DPNG_USER_CONFIG:
 # 
 #  make clean
 #  CPPFLAGS='-DPNG_USER_CONFIG' ./configure
-#  make pnglconf.h
+#  make pnglibconf.h
 #
-# pngusr.h is only used during the creation of pnglconf.h, but it
+# pngusr.h is only used during the creation of pnglibconf.h, but it
 # is safer to ensure that -DPNG_USER_CONFIG is specified throughout
 # the build by changing the CPPFLAGS passed to the initial ./configure
 #
@@ -89,9 +89,9 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H
 #----------------------------------------------------------------------
 
 # PNG_USER_CONFIG has to be defined on the compiler command line
-# to cause pngusr.h to be read while constructing pnglconf.h
+# to cause pngusr.h to be read while constructing pnglibconf.h
 #
-# If this is set during the build 'pnglconf.h' will define
+# If this is set during the build 'pnglibconf.h' will define
 # PNG_USER_PRIVATEBUILD to the value that *must* be set by pngusr.h
 # and contain other definitions as below.
 #
@@ -119,7 +119,7 @@ file pnglconf.h scripts/pnglconf.dfa PNGLCONF_H
 @#endif
 
 # Note that PNG_USR_CONFIG only has an effect when building
-# pnglconf.h
+# pnglibconf.h
 setting USER_CONFIG requires USER_PRIVATEBUILD USER_DLLFNAME_POSTFIX
 setting USER_PRIVATEBUILD
 setting USER_DLLFNAME_POSTFIX

scripts/pnglibconf.h

@@ -1,5 +1,5 @@
 /* 1.5.0beta17 STANDARD API DEFINITION */
-/* pnglconf.h - library build configuration */
+/* pnglibconf.h - library build configuration */
 
 /* libpng version 1.5.0beta17 - April 2, 2010 */
 
@@ -9,9 +9,9 @@
 /* For conditions of distribution and use, see the disclaimer */
 /* and license in png.h */
 
-/* pnglconf.h */
+/* pnglibconf.h */
 /* Machine generated file: DO NOT EDIT */
-/* Derived from: scripts/pnglconf.dfa */
+/* Derived from: scripts/pnglibconf.dfa */
 #ifndef PNGLCONF_H
 #define PNGLCONF_H
 /* settings */

scripts/pngwin.dfn

@@ -31,8 +31,8 @@ PNG_DEFN_MAGIC--PNG_DEFN_END
 PNG_DEFN_MAGIC-EXPORTS-PNG_DEFN_END
 PNG_DEFN_MAGIC-;Version PNGLIB_VERSION-PNG_DEFN_END
 
-/* Read the defaults, but use scripts/pnglconf.h; the 'standard'
+/* Read the defaults, but use scripts/pnglibconf.h; the 'standard'
  * header file.
  */
-#include "pnglconf.h"
+#include "pnglibconf.h"
 #include "../png.h"

scripts/symbols.dfn

@@ -11,8 +11,8 @@
 
 /* NOTE: making 'symbols.chk' checks both that the exported
  * symbols in the library don't change and (implicitly) that
- * scripts/pnglconf.h is as expected.  If scripts/pnglconf.h
- * is remade using scripts/pnglconf.dfa then this checks the
+ * scripts/pnglibconf.h is as expected.  If scripts/pnglibconf.h
+ * is remade using scripts/pnglibconf.dfa then this checks the
  * .dfa file too.
  */
 
@@ -23,18 +23,18 @@
 #define PNG_EXPORT_LAST_ORDINAL(ordinal)\
 	PNG_DEFN_MAGIC-; @ordinal-PNG_DEFN_END
 
-/* Read the defaults, but use scripts/pnglconf.h; the 'standard'
+/* Read the defaults, but use scripts/pnglibconf.h; the 'standard'
  * header file.
  */
-#include "pnglconf.h"
+#include "pnglibconf.h"
 #include "../png.h"
 
 /* Some things are turned off by default.  Turn these things
  * on here (by hand) to get the APIs they expose and validate
  * that no harm is done.  This list is the set of options
- * defaulted to 'off' in scripts/pnglconf.dfa
+ * defaulted to 'off' in scripts/pnglibconf.dfa
  *
- * Maintenance: if scripts/pnglconf.dfa options are changed
+ * Maintenance: if scripts/pnglibconf.dfa options are changed
  * from, or to, 'off' this needs updating!
  */
 #define PNG_BENIGN_ERRORS_SUPPORTED