]> granicus.if.org Git - python/commitdiff
That fix was bogus, undone. The problem is that the iconv include file
authorJack Jansen <jack.jansen@cwi.nl>
Mon, 24 Feb 2003 12:56:36 +0000 (12:56 +0000)
committerJack Jansen <jack.jansen@cwi.nl>
Mon, 24 Feb 2003 12:56:36 +0000 (12:56 +0000)
is found if you are running fink, but the module doesn't work. For now
I disabled building iconv_codec on darwin.

setup.py

index 96ed416f23780a78cf970572ce404fe7bed4c5c3..ca4bf9f881e38159a5cbbb60af02a6935b0e520d 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -621,9 +621,9 @@ class PyBuildExt(build_ext):
                                    ['/usr/local/include', '/usr/pkg/include'])
             iconv_libs = find_library_file(self.compiler, 'iconv', lib_dirs,
                                            ['/usr/local/lib', '/usr/pkg/lib'])
-
-            if iconv_incs:
-                if iconv_libs:
+                                           
+            if platform not in ['darwin'] and iconv_incs is not None:
+                if iconv_libs is not None:
                     iconv_libraries = ['iconv']
                 else:
                     iconv_libraries = [] # in libc