[Python-checkins] python/dist/src setup.py,1.157,1.158 configure,1.388,1.389 configure.in,1.399,1.400

[nnorwitz@users.sourceforge.net]

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

Modified Files:
	setup.py configure configure.in 
Log Message:
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


Index: setup.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/setup.py,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** setup.py	21 Mar 2003 03:08:59 -0000	1.157
--- setup.py	31 Mar 2003 15:53:29 -0000	1.158
***************
*** 414,417 ****
--- 414,419 ----
                                                   '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'],
***************
*** 655,660 ****
              if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
                  curses_libs = ['curses', 'terminfo']
!             else:
                  curses_libs = ['curses', 'termcap']
  
              exts.append( Extension('_curses', ['_cursesmodule.c'],
--- 657,664 ----
              if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
                  curses_libs = ['curses', 'terminfo']
!             elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
                  curses_libs = ['curses', 'termcap']
+             else:
+                 curses_libs = ['curses']
  
              exts.append( Extension('_curses', ['_cursesmodule.c'],

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.388
retrieving revision 1.389
diff -C2 -d -r1.388 -r1.389
*** configure	30 Mar 2003 17:23:46 -0000	1.388
--- configure	31 Mar 2003 15:53:30 -0000	1.389
***************
*** 3177,3181 ****
  	case $ac_sys_system in
  	AIX*)
! 	   LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $LINKCC";;
  	dgux*)
  	   LINKCC="LD_RUN_PATH=$libdir $LINKCC";;
--- 3177,3186 ----
  	case $ac_sys_system in
  	AIX*)
! 	   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";;

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.399
retrieving revision 1.400
diff -C2 -d -r1.399 -r1.400
*** configure.in	30 Mar 2003 17:23:49 -0000	1.399
--- configure.in	31 Mar 2003 15:53:49 -0000	1.400
***************
*** 422,426 ****
  	case $ac_sys_system in
  	AIX*)
! 	   LINKCC="\$(srcdir)/Modules/makexp_aix Modules/python.exp \"\" \$(LIBRARY); $LINKCC";;
  	dgux*)
  	   LINKCC="LD_RUN_PATH=$libdir $LINKCC";;
--- 422,431 ----
  	case $ac_sys_system in
  	AIX*)
! 	   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";;