upgraded to agg21

svn path=/trunk/matplotlib/; revision=410

Author: jdh2358

CHANGELOG

@@ -1,5 +1,7 @@
 cNew entries should be added at the top
 
+2004-07-20 upgraded to agg21 - JDH
+
 2004-07-20 Added new icons for toolbar2 - JDH
 
 2004-07-19 Added vertical mathtext for *Agg and GTK - thanks Jim

MANIFEST.in

@@ -13,4 +13,4 @@ recursive-include examples README *.py *.glade
 prune examples/_tmp_*
 recursive-include src  *.cpp *.c *.h
 recursive-include CXX  *.cxx *.hxx *.c
-recursive-include agg2 *.cpp *.c *.h
+recursive-include agg21 *.cpp *.c *.h

setup.py

@@ -62,7 +62,6 @@
 data = []
 
 data.extend(glob.glob('fonts/afm/*.afm'))
-data.extend(glob.glob('fonts/ttf/*.pfa'))
 data.extend(glob.glob('fonts/ttf/*.ttf'))
 data.extend(glob.glob('images/*.xpm'))
 data.extend(glob.glob('images/*.ppm'))

setupext.py

@@ -83,7 +83,7 @@ def add_agg_flags(module):
     module.libraries.append('png')
     module.libraries.append('z')
     add_base_flags(module)
-    module.include_dirs.extend(['src','agg2/include', '.'])
+    module.include_dirs.extend(['src','agg21/include', '.'])
 
     # put these later for correct link order
     module.libraries.extend(['stdc++', 'm'])
@@ -304,7 +304,7 @@ def build_agg(ext_modules, packages):
     if BUILT_AGG: return # only build it if you you haven't already
 
     deps = ['src/_backend_agg.cpp', 'src/ft2font.cpp', 'src/mplutils.cpp']
-    deps.extend(glob.glob('agg2/src/*.cpp'))
+    deps.extend(glob.glob('agg21/src/*.cpp'))
     deps.extend(glob.glob('CXX/*.cxx'))
     deps.extend(glob.glob('CXX/*.c'))
 
@@ -324,7 +324,7 @@ def build_image(ext_modules, packages, numerix):
     if BUILT_IMAGE: return # only build it if you you haven't already
 
     deps = ['src/_image.cpp', 'src/mplutils.cpp'] 
-    deps.extend(glob.glob('agg2/src/*.cpp'))
+    deps.extend(glob.glob('agg21/src/*.cpp'))
     deps.extend(glob.glob('CXX/*.cxx'))
     deps.extend(glob.glob('CXX/*.c'))