[Python-checkins] python/dist/src setup.py,1.150,1.151

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Mon, 24 Feb 2003 04:56:39 -0800


Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv912

Modified Files:
	setup.py 
Log Message:
That fix was bogus, undone. The problem is that the iconv include file
is found if you are running fink, but the module doesn't work. For now
I disabled building iconv_codec on darwin.


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.150
retrieving revision 1.151
diff -C2 -d -r1.150 -r1.151
*** setup.py	24 Feb 2003 12:48:58 -0000	1.150
--- setup.py	24 Feb 2003 12:56:36 -0000	1.151
***************
*** 622,628 ****
              iconv_libs = find_library_file(self.compiler, 'iconv', lib_dirs,
                                             ['/usr/local/lib', '/usr/pkg/lib'])
! 
!             if iconv_incs:
!                 if iconv_libs:
                      iconv_libraries = ['iconv']
                  else:
--- 622,628 ----
              iconv_libs = find_library_file(self.compiler, 'iconv', lib_dirs,
                                             ['/usr/local/lib', '/usr/pkg/lib'])
!                                            
!             if platform not in ['darwin'] and iconv_incs is not None:
!                 if iconv_libs is not None:
                      iconv_libraries = ['iconv']
                  else: