[Python-checkins] python/dist/src setup.py,1.158,1.159
loewis@users.sourceforge.net
loewis@users.sourceforge.net
Wed, 02 Apr 2003 20:49:13 -0800
Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv24599
Modified Files:
setup.py
Log Message:
Revert Patch #670715: iconv support.
Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.158
retrieving revision 1.159
diff -C2 -d -r1.158 -r1.159
*** setup.py 31 Mar 2003 15:53:29 -0000 1.158
--- setup.py 3 Apr 2003 04:49:11 -0000 1.159
***************
*** 623,644 ****
libraries = libs) )
- # Hye-Shik Chang's iconv_codec C interface
- iconv_incs = find_file('iconv.h', inc_dirs,
- ['/usr/local/include', '/usr/pkg/include'])
- 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:
- iconv_libraries = [] # in libc
-
- exts.append( Extension('_iconv_codec',
- ['_iconv_codec.c'],
- include_dirs = iconv_incs,
- library_dirs = iconv_libs,
- libraries = iconv_libraries), )
-
# Curses support, requring the System V version of curses, often
# provided by the ncurses library.
--- 623,626 ----