--- Enable-3.3.0.orig/enthought/kiva/agg/setup.py	2010-02-25 13:15:07.000000000 -0500
+++ Enable-3.3.0/enthought/kiva/agg/setup.py	2010-03-21 14:55:37.000000000 -0500
@@ -4,59 +4,6 @@
 import re
 import platform
 
-freetype2_sources =['autofit/autofit.c',
-                    'base/ftbase.c','base/ftsystem.c','base/ftinit.c',
-                    'base/ftglyph.c','base/ftmm.c','base/ftbdf.c',
-                    'base/ftbbox.c','base/ftdebug.c','base/ftxf86.c',
-                    'base/fttype1.c',
-                    'bdf/bdf.c',
-                    'cff/cff.c',
-                    'cid/type1cid.c',
-                    'lzw/ftlzw.c',
-                    'pcf/pcf.c','pfr/pfr.c',
-                    'psaux/psaux.c',
-                    'pshinter/pshinter.c',
-                    'psnames/psnames.c',
-                    'raster/raster.c',
-                    'sfnt/sfnt.c',
-                    'smooth/smooth.c',
-                    'truetype/truetype.c',
-                    'type1/type1.c',
-                    'type42/type42.c',
-                    'winfonts/winfnt.c',
-                    'gzip/ftgzip.c',
-                    'base/ftmac.c',
-                    ]
-
-freetype2_dirs = [
-    'autofit',
-    'base',
-    'bdf',
-    'cache',
-    'cff',
-    'cid',
-    'gxvalid',
-    'gzip',
-    'lzw',
-    'otvalid',
-    'pcf',
-    'pfr',
-    'psaux',
-    'pshinter',
-    'psnames',
-    'raster',
-    'sfnt',
-    'smooth',
-    'tools',
-    'truetype',
-    'type1',
-    'type42',
-    'winfonts',
-    'gzip'
-    ]
-
-
-
 def configuration(parent_package='',top_path=None):
     from numpy.distutils.misc_util import Configuration
     from numpy.distutils.system_info import dict_append, get_info
@@ -85,45 +32,11 @@
         plat = 'x11'  # use with gtk2, it's slow but reliable
         #plat = 'gdkpixbuf2'
 
-
-    #-------------------------------------------------------------------------
-    # Add the freetype library (agg 2.4 links against this)
-    #-------------------------------------------------------------------------
-
-    prefix = config.paths('freetype2/src')[0]
-    freetype_lib = 'freetype2_src'
-
-    def get_ft2_sources((lib_name, build_info), build_dir):
-        sources = [prefix + "/" + s for s in freetype2_sources]
-        if sys.platform=='darwin':
-            return sources[:]
-        return sources[:-1]
-
-    ft2_incl_dirs = ['freetype2/src/' + s for s in freetype2_dirs] \
-                    + ['freetype2/include', 'freetype2/src']
-    ft2_incl_dirs = config.paths(*ft2_incl_dirs)
-    if sys.platform == 'darwin':
-        ft2_incl_dirs.append("/Developer/Headers/FlatCarbon")
-
-    config.add_library(freetype_lib,
-                       sources = [get_ft2_sources],
-                       include_dirs = ft2_incl_dirs,
-
-                       # This macro was introduced in Freetype 2.2; if it is
-                       # not defined, then the ftheader.h file (one of the
-                       # primary headers) won't pull in any additional internal
-                       # Freetype headers, and the library will mysteriously
-                       # fail to build.
-                       macros = [("FT2_BUILD_LIBRARY", None)],
-
-                       depends = ['freetype2'],
-                       )
-
     #-------------------------------------------------------------------------
     # Add the Agg sources
     #-------------------------------------------------------------------------
 
-    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ft2_incl_dirs
+    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ["/usr/include/freetype2/"]
     agg_sources = [agg_dir+'/src/*.cpp',
                     agg_dir+'/font_freetype/*.cpp']
     config.add_library(agg_lib,
@@ -137,7 +50,7 @@
     if sys.platform == 'darwin':
         define_macros = [('__DARWIN__', None)]
         macros = [('__DARWIN__', None)]
-        extra_link_args = ['-framework', 'Carbon']
+        extra_link_args = ['-framework', 'Carbon', '-Wl,-search_paths_first']
     else:
         define_macros = []
         macros = []
@@ -191,7 +104,7 @@
 
     build_info = {}
     kiva_lib = 'kiva_src'
-    build_libraries = [kiva_lib, agg_lib, freetype_lib]
+    build_libraries = [kiva_lib, agg_lib, "freetype"]
     if sys.platform == "win32":
         build_libraries += ["opengl32", "glu32"]
     elif sys.platform == "darwin":