[wpdev-commits] wolfpack configure.py,1.9,1.10

[Correa <thi...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25681

Modified Files:
	configure.py 
Log Message:
added --static


Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** configure.py	28 Jul 2004 04:46:06 -0000	1.9
--- configure.py	29 Jul 2004 20:54:09 -0000	1.10
***************
*** 70,89 ****
  	elif sys.platform == "linux2":
  		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython*.so", \
! 							 "/usr/local/lib/[Pp]ython*/libpython*.so", \
! 							 "/usr/lib/libpython*.so", \
! 							 "/usr/lib/[Pp]ython*/libpython*.so", \
! 							 "/usr/lib/[Pp]ython*/config/libpython*.so", \
! 							 "/usr/local/lib/[Pp]ython*/config/libpython*.so"]
  		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython*/Python.h", \
! 							 "/usr/include/[Pp]ython*/Python.h"]
  	elif sys.platform == "freebsd4":
  		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython*.so", \
! 							 "/usr/local/lib/[Pp]ython*/libpython*.so", \
! 							 "/usr/lib/libpython*.so", \
! 							 "/usr/lib/[Pp]ython*/libpython*.so", \
! 							 "/usr/lib/[Pp]ython*/config/libpython*.so", \
! 							 "/usr/local/lib/[Pp]ython*/config/libpython*.so"]
  		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython*/Python.h", \
! 							 "/usr/include/[Pp]ython*/Python.h"]
  
  	else:
--- 70,95 ----
  	elif sys.platform == "linux2":
  		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython*.so", \
! 					 "/usr/local/lib/[Pp]ython*/libpython*.so", \
! 					 "/usr/lib/libpython*.so", \
! 					 "/usr/lib/[Pp]ython*/libpython*.so", \
! 					 "/usr/lib/[Pp]ython*/config/libpython*.so", \
! 					 "/usr/local/lib/[Pp]ython*/config/libpython*.so"]
! 		PYTHONLIBSTATICSEARCHPATH = [ "/usr/local/lib/libpython*.a", \
! 					 "/usr/local/lib/[Pp]ython*/libpython*.a", \
! 					 "/usr/lib/libpython*.a", \
! 					 "/usr/lib/[Pp]ython*/libpython*.a", \
! 					 "/usr/lib/[Pp]ython*/config/libpython*.a", \
! 					 "/usr/local/lib/[Pp]ython*/config/libpython*.a"]
  		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython*/Python.h", \
! 					 "/usr/include/[Pp]ython*/Python.h"]
  	elif sys.platform == "freebsd4":
  		PYTHONLIBSEARCHPATH = [ "/usr/local/lib/libpython*.so", \
! 					 "/usr/local/lib/[Pp]ython*/libpython*.so", \
! 					 "/usr/lib/libpython*.so", \
! 					 "/usr/lib/[Pp]ython*/libpython*.so", \
! 					 "/usr/lib/[Pp]ython*/config/libpython*.so", \
! 					 "/usr/local/lib/[Pp]ython*/config/libpython*.so"]
  		PYTHONINCSEARCHPATH = [ "/usr/local/include/[Pp]ython*/Python.h", \
! 					 "/usr/include/[Pp]ython*/Python.h"]
  
  	else:
***************
*** 91,94 ****
--- 97,104 ----
  		sys.exit()
  
+         # if --static
+ 	if options.staticlink:
+                 PYTHONLIBSEARCHPATH = PYTHONLIBSTATICSEARCHPATH
+ 
  	# if it was overiden...
  	if options.py_incpath:
***************
*** 137,141 ****
  	parser.add_option("--python-libraries", dest="py_libpath", help="Python library path")
  	parser.add_option("--qt-directory", dest="qt_dir", help="Base directory of Qt")
! 	
  	(options, args) = parser.parse_args()
  	
--- 147,151 ----
  	parser.add_option("--python-libraries", dest="py_libpath", help="Python library path")
  	parser.add_option("--qt-directory", dest="qt_dir", help="Base directory of Qt")
!         parser.add_option("--static", dest="staticlink", help="Build wokfpack using static libraries")
  	(options, args) = parser.parse_args()