Commit 0b27ff92 authored by Neal Norwitz's avatar Neal Norwitz

SF patch #712367, get build working on AIX

configure change is necessary to pass "." to makexp_aix so that
dynamic modules work

setup change gets curses working
parent aca44e27
......@@ -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*)
......
......@@ -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) )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment