[wpdev-commits] wolfpack configure.py,1.15,1.16 wolfpack.pro,1.202,1.203

[Richard M. <dr...@us...>]

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

Modified Files:
	configure.py wolfpack.pro 
Log Message:
This is a bit cleaner :D


Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.202
retrieving revision 1.203
diff -C2 -d -r1.202 -r1.203
*** wolfpack.pro	5 Aug 2004 21:21:15 -0000	1.202
--- wolfpack.pro	5 Aug 2004 21:28:15 -0000	1.203
***************
*** 15,19 ****
  
  unix {
- 	QMAKE_LIBDIR_FLAGS = -L/usr/lib -L/usr/local/lib
  	LIBS = -ldl -lutil
  
--- 15,18 ----
***************
*** 51,61 ****
  
  	# SQLite Checks
! 	isEmpty( SQLITE_INCDIR ) {
! 		message( "Warning: SQLITE_INCDIR was not defined!" )
! 		SQLITE_INCDIR = sqlite
  	}
! 	isEmpty( SQLITE_LIBDIR ) {
! 		message( "Warning: SQLITE_LIBDIR was not defined!" )
! 		SQLITE_LIBDIR = -Lsqlite
  	}
  
--- 50,60 ----
  
  	# SQLite Checks
! 	isEmpty( SQLite_INCDIR ) {
! 		message( "Warning: SQLite_INCDIR was not defined!" )
! 		SQLite_INCDIR = sqlite
  	}
! 	isEmpty( SQLite_LIBDIR ) {
! 		message( "Warning: SQLite_LIBDIR was not defined!" )
! 		SQLite_LIBDIR = -Lsqlite
  	}
  
***************
*** 109,114 ****
  	}
  
! 	INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR $$SQLITE_INCDIR
! 	LIBS += $$PY_LIBDIR $$MySQL_LIBDIR $$SQLITE_LIBDIR
  
  	# We need to remove these to be safe
--- 108,113 ----
  	}
  
! 	INCLUDEPATH += $$PY_INCDIR $$MySQL_INCDIR $$SQLite_INCDIR
! 	LIBS += $$PY_LIBDIR $$MySQL_LIBDIR $$SQLite_LIBDIR
  
  	# We need to remove these to be safe
***************
*** 374,376 ****
  }
  
! message( "For additional options please try executing: python configure.py" )
--- 373,375 ----
  }
  
! message( "Please make sure you execute: python configure.py" )

Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure.py	5 Aug 2004 21:21:15 -0000	1.15
--- configure.py	5 Aug 2004 21:28:15 -0000	1.16
***************
*** 117,121 ****
  	global mysql_incpath
  	mysql_incfile = None
! 	sys.stdout.write( "Searching for Python includes... " )
  	mysql_incfile, mysql_incpath = findFile( MySQL_INCSEARCHPATH )
  	if ( mysql_incfile ):
--- 117,121 ----
  	global mysql_incpath
  	mysql_incfile = None
! 	sys.stdout.write( "Searching for MySQL includes... " )
  	mysql_incfile, mysql_incpath = findFile( MySQL_INCSEARCHPATH )
  	if ( mysql_incfile ):
***************
*** 258,275 ****
  		PY_LIBDIR = os.path.join( py_libpath, py_libfile )
  	else:
! 		PY_LIBDIR = "-lpython2.3 -L%s" % ( py_libpath )
  	config.write("PY_INCDIR = %s\n" % ( py_incpath ) )
  	config.write("PY_LIBDIR = %s\n" % PY_LIBDIR)
  
  
! 	# Build MySQL Libs
  	MySQL_LIBDIR = ""
  	if sys.platform == "win32":
  		MySQL_LIBDIR = os.path.join( mysql_libpath, mysql_libfile )
  	else:
! 		MySQL_LIBDIR = "-lmysqlclient -L%s" % ( mysql_libpath )
  	config.write("MySQL_INCDIR = %s\n" % mysql_incpath )
  	config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR )
  
  	DEFINES = ""
  	CONFIG = ""
--- 258,279 ----
  		PY_LIBDIR = os.path.join( py_libpath, py_libfile )
  	else:
! 		PY_LIBDIR = "-L%s -lpython2.3" % ( py_libpath )
  	config.write("PY_INCDIR = %s\n" % ( py_incpath ) )
  	config.write("PY_LIBDIR = %s\n" % PY_LIBDIR)
  
  
! 	# Build MySQL Libs and Includes
  	MySQL_LIBDIR = ""
  	if sys.platform == "win32":
  		MySQL_LIBDIR = os.path.join( mysql_libpath, mysql_libfile )
  	else:
! 		MySQL_LIBDIR = "-L%s -lmysqlclient" % ( mysql_libpath )
  	config.write("MySQL_INCDIR = %s\n" % mysql_incpath )
  	config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR )
  
+ 	# Build MySQL Libs and Includes
+ 	config.write("SQLite_INCDIR = sqlite\n" )
+ 	config.write("SQLite_LIBDIR = -lsqlite\n" )
+ 
  	DEFINES = ""
  	CONFIG = ""