From: Neal Norwitz <nnorwitz@gmail.com>
Date: Mon, 31 Mar 2003 15:53:49 +0000 (+0000)
Subject: SF patch #712367, get build working on AIX
X-Git-Tag: v2.3c1~1307
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b27ff92d2127ed39f52d9987e4e96313937cbc8;p=thirdparty%2FPython%2Fcpython.git

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
---

diff --git a/configure b/configure
index a7c4a9d421a7..24d60e8ffc15 100755
--- a/configure
+++ b/configure
@@ -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 5f455c127b59..34c7238c22b6 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*)
diff --git a/setup.py b/setup.py
index c611bf2549e9..730e00c4c6ed 100644
--- a/setup.py
+++ b/setup.py
@@ -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) )