[wpdev-commits] wolfpack configure,1.5,1.6 wolfpack.pro,1.169,1.170

[<thi...@pr...>]

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

Modified Files:
	configure wolfpack.pro 
Log Message:
Linux compile fixes

Index: configure
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** configure	12 Jan 2004 17:24:56 -0000	1.5
--- configure	28 Jan 2004 20:08:41 -0000	1.6
***************
*** 79,85 ****
  	echo "$PYTHONINC";
  fi;
  # </python>
  
! export MYSQLINC PYTHONINC
  
  echo -n "Creating Makefile using qmake... "
--- 79,107 ----
  	echo "$PYTHONINC";
  fi;
+ 
+ echo -n "Searching for Python library.... ";
+ 
+ for py_libpath in \
+ 		/usr/lib/[Pp]ython*/libpython*.a \
+ 		/usr/lib/[Pp]ython*/config/libpython*.a \
+ 		;
+ do
+ 	if [ -e "$py_libpath" ];
+ 	then
+ 		py_libs="$py_libs\n$py_libpath";
+ 	fi;
+ done;
+ 
+ PYTHONLIB="$(echo -e "$py_libs"|sort -nr|head -1|sed -e 's/^\(\([^\/]*\/\)*\).*$/\1/;s/\/\+$//')";
+ 
+ if ! [ "PYTHONLIB" ];
+ then
+ 	echo -n "Not found :((";
+ else
+ 	echo "$PYTHONLIB";
+ fi;
  # </python>
  
! export MYSQLINC PYTHONINC PYTHONLIB
  
  echo -n "Creating Makefile using qmake... "

Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.169
retrieving revision 1.170
diff -C2 -d -r1.169 -r1.170
*** wolfpack.pro	22 Jan 2004 05:53:51 -0000	1.169
--- wolfpack.pro	28 Jan 2004 20:08:41 -0000	1.170
***************
*** 10,14 ****
  TEMPLATE       	+= app
  CONFIG        	+= qt console thread exceptions rtti
- #INCLUDEPATH	+= lib/Python/include
  OPTIONS		+= mysql
  
--- 10,13 ----
***************
*** 29,43 ****
  			MYSQL_INCLUDE = /usr/include/mysql
  		} exists(/usr/local/lib/mysql/include/mysql/mysql.h) {
! 			message("MySQL files found, support enabled")
! 			INCLUDEPATH += /usr/local/lib/mysql/include/mysql
! 			DEFINES += MYSQL_DRIVER
! 			LIBS += -lmysqlclient
  		}
  
  		!isEmpty(MYSQL_INCLUDE)	{
- 			message("MySQL include path........: ($$MYSQL_INCLUDE)")
- 			INCLUDEPATH += $$MYSQL_INCLUDE
- 			DEFINES += MYSQL_DRIVER
- 			
  			exists(/usr/lib/mysql/mysqlclient*) {
  				MYSQL_LIB = /usr/lib/mysql
--- 28,35 ----
  			MYSQL_INCLUDE = /usr/include/mysql
  		} exists(/usr/local/lib/mysql/include/mysql/mysql.h) {
! 			MYSQL_INCLUDE = /usr/local/lib/mysql/include/mysql
  		}
  
  		!isEmpty(MYSQL_INCLUDE)	{
  			exists(/usr/lib/mysql/mysqlclient*) {
  				MYSQL_LIB = /usr/lib/mysql
***************
*** 49,56 ****
  			
  			!isEmpty(MYSQL_LIB) {
  				message("MySQL library path.........: ($$MYSQL_LIB)")
! 				LIBS += -L$$MYSQL_LIB 
  			}
- 			LIBS += -lmysqlclient
  		}
  		isEmpty(MYSQL_INCLUDE)
--- 41,50 ----
  			
  			!isEmpty(MYSQL_LIB) {
+ 				message("MySQL include path.........: ($$MYSQL_INCLUDE)")
  				message("MySQL library path.........: ($$MYSQL_LIB)")
! 				LIBS += -L$$MYSQL_LIB -lmysqlclient
! 				INCLUDEPATH += $$MYSQL_INCLUDE
! 				DEFINES += MYSQL_DRIVER
  			}
  		}
  		isEmpty(MYSQL_INCLUDE)
***************
*** 68,74 ****
  		message("Error: Could not find Python include files") 
  	}
! 	INCLUDEPATH += /usr/local/include/stlport lib/Python sqlite lib/Python/Include network
! 	LIBS  += -L. -L/usr/local/lib -Llib/Python -ldl -lpython2.3 -lutil
! 	
  	# we dont use those.
  	QMAKE_LIBS_X11 -= -lX11 -lXext -lm
--- 62,68 ----
  		message("Error: Could not find Python include files") 
  	}
! 	INCLUDEPATH += /usr/local/include/stlport sqlite network
! 	LIBS  += -L/usr/local/lib -ldl -lpython2.3 -lutil
! 	LIBS  += -L$$(PYTHONLIB)	
  	# we dont use those.
  	QMAKE_LIBS_X11 -= -lX11 -lXext -lm
***************
*** 115,119 ****
  		  TmpEff.h \
  		  Trade.h \
- 		  ai/ai.h \
  		  accounts.h \
  		  basics.h \
--- 109,112 ----