[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/kexidb/drivers
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2003-10-07 19:00:57
[Download RAW message or body]

CVS commit by staniek: 

using include path returned by 'mysql_config --mysql_config' as-is 
instead of eating mysql suffix


  M +1 -1      configure.in.in   1.4
  M +1 -1      mySQL/mysqlconnection.cpp   1.7
  M +1 -1      mySQL/mysqlcursor.h   1.8
  M +1 -1      mySQL/mysqldriver.cpp   1.8


--- koffice/kexi/kexidb/drivers/configure.in.in  #1.3:1.4
@@ -39,5 +39,5 @@
 
 if test -n "$MYSQL_CONFIG"; then
-        mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,mysql'$,,g"| $SED -e "s,-I',,g"`
+        mysql_incdir=`$MYSQL_CONFIG --cflags| $SED -e "s,-I',,g" | $SED -e "s,'$,,g"`
         mysql_libdir=`$MYSQL_CONFIG --libs| $SED -e "s,',,g"`
         MYSQL_INC=$mysql_incdir

--- koffice/kexi/kexidb/drivers/mySQL/mysqlconnection.cpp  #1.6:1.7
@@ -23,5 +23,5 @@ Boston, MA 02111-1307, USA.
 # include <mysql/config-win.h>
 #endif
-#include <mysql/mysql.h>
+#include <mysql.h>
 #define BOOL bool
 

--- koffice/kexi/kexidb/drivers/mySQL/mysqlcursor.h  #1.7:1.8
@@ -27,5 +27,5 @@ Boston, MA 02111-1307, USA.
 # include <mysql/config-win.h>
 #endif
-#include <mysql/mysql.h>
+#include <mysql.h>
 #define BOOL bool
 

--- koffice/kexi/kexidb/drivers/mySQL/mysqldriver.cpp  #1.7:1.8
@@ -23,5 +23,5 @@ Boston, MA 02111-1307, USA.
 # include <mysql/config-win.h>
 #endif
-#include <mysql/mysql.h>
+#include <mysql.h>
 #define BOOL bool
 


[prev in list] [next in list] [prev in thread] [next in thread]