diff options
| author | Sascha Schumann <sas@php.net> | 2000-03-06 22:38:49 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2000-03-06 22:38:49 +0000 |
| commit | 12b2f2af8f1550f615c6b7ad985d3851f651f11e (patch) | |
| tree | 5c9089c12936c4d2aa9a1023d2ead530811263ff | |
| parent | 99e0b36321236c1bcf9d60c1e3ed07050b55a20f (diff) | |
| download | php-git-12b2f2af8f1550f615c6b7ad985d3851f651f11e.tar.gz | |
Build fixes - MySQL now actually works
| -rw-r--r-- | ext/mysql/config.m4 | 2 | ||||
| -rw-r--r-- | ext/mysql/libmysql/Makefile.in | 2 | ||||
| -rw-r--r-- | ext/mysql/libmysql/libmysql.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4 index e3a7ed64a0..294395ee07 100644 --- a/ext/mysql/config.m4 +++ b/ext/mysql/config.m4 @@ -16,5 +16,7 @@ AC_MSG_RESULT($PHP_MYSQL) 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 diff --git a/ext/mysql/libmysql/Makefile.in b/ext/mysql/libmysql/Makefile.in index 33a7a55f8e..245698466f 100644 --- a/ext/mysql/libmysql/Makefile.in +++ b/ext/mysql/libmysql/Makefile.in @@ -4,7 +4,7 @@ srcdir = @srcdir@ 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 \ diff --git a/ext/mysql/libmysql/libmysql.c b/ext/mysql/libmysql/libmysql.c index 6be7bd7b7b..888d0e22c9 100644 --- a/ext/mysql/libmysql/libmysql.c +++ b/ext/mysql/libmysql/libmysql.c @@ -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> |