Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5612
Modified Files:
configure.py
Log Message:
experimental MacOS X support
Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** configure.py 23 Aug 2004 19:35:31 -0000 1.30
--- configure.py 23 Aug 2004 21:05:36 -0000 1.31
***************
*** 164,168 ****
return True
! def checkPython(options):
PYTHONINCSEARCHPATH = [ distutils.sysconfig.get_python_inc() + os.path.sep + "Python.h" ]
if distutils.sysconfig.get_config_vars().has_key("DESTSHARED"):
--- 164,168 ----
return True
! def checkPython( options, lookForHeaders = True, lookForLib = True ):
PYTHONINCSEARCHPATH = [ distutils.sysconfig.get_python_inc() + os.path.sep + "Python.h" ]
if distutils.sysconfig.get_config_vars().has_key("DESTSHARED"):
***************
*** 237,261 ****
sys.stdout.write(yellow("Warning:") + " Wolfpack support for big endian systems is completely experimental and unlikey to work\n" )
! sys.stdout.write( "Searching for Python library... " )
! global py_libpath
! global py_libfile
! py_libfile, py_libpath = findFile( PYTHONLIBSEARCHPATH )
! if ( py_libfile ):
! sys.stdout.write("%s\n" % os.path.join( py_libpath, py_libfile ) )
! else:
! sys.stdout.write(red("Not Found!") + "\n")
! sys.exit()
! global py_incpath
! py_incfile = None
! sys.stdout.write( "Searching for Python includes... " )
! py_incfile, py_incpath = findFile( PYTHONINCSEARCHPATH )
! if ( py_incfile ):
! sys.stdout.write( "%s\n" % py_incpath )
! else:
! sys.stdout.write(red("Not Found!") + "\n")
! sys.exit()
return True
--- 237,263 ----
sys.stdout.write(yellow("Warning:") + " Wolfpack support for big endian systems is completely experimental and unlikey to work\n" )
! if lookForLib:
! sys.stdout.write( "Searching for Python library... " )
! global py_libpath
! global py_libfile
! py_libfile, py_libpath = findFile( PYTHONLIBSEARCHPATH )
! if ( py_libfile ):
! sys.stdout.write("%s\n" % os.path.join( py_libpath, py_libfile ) )
! else:
! sys.stdout.write(red("Not Found!") + "\n")
! sys.exit()
! if lookForHeaders:
! global py_incpath
! py_incfile = None
! sys.stdout.write( "Searching for Python includes... " )
! py_incfile, py_incpath = findFile( PYTHONINCSEARCHPATH )
! if ( py_incfile ):
! sys.stdout.write( "%s\n" % py_incpath )
! else:
! sys.stdout.write(red("Not Found!") + "\n")
! sys.exit()
return True
***************
*** 283,287 ****
nocolor()
! checkPython(options)
if options.enable_mysql:
CONFIG += "mysql "
--- 285,289 ----
nocolor()
! checkPython(options, True, not (sys.platform == "darwin") )
if options.enable_mysql:
CONFIG += "mysql "
***************
*** 304,310 ****
# Build Python LIBS and Includes
! PY_LIBDIR = buildLibLine( py_libpath, py_libfile )
! config.write("PY_INCDIR = %s\n" % ( py_incpath ) )
! config.write("PY_LIBDIR = %s\n" % PY_LIBDIR)
--- 306,316 ----
# Build Python LIBS and Includes
! if sys.platform == "darwin":
! # MacPython is build as a Framework, not a library :/
! PY_LIBDIR = distutils.sysconfig.get_config_vars("LINKFORSHARED")[0]
! else:
! PY_LIBDIR = buildLibLine( py_libpath, py_libfile )
! config.write("PY_INCDIR = %s\n" % ( py_incpath ) )
! config.write("PY_LIBDIR = %s\n" % PY_LIBDIR)
***************
*** 319,325 ****
CONFIG += "debug warn_on "
else:
! CONFIG += "release warn_off "
!
# if --aidebug
if options.enable_aidebug:
--- 325,331 ----
CONFIG += "debug warn_on "
else:
! CONFIG += "release warn_off "
!
# if --aidebug
if options.enable_aidebug:
|
