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

List:       kde-commits
Subject:    kdenonbeta/krecipes
From:       Ismail Dönmez <ismail.donmez () boun ! edu ! tr>
Date:       2004-01-03 22:21:20
Message-ID: 20040103222120.8A0DE9427 () office ! kde ! org
[Download RAW message or body]

CVS commit by cartman: 

Be nice to me and find my mysql installation too!


  M +14 -14    configure.in.in   1.10
  M +3 -2      src/DBBackend/MySQL/Makefile.am   1.2
  M +1 -1      src/DBBackend/MySQL/mysqlrecipedb.h   1.18


--- kdenonbeta/krecipes/configure.in.in  #1.9:1.10
@@ -5,20 +5,20 @@
 dnl ----- Check for existing MySQL ------
 
-AC_DEFUN(AC_HAVE_MYSQL,
-[
-        AC_DEFINE(HAVE_MYSQL, 1, [have MySQL])
-        have_mysql=true
-])
-
-AC_DEFUN(AC_NO_MYSQL,
-[
-        AC_DEFINE(HAVE_MYSQL, 0, [have MySQL])
-        have_mysql=false
+KDE_FIND_PATH(mysql_config, MYSQL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/b\
+in /usr/bin /opt/mysql/bin /usr/local/mysql/bin ], [
+  AC_MSG_WARN([Could not find MySQL anywhere, check http://www.mysql.com/])
 ])
 
-KDE_CHECK_HEADER(mysql/mysql.h,
-        AC_HAVE_MYSQL,
-        AC_NO_MYSQL
-)
+if test -n "$MYSQL_CONFIG"; then
+   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
+   MYSQL_LIBS=$mysql_libdir
+   AC_SUBST(MYSQL_INC)
+   AC_SUBST(MYSQL_LIBS)
+   have_mysql="true"
+else
+        have_mysql="no"
+fi
 
 dnl ------ Check for the SQLite headers -----

--- kdenonbeta/krecipes/src/DBBackend/MySQL/Makefile.am  #1.1:1.2
@@ -5,5 +5,5 @@
 
 # set the include path for X, qt and KDE
-INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
+INCLUDES = -I$(srcdir) -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) -I$(MYSQL_INC)
 
 
@@ -15,3 +15,4 @@
 
 #the library search path.
-libkrecmysql_la_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+libkrecmysql_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(MYSQL_LIBS)
+

--- kdenonbeta/krecipes/src/DBBackend/MySQL/mysqlrecipedb.h  #1.17:1.18
@@ -17,5 +17,5 @@
 #define DB_DRIVER "QMYSQL3"
 #define DEFAULT_DB_NAME "Krecipes"
-#include <mysql/mysql.h>
+#include <mysql.h>
 #include <qsqldatabase.h>
 #include <qimage.h>


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