adding lexlib header include, turning off utf8 default

[wxWidgets.git] / src / png / INSTALL

diff --git a/src/png/INSTALL b/src/png/INSTALL
index 1308db07feda65825970cd9bec2354f2fb21168e..e6979c6fb01656c5cf73c252cafb9bc91a71e536 100644 (file)
--- a/src/png/INSTALL
+++ b/src/png/INSTALL
@@ -1,5 +1,5 @@
 
 

-Installing libpng version 1.4.4 - September 23, 2010
+Installing libpng

 
 On Unix/Linux and similar systems, you can simply type
 
 
 On Unix/Linux and similar systems, you can simply type
 


@@ -13,10 +13,16 @@ If configure does not work on your system and you have a reasonably
 up-to-date set of tools, running ./autogen.sh before running ./configure
 may fix the problem.  You can also run the individual commands in
 autogen.sh with the --force option, if supported by your version of
 up-to-date set of tools, running ./autogen.sh before running ./configure
 may fix the problem.  You can also run the individual commands in
 autogen.sh with the --force option, if supported by your version of

-the tools.  If you run 'libtoolize --force', though, this will replace
-the distributed, patched, version of ltmain.sh with an unpatched version
-and your shared library builds may fail to produce libraries with the
-correct version numbers.
+the tools.  To be really sure that you aren't using any of the included
+pre-built scripts, you can do this:
+
+    ./configure --enable-maintainer-mode
+    make maintainer-clean
+    ./autogen.sh
+    ./configure [--prefix=/path] [other options]
+    make
+    make install
+    make check

 
 Instead, you can use one of the custom-built makefiles in the
 "scripts" directory
 
 Instead, you can use one of the custom-built makefiles in the
 "scripts" directory


@@ -46,8 +52,8 @@ to have access to the zlib.h and zconf.h include files that
 correspond to the version of zlib that's installed.
 
 You can rename the directories that you downloaded (they
 correspond to the version of zlib that's installed.
 
 You can rename the directories that you downloaded (they

-might be called "libpng-1.4.4" or "libpng14" and "zlib-1.2.3"
-or "zlib123") so that you have directories called "zlib" and "libpng".
+might be called "libpng-x.y.z" or "libpngNN" and "zlib-1.2.5"
+or "zlib125") so that you have directories called "zlib" and "libpng".

 
 Your directory structure should look like this:
 
 
 Your directory structure should look like this:
 


@@ -60,9 +66,9 @@ Your directory structure should look like this:
           CMakeLists.txt    =>  "cmake" script
           configuration files:
              configure.ac, configure, Makefile.am, Makefile.in,
           CMakeLists.txt    =>  "cmake" script
           configuration files:
              configure.ac, configure, Makefile.am, Makefile.in,

-             autogen.sh, config.guess, ltmain.sh, missing,
-             aclocal.m4, config.h.in, config.sub,
-             depcomp, install-sh, test-pngtest.sh
+             autogen.sh, config.guess, ltmain.sh, missing, libpng.pc.in,
+             libpng-config.in, aclocal.m4, config.h.in, config.sub,
+             depcomp, install-sh, mkinstalldirs, test-pngtest.sh

           contrib
              gregbook
              pngminim
           contrib
              gregbook
              pngminim


@@ -70,14 +76,12 @@ Your directory structure should look like this:
              pngsuite
              visupng
           projects
              pngsuite
              visupng
           projects

-             cbuilder5 (Borland)
-             visualc6 (msvc)

              visualc71
              vstudio
              visualc71
              vstudio

-             xcode

           scripts
              makefile.*
              *.def (module definition files)
           scripts
              makefile.*
              *.def (module definition files)

+             etc.

           pngtest.png
           etc.
       zlib
           pngtest.png
           etc.
       zlib


@@ -108,7 +112,7 @@ scripts directory into this directory, for example
 Read the makefile to see if you need to change any source or
 target directories to match your preferences.
 
 Read the makefile to see if you need to change any source or
 target directories to match your preferences.
 

-Then read pngconf.h to see if you want to make any configuration
+Then read pnglibconf.dfa to see if you want to make any configuration

 changes.
 
 Then just run "make" which will create the libpng library in
 changes.
 
 Then just run "make" which will create the libpng library in


@@ -126,19 +130,26 @@ do that, run "make install" in the zlib directory first if necessary).
 Some also allow you to run "make test-installed" after you have
 run "make install".
 
 Some also allow you to run "make test-installed" after you have
 run "make install".
 

-If you encounter a compiler error message complaining about the
-lines
+Further information can be found in the README and libpng-manual.txt
+files, in the individual makefiles, in png.h, and the manual pages
+libpng.3 and png.5.

 
 

-      __png.h__ already includes setjmp.h;
-      __dont__ include it again.;
+Using the ./configure script -- 16 December 2002.
+=================================================

 
 

-this means you have compiled another module that includes setjmp.h,
-which is hazardous because the two modules might not include exactly
-the same setjmp.h.  If you are sure that you know what you are doing
-and that they are exactly the same, then you can comment out or
-delete the two lines.  Better yet, use the cexcept interface
-instead, as demonstrated in contrib/visupng of the libpng distribution.
+The ./configure script should work compatibly with what scripts/makefile.*
+did, however there are some options you might need to add to configure
+explicitly, which previously was done semi-automatically (if you didn't edit
+scripts/makefile.* yourself, that is)
+
+CFLAGS="-Wall -O -funroll-loops \
+-malign-loops=2 -malign-functions=2" ./configure --prefix=/usr/include \
+--with-pkgconfigdir=/usr/lib/pkgconfig --includedir=/usr/include
+
+You can alternatively specify --includedir=/usr/include, /usr/local/include,
+/usr/include/libpng%NN%, or whatever.
+
+If you find that the configure script is out-of-date or is not supporting
+your platform properly, try running autogen.sh to regenerate "configure",
+"Makefile.in", and the other configuration files. Then try configure again.

 
 

-Further information can be found in the README and libpng.txt
-files, in the individual makefiles, in png.h, and the manual pages
-libpng.3 and png.5.