# HG changeset patch
# User rosfran
# Date 1166737708 0
# Node ID bb2752e9fe023987b3748e7f07746f85ae230080
# Parent  a30eaa6bb88c2e52afebe342eaefbc54d438d33f
[svn r241] Removed the need for the mysql_config utility.

diff -r a30eaa6bb88c -r bb2752e9fe02 gmyth/configure.ac
--- a/gmyth/configure.ac	Thu Dec 21 14:04:07 2006 +0000
+++ b/gmyth/configure.ac	Thu Dec 21 21:48:28 2006 +0000
@@ -48,7 +48,6 @@
 AC_TYPE_PID_T
 AC_STRUCT_TM
 AC_HEADER_TIME
-AC_STRUCT_TM
 AC_HEADER_STDBOOL
 
 # Checks for library functions.
@@ -169,7 +168,6 @@
 AC_SUBST(GSTPLUGINSBASE_CFLAGS)
 AC_SUBST(GSTPLUGINSBASE_LIBS)
 
-
 # make GST_MAJORMINOR available in Makefile.am
 AC_SUBST(GST_MAJORMINOR)
 GSTBASE_MAJORMINOR=0.10
@@ -195,17 +193,36 @@
 #
 # mysql libraries
 #
-AC_CHECK_PROG(MYSQL_CFLAGS,mysql_config,`mysql_config --cflags`)
-if test -z "$MYSQL_CFLAGS"; then 
-        AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql client libraries are installed])
-fi
+AC_CHECK_LIB( mysqlclient, mysql_init, 
+					[
+						MYSQL_CFLAGS="$CFLAGS -DBIG_JOINS=1"
+						MYSQL_LIBS="$LIBS -lmysqlclient"
+					], AC_MSG_ERROR([Could not find mysqlclient library. Make sure the mysql client libraries are installed] ) )
+
+AC_CHECK_LIB( z, deflate, 
+					[
+						MYSQL_LIBS="$MYSQL_LIBS -lz"
+					], AC_MSG_ERROR([Could not find a mysqlclient library dependency - Z. Make sure the mysql client libraries are installed]) )
+
+AC_CHECK_LIB( crypt, encrypt, 
+					[
+						MYSQL_LIBS="$MYSQL_LIBS -lcrypt"
+					], AC_MSG_ERROR([Could not find a mysqlclient library dependency - Crypt library. Make sure the mysql client libraries are installed]) )
+
+AC_CHECK_LIB( nsl, yp_all, 
+					[
+						MYSQL_LIBS="$MYSQL_LIBS -lnsl"
+					], AC_MSG_ERROR([Could not find a mysqlclient library dependency - NSL library. Make sure the mysql client libraries are installed]) )
+
+AC_CHECK_LIB( m, ccos, 
+					[
+						MYSQL_LIBS="$MYSQL_LIBS -lm"
+					], AC_MSG_ERROR([Could not find a mysqlclient library dependency - M library. Make sure the mysql client libraries are installed]) )
+
+AC_CHECK_HEADERS( [mysql.h mysql_version.h], [ AC_MSG_NOTICE([Found MySQL headers!]) ],
+					[ AC_MSG_WARN([Could not find mysqlclient headers, but it will work fine instead of this...]) ] )
+
 AC_SUBST(MYSQL_CFLAGS)
-
-
-AC_CHECK_PROG(MYSQL_LIBS,mysql_config,`mysql_config --libs`)
-if test -z "$MYSQL_LIBS"; then 
-        AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql client libraries are installed])
-fi
 AC_SUBST(MYSQL_LIBS)
 
 #dnl Enable gtk-doc
diff -r a30eaa6bb88c -r bb2752e9fe02 gmyth/src/gmyth_epg.c
--- a/gmyth/src/gmyth_epg.c	Thu Dec 21 14:04:07 2006 +0000
+++ b/gmyth/src/gmyth_epg.c	Thu Dec 21 21:48:28 2006 +0000
@@ -30,7 +30,7 @@
 #include "config.h"
 #endif
 
-#include <mysql.h>
+#include <mysql/mysql.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
diff -r a30eaa6bb88c -r bb2752e9fe02 gmyth/src/gmyth_livetv.c
--- a/gmyth/src/gmyth_livetv.c	Thu Dec 21 14:04:07 2006 +0000
+++ b/gmyth/src/gmyth_livetv.c	Thu Dec 21 21:48:28 2006 +0000
@@ -29,12 +29,7 @@
 #include "config.h"
 #endif
 
-#include "gmyth_livetv.h"
- 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
+#include "gmyth_livetv.h" 
 #include "gmyth_remote_util.h"
 #include "gmyth_tvchain.h"
 #include "gmyth_socket.h"
diff -r a30eaa6bb88c -r bb2752e9fe02 gmyth/src/gmyth_query.h
--- a/gmyth/src/gmyth_query.h	Thu Dec 21 14:04:07 2006 +0000
+++ b/gmyth/src/gmyth_query.h	Thu Dec 21 21:48:28 2006 +0000
@@ -32,7 +32,7 @@
 #include <glib-object.h>
 
 /* MYSQL includes */
-#include <mysql.h>
+#include <mysql/mysql.h>
 
 #include "gmyth_backendinfo.h"