cvs: /php4/ext/mysql config.m4 /php4/ext/mysql/libmysql Makefile.in libmysql.c

sas Mon Mar 6 14:39:19 2000 EDT Modified files: /php4/ext/mysql config.m4 /php4/ext/mysql/libmysql Makefile.in libmysql.c Log: Build fixes - MySQL now actually works Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.14 php4/ext/mysql/config.m4:1.15 --- php4/ext/mysql/config.m4:1.14 Mon Mar 6 12:12:12 2000 +++ php4/ext/mysql/config.m4 Mon Mar 6 14:38:48 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.14 2000/03/06 20:12:12 sas Exp $ +dnl $Id: config.m4,v 1.15 2000/03/06 22:38:48 sas Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) @@ -16,5 +16,7 @@ if test "$PHP_MYSQL" != "no"; then PHP_EXTENSION(mysql) + AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) + AC_ADD_INCLUDE(${ext_src_base}libmysql) MYSQL_CHECKS fi Index: php4/ext/mysql/libmysql/Makefile.in diff -u php4/ext/mysql/libmysql/Makefile.in:1.1 php4/ext/mysql/libmysql/Makefile.in:1.2 --- php4/ext/mysql/libmysql/Makefile.in:1.1 Mon Mar 6 12:06:23 2000 +++ php4/ext/mysql/libmysql/Makefile.in Mon Mar 6 14:38:49 2000 @@ -4,7 +4,7 @@ VPATH = @srcdir@ LTLIBRARY_NAME = libmysql_client.la -LTLIBRARY_SOURCES = \ +LTLIBRARY_SOURCES = libmysql.c errmsg.c net.c violite.c password.c \ my_init.c my_static.c my_malloc.c my_realloc.c my_create.c \ my_delete.c my_tempnam.c my_open.c mf_casecnv.c my_read.c \ my_write.c errors.c my_error.c my_getwd.c my_div.c mf_pack.c \ Index: php4/ext/mysql/libmysql/libmysql.c diff -u php4/ext/mysql/libmysql/libmysql.c:1.1 php4/ext/mysql/libmysql/libmysql.c:1.2 --- php4/ext/mysql/libmysql/libmysql.c:1.1 Sat Feb 19 13:35:02 2000 +++ php4/ext/mysql/libmysql/libmysql.c Mon Mar 6 14:38:49 2000 @@ -1,6 +1,8 @@ /* Copyright Abandoned 1996 TCX DataKonsult AB & Monty Program KB & Detron HB This file is public domain and comes with NO WARRANTY of any kind */ +#define PROTOCOL_VERSION 10 + #define DONT_USE_RAID #if defined(__WIN32__) || defined(WIN32) #include <winsock.h>