diff options
| -rwxr-xr-x | configure | 7 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | setup.py | 6 |
3 files changed, 17 insertions, 3 deletions
@@ -3176,7 +3176,12 @@ then fi case $ac_sys_system in AIX*) - LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $LINKCC";; + exp_extra="\"\"" + if test $ac_sys_release -ge 5 -o \ + $ac_sys_release -eq 4 -a `uname -r` -ge 2 ; then + exp_extra="." + fi + LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp $exp_extra \$(LIBRARY); $LINKCC";; dgux*) LINKCC="LD_RUN_PATH=$libdir $LINKCC";; Monterey64*) diff --git a/configure.in b/configure.in index 5f455c1..34c7238 100644 --- a/configure.in +++ b/configure.in @@ -421,7 +421,12 @@ then fi case $ac_sys_system in AIX*) - LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $LINKCC";; + exp_extra="\"\"" + if test $ac_sys_release -ge 5 -o \ + $ac_sys_release -eq 4 -a `uname -r` -ge 2 ; then + exp_extra="." + fi + LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp $exp_extra \$(LIBRARY); $LINKCC";; dgux*) LINKCC="LD_RUN_PATH=$libdir $LINKCC";; Monterey64*) @@ -413,6 +413,8 @@ class PyBuildExt(build_ext): if self.compiler.find_library_file(lib_dirs, 'ncurses'): readline_libs.append('ncurses') + elif self.compiler.find_library_file(lib_dirs, 'curses'): + readline_libs.append('curses') elif self.compiler.find_library_file(lib_dirs + ['/usr/lib/termcap'], 'termcap'): @@ -654,8 +656,10 @@ class PyBuildExt(build_ext): # the _curses module. if (self.compiler.find_library_file(lib_dirs, 'terminfo')): curses_libs = ['curses', 'terminfo'] - else: + elif (self.compiler.find_library_file(lib_dirs, 'termcap')): curses_libs = ['curses', 'termcap'] + else: + curses_libs = ['curses'] exts.append( Extension('_curses', ['_cursesmodule.c'], libraries = curses_libs) ) |