mpl doesn't build

Mike,
One of your cleanups might have introduced a problem?
Eric

Updated to revision 5071.
efiring@...340...:~/programs/py/mpl/mpl_trunk$ psb

···

============================================================================
BUILDING MATPLOTLIB
             matplotlib: 0.98pre
                 python: 2.5.1 (r251:54863, Mar 7 2008, 03:41:45) [GCC
                         4.1.2 (Ubuntu 4.1.2-0ubuntu4)]
               platform: linux2

REQUIRED DEPENDENCIES
                  numpy: 1.1.0.dev5061
              freetype2: 9.10.3

OPTIONAL BACKEND DEPENDENCIES
                 libpng: 1.2.15beta5
                Tkinter: Tkinter: 50704, Tk: 8.4, Tcl: 8.4
               wxPython: 2.8.1.1
                         * WxAgg extension not required for wxPython >= 2.8
                   Gtk+: gtk+: 2.10.11, glib: 2.12.11, pygtk: 2.10.4,
                         pygobject: 2.12.3
                     Qt: Qt: 3.3.7, PyQt: 3.17
                    Qt4: Qt: 4.2.2, PyQt4: 4.1
                  Cairo: 1.2.0

OPTIONAL DATE/TIMEZONE DEPENDENCIES
               datetime: present, version unknown
               dateutil: present, version unknown
                   pytz: 3371

OPTIONAL USETEX DEPENDENCIES
                 dvipng: 1.9
            ghostscript: 8.15.4
                  latex: 3.141592
                pdftops: 3.00

EXPERIMENTAL CONFIG PACKAGE DEPENDENCIES
              configobj: 4.4.0
       enthought.traits: matplotlib will provide

[Edit setup.cfg to suppress the above messages]

running build
running build_py
copying lib/matplotlib/__init__.py -> build/lib.linux-i686-2.5/matplotlib
copying lib/matplotlib/mathtext.py -> build/lib.linux-i686-2.5/matplotlib
copying lib/matplotlib/mlab.py -> build/lib.linux-i686-2.5/matplotlib
copying lib/matplotlib/backends/backend_wx.py -> build/lib.linux-i686-2.5/matplotlib/backends
copying lib/matplotlib/mpl-data/matplotlibrc -> build/lib.linux-i686-2.5/matplotlib/mpl-data
copying lib/matplotlib/mpl-data/matplotlib.conf -> build/lib.linux-i686-2.5/matplotlib/mpl-data
running build_ext
building 'matplotlib.ft2font' extension
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/freetype2 -I/usr/local/include -I/usr/include -I. -I/usr/include/python2.5 -c src/ft2font.cpp -o build/temp.linux-i686-2.5/src/ft2font.o
cc1plus: warning: command line option "-Wstrict-prototypes" is valid for Ada/C/ObjC but not for C++
g++ -pthread -shared -Wl,-O1 build/temp.linux-i686-2.5/src/ft2font.o build/temp.linux-i686-2.5/src/mplutils.o build/temp.linux-i686-2.5/CXX/cxx_extensions.o build/temp.linux-i686-2.5/CXX/IndirectPythonInterface.o build/temp.linux-i686-2.5/CXX/cxxsupport.o build/temp.linux-i686-2.5/CXX/cxxextensions.o -L/usr/local/lib -lfreetype -lz -lstdc++ -lm -o build/lib.linux-i686-2.5/matplotlib/ft2font.so
building 'matplotlib.ttconv' extension
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/local/include -I/usr/include -I. -I/usr/include/python2.5 -c src/_ttconv.cpp -o build/temp.linux-i686-2.5/src/_ttconv.o
cc1plus: warning: command line option "-Wstrict-prototypes" is valid for Ada/C/ObjC but not for C++
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/local/include -I/usr/include -I. -I/usr/include/python2.5 -c ttconv/pprdrv_tt.cpp -o build/temp.linux-i686-2.5/ttconv/pprdrv_tt.o
cc1plus: warning: command line option "-Wstrict-prototypes" is valid for Ada/C/ObjC but not for C++
g++ -pthread -shared -Wl,-O1 build/temp.linux-i686-2.5/src/_ttconv.o build/temp.linux-i686-2.5/ttconv/pprdrv_tt.o build/temp.linux-i686-2.5/ttconv/pprdrv_tt2.o build/temp.linux-i686-2.5/ttconv/ttutil.o -L/usr/local/lib -o build/lib.linux-i686-2.5/matplotlib/ttconv.so
building 'matplotlib._path' extension
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/local/lib/python2.5/site-packages/numpy/core/include -I/usr/include/libpng12 -I/usr/local/include -I/usr/include -I. -I/usr/local/lib/python2.5/site-packages/numpy/core/include -Isrc -Iagg24/include -I. -I/usr/include/python2.5 -c agg24/src/agg_curves.cpp -o build/temp.linux-i686-2.5/agg24/src/agg_curves.o
cc1plus: warning: command line option "-Wstrict-prototypes" is valid for Ada/C/ObjC but not for C++
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/local/lib/python2.5/site-packages/numpy/core/include -I/usr/include/libpng12 -I/usr/local/include -I/usr/include -I. -I/usr/local/lib/python2.5/site-packages/numpy/core/include -Isrc -Iagg24/include -I. -I/usr/include/python2.5 -c src/path.cpp -o build/temp.linux-i686-2.5/src/path.o
cc1plus: warning: command line option "-Wstrict-prototypes" is valid for Ada/C/ObjC but not for C++
g++ -pthread -shared -Wl,-O1 build/temp.linux-i686-2.5/agg24/src/agg_curves.o build/temp.linux-i686-2.5/agg24/src/agg_bezier_arc.o build/temp.linux-i686-2.5/agg24/src/agg_trans_affine.o build/temp.linux-i686-2.5/agg24/src/agg_vcgen_stroke.o build/temp.linux-i686-2.5/CXX/cxx_extensions.o build/temp.linux-i686-2.5/CXX/IndirectPythonInterface.o build/temp.linux-i686-2.5/CXX/cxxsupport.o build/temp.linux-i686-2.5/CXX/cxxextensions.o build/temp.linux-i686-2.5/src/path.o -L/usr/local/lib -lpng12 -lz -lstdc++ -lm -o build/lib.linux-i686-2.5/matplotlib/_path.so
building 'matplotlib.backends._backend_agg' extension
gcc -pthread -fno-strict-aliasing -DNDEBUG -g -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/local/lib/python2.5/site-packages/numpy/core/include -I/usr/include/libpng12 -I/usr/local/include -I/usr/include -I. -I/usr/local/lib/python2.5/site-packages/numpy/core/include -Isrc -Iagg24/include -I. -I/usr/include/freetype2 -I/usr/local/include -I/usr/include -I. -I/usr/include/python2.5 -c src/_image.cpp -o build/temp.linux-i686-2.5/src/_image.o
cc1plus: warning: command line option "-Wstrict-prototypes" is valid for Ada/C/ObjC but not for C++
/usr/include/libpng12/pngconf.h:317: error: expected constructor, destructor, or type conversion before �.� token
/usr/include/libpng12/pngconf.h:318: error: �__dont__� does not name a type
error: command 'gcc' failed with exit status 1