1.1 --- a/gmyth/configure.ac	Thu Dec 21 14:04:07 2006 +0000
     1.2 +++ b/gmyth/configure.ac	Thu Dec 21 21:48:28 2006 +0000
     1.3 @@ -48,7 +48,6 @@
     1.4  AC_TYPE_PID_T
     1.5  AC_STRUCT_TM
     1.6  AC_HEADER_TIME
     1.7 -AC_STRUCT_TM
     1.8  AC_HEADER_STDBOOL
     1.9  
    1.10  # Checks for library functions.
    1.11 @@ -169,7 +168,6 @@
    1.12  AC_SUBST(GSTPLUGINSBASE_CFLAGS)
    1.13  AC_SUBST(GSTPLUGINSBASE_LIBS)
    1.14  
    1.15 -
    1.16  # make GST_MAJORMINOR available in Makefile.am
    1.17  AC_SUBST(GST_MAJORMINOR)
    1.18  GSTBASE_MAJORMINOR=0.10
    1.19 @@ -195,17 +193,36 @@
    1.20  #
    1.21  # mysql libraries
    1.22  #
    1.23 -AC_CHECK_PROG(MYSQL_CFLAGS,mysql_config,`mysql_config --cflags`)
    1.24 -if test -z "$MYSQL_CFLAGS"; then 
    1.25 -        AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql client libraries are installed])
    1.26 -fi
    1.27 +AC_CHECK_LIB( mysqlclient, mysql_init, 
    1.28 +					[
    1.29 +						MYSQL_CFLAGS="$CFLAGS -DBIG_JOINS=1"
    1.30 +						MYSQL_LIBS="$LIBS -lmysqlclient"
    1.31 +					], AC_MSG_ERROR([Could not find mysqlclient library. Make sure the mysql client libraries are installed] ) )
    1.32 +
    1.33 +AC_CHECK_LIB( z, deflate, 
    1.34 +					[
    1.35 +						MYSQL_LIBS="$MYSQL_LIBS -lz"
    1.36 +					], AC_MSG_ERROR([Could not find a mysqlclient library dependency - Z. Make sure the mysql client libraries are installed]) )
    1.37 +
    1.38 +AC_CHECK_LIB( crypt, encrypt, 
    1.39 +					[
    1.40 +						MYSQL_LIBS="$MYSQL_LIBS -lcrypt"
    1.41 +					], AC_MSG_ERROR([Could not find a mysqlclient library dependency - Crypt library. Make sure the mysql client libraries are installed]) )
    1.42 +
    1.43 +AC_CHECK_LIB( nsl, yp_all, 
    1.44 +					[
    1.45 +						MYSQL_LIBS="$MYSQL_LIBS -lnsl"
    1.46 +					], AC_MSG_ERROR([Could not find a mysqlclient library dependency - NSL library. Make sure the mysql client libraries are installed]) )
    1.47 +
    1.48 +AC_CHECK_LIB( m, ccos, 
    1.49 +					[
    1.50 +						MYSQL_LIBS="$MYSQL_LIBS -lm"
    1.51 +					], AC_MSG_ERROR([Could not find a mysqlclient library dependency - M library. Make sure the mysql client libraries are installed]) )
    1.52 +
    1.53 +AC_CHECK_HEADERS( [mysql.h mysql_version.h], [ AC_MSG_NOTICE([Found MySQL headers!]) ],
    1.54 +					[ AC_MSG_WARN([Could not find mysqlclient headers, but it will work fine instead of this...]) ] )
    1.55 +
    1.56  AC_SUBST(MYSQL_CFLAGS)
    1.57 -
    1.58 -
    1.59 -AC_CHECK_PROG(MYSQL_LIBS,mysql_config,`mysql_config --libs`)
    1.60 -if test -z "$MYSQL_LIBS"; then 
    1.61 -        AC_MSG_ERROR([Could not find mysql_config script. Make sure the mysql client libraries are installed])
    1.62 -fi
    1.63  AC_SUBST(MYSQL_LIBS)
    1.64  
    1.65  #dnl Enable gtk-doc

     2.1 --- a/gmyth/src/gmyth_epg.c	Thu Dec 21 14:04:07 2006 +0000
     2.2 +++ b/gmyth/src/gmyth_epg.c	Thu Dec 21 21:48:28 2006 +0000
     2.3 @@ -30,7 +30,7 @@
     2.4  #include "config.h"
     2.5  #endif
     2.6  
     2.7 -#include <mysql.h>
     2.8 +#include <mysql/mysql.h>
     2.9  #include <stdlib.h>
    2.10  #include <string.h>
    2.11  #include <assert.h>

     3.1 --- a/gmyth/src/gmyth_livetv.c	Thu Dec 21 14:04:07 2006 +0000
     3.2 +++ b/gmyth/src/gmyth_livetv.c	Thu Dec 21 21:48:28 2006 +0000
     3.3 @@ -29,12 +29,7 @@
     3.4  #include "config.h"
     3.5  #endif
     3.6  
     3.7 -#include "gmyth_livetv.h"
     3.8 - 
     3.9 -#ifdef HAVE_CONFIG_H
    3.10 -#include "config.h"
    3.11 -#endif
    3.12 -
    3.13 +#include "gmyth_livetv.h" 
    3.14  #include "gmyth_remote_util.h"
    3.15  #include "gmyth_tvchain.h"
    3.16  #include "gmyth_socket.h"

     4.1 --- a/gmyth/src/gmyth_query.h	Thu Dec 21 14:04:07 2006 +0000
     4.2 +++ b/gmyth/src/gmyth_query.h	Thu Dec 21 21:48:28 2006 +0000
     4.3 @@ -32,7 +32,7 @@
     4.4  #include <glib-object.h>
     4.5  
     4.6  /* MYSQL includes */
     4.7 -#include <mysql.h>
     4.8 +#include <mysql/mysql.h>
     4.9  
    4.10  #include "gmyth_backendinfo.h"
    4.11