Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28176
Modified Files:
configure.py wolfpack.pro
Log Message:
OK, done for now, leaving this as it is.
Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.203
retrieving revision 1.204
diff -C2 -d -r1.203 -r1.204
*** wolfpack.pro 5 Aug 2004 21:28:15 -0000 1.203
--- wolfpack.pro 5 Aug 2004 21:34:26 -0000 1.204
***************
*** 24,60 ****
# This will use custom installs over package installs.
# MySQL Checks
! isEmpty( MySQL_INCDIR ) {
! message( "Warning: MySQL_INCDIR was not defined!" )
! exists( /usr/local/include/mysql/mysql.h ) {
! message( "MySQL included found in: /usr/local/include/mysql" )
! MySQL_INCDIR = /usr/local/include/mysql
! }
! else:exists( /usr/include/mysql/mysql.h ) {
! message( "MySQL included found in: /usr/include/mysql" )
! MySQL_INCDIR = /usr/include/mysql
! }
! }
! isEmpty( MySQL_LIBDIR ) {
! message( "Warning: MySQL_LIBDIR was not defined!" )
! exists( /usr/local/lib/mysql/libmysqlclient.so ) {
! message( "Found libmysqlclient.so in: /usr/local/lib/mysql" )
! MySQL_LIBDIR = -L/usr/local/lib/mysql -lmysqlclient
}
! else:exists( /usr/lib/mysql/libmysqlclient.so ) {
! message( "Found libmysqlclient.so in: /usr/lib/mysql" )
! MySQL_LIBDIR = -L/usr/lib/mysql -lmysqlclient
}
-
}
# 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
}
--- 24,64 ----
# This will use custom installs over package installs.
+
# MySQL Checks
! mysql {
! isEmpty( MySQL_INCDIR ) {
! message( "Warning: MySQL_INCDIR was not defined!" )
! exists( /usr/local/include/mysql/mysql.h ) {
! message( "MySQL included found in: /usr/local/include/mysql" )
! MySQL_INCDIR = /usr/local/include/mysql
! }
! else:exists( /usr/include/mysql/mysql.h ) {
! message( "MySQL included found in: /usr/include/mysql" )
! MySQL_INCDIR = /usr/include/mysql
! }
}
! isEmpty( MySQL_LIBDIR ) {
! message( "Warning: MySQL_LIBDIR was not defined!" )
! exists( /usr/local/lib/mysql/libmysqlclient.so ) {
! message( "Found libmysqlclient.so in: /usr/local/lib/mysql" )
! MySQL_LIBDIR = -L/usr/local/lib/mysql -lmysqlclient
! }
! else:exists( /usr/lib/mysql/libmysqlclient.so ) {
! message( "Found libmysqlclient.so in: /usr/lib/mysql" )
! MySQL_LIBDIR = -L/usr/lib/mysql -lmysqlclient
! }
}
}
# SQLite Checks
! sqlite {
! 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
! }
}
Index: configure.py
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** configure.py 5 Aug 2004 21:28:15 -0000 1.16
--- configure.py 5 Aug 2004 21:34:26 -0000 1.17
***************
*** 223,226 ****
--- 223,229 ----
# Entry point
def main():
+ # Options for qmake
+ DEFINES = ""
+ CONFIG = ""
# Setup command line parser
***************
*** 237,241 ****
checkPython(options)
! checkMySQL(options)
checkQt()
--- 240,246 ----
checkPython(options)
! if options.enable_mysql:
! CONFIG += "mysql "
! checkMySQL(options)
checkQt()
***************
*** 272,281 ****
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 = ""
# if --debug
if options.enable_debug:
--- 277,285 ----
config.write("MySQL_LIBDIR = %s\n" % MySQL_LIBDIR )
! # Build SQLite Libs and Includes
! CONFIG += "sqlite "
config.write("SQLite_INCDIR = sqlite\n" )
config.write("SQLite_LIBDIR = -lsqlite\n" )
# if --debug
if options.enable_debug:
|
