sterling Sun Jun 22 21:10:59 2003 EDT
Removed files:
/php5/ext/mysql/libmysql .cvsignore acinclude.m4 array.c bchange.c
bmove.c bmove_upp.c charset.c config-win.h
ctype.c ctype_autoconf.c
ctype_extra_sources.c dbug.c dbug.h
default.c dll.c errmsg.c errmsg.h errors.c
fix_copyright get_password.c global.h
int2str.c is_prefix.c libmysql.c
libmysql.dsp list.c longlong2str.c
m_ctype.h m_string.h mf_casecnv.c
mf_dirname.c mf_fn_ext.c mf_format.c
mf_loadpath.c mf_pack.c mf_path.c
mf_unixpath.c mf_wcomp.c mulalloc.c
my_alarm.h my_alloc.c my_compress.c
my_config.h my_create.c my_delete.c
my_dir.h my_div.c my_error.c my_fopen.c
my_getwd.c my_init.c my_lib.c my_list.h
my_malloc.c my_messnc.c my_net.c my_net.h
my_once.c my_open.c my_pthread.c
my_pthread.h my_read.c my_realloc.c
my_static.c my_static.h my_sys.h
my_tempnam.c my_thr_init.c my_wincond.c
my_winthread.c my_write.c mysql.h mysql.m4
mysql_com.h mysql_version.h mysqld_error.h
mysys_err.h mysys_priv.h net.c password.c
raid.h safemalloc.c stamp-h.in str2int.c
strcend.c strcont.c strend.c strfill.c
string.c strinstr.c strmake.c strmov.c
strnmov.c strto.c strtoll.c strtoull.c
strxmov.c thr_alarm.h thr_mutex.c
typelib.c update_sources violite.c
violite.h
Modified files:
/php5/ext/mysql config.m4
Log:
remove the bundled libmysql, and update the config.m4 file as necessary.
this works locally, but everyone, *please* test
Index: php5/ext/mysql/config.m4
diff -u php5/ext/mysql/config.m4:1.55 php5/ext/mysql/config.m4:1.56
--- php5/ext/mysql/config.m4:1.55 Tue Jan 7 04:49:08 2003
+++ php5/ext/mysql/config.m4 Sun Jun 22 21:10:58 2003
@@ -1,12 +1,7 @@
dnl
-dnl $Id: config.m4,v 1.55 2003/01/07 09:49:08 sas Exp $
+dnl $Id: config.m4,v 1.56 2003/06/23 01:10:58 sterling Exp $
dnl
-sinclude(ext/mysql/libmysql/acinclude.m4)
-sinclude(ext/mysql/libmysql/mysql.m4)
-sinclude(libmysql/acinclude.m4)
-sinclude(libmysql/mysql.m4)
-
AC_DEFUN(MYSQL_LIB_CHK, [
str="$MYSQL_DIR/$1/libmysqlclient.*"
for j in `echo $str`; do
@@ -45,7 +40,7 @@
PHP_ARG_WITH(mysql, for MySQL support,
[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base directory.
- If unspecified, the bundled MySQL library will be used.],
yes)
+ If unspecified, the bundled MySQL library will be used.])
PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
[ --with-mysql-sock[=DIR] MySQL: Location of the MySQL unix socket pointer.
@@ -72,32 +67,8 @@
fi
fi
-if test "$PHP_MYSQL" = "yes"; then
- MYSQL_MODULE_TYPE=builtin
- MYSQL_CHECKS
- sources="libmysql/libmysql.c libmysql/errmsg.c libmysql/net.c libmysql/violite.c
libmysql/password.c \
- libmysql/my_init.c libmysql/my_lib.c libmysql/my_static.c libmysql/my_malloc.c
libmysql/my_realloc.c libmysql/my_create.c \
- libmysql/my_delete.c libmysql/my_tempnam.c libmysql/my_open.c
libmysql/mf_casecnv.c libmysql/my_read.c \
- libmysql/my_write.c libmysql/errors.c libmysql/my_error.c libmysql/my_getwd.c
libmysql/my_div.c libmysql/mf_pack.c \
- libmysql/my_messnc.c libmysql/mf_dirname.c libmysql/mf_fn_ext.c
libmysql/mf_wcomp.c libmysql/typelib.c libmysql/safemalloc.c \
- libmysql/my_alloc.c libmysql/mf_format.c libmysql/mf_path.c
libmysql/mf_unixpath.c libmysql/my_fopen.c libmysql/mf_loadpath.c \
- libmysql/my_pthread.c libmysql/my_thr_init.c libmysql/thr_mutex.c
libmysql/mulalloc.c libmysql/string.c libmysql/default.c \
- libmysql/my_compress.c libmysql/array.c libmysql/my_once.c libmysql/list.c
libmysql/my_net.c libmysql/dbug.c \
- libmysql/strmov.c libmysql/strxmov.c libmysql/strnmov.c libmysql/strmake.c
libmysql/strend.c libmysql/strfill.c \
- libmysql/is_prefix.c libmysql/int2str.c libmysql/str2int.c libmysql/strinstr.c
\
- libmysql/strcont.c libmysql/strcend.c libmysql/bchange.c libmysql/bmove.c
libmysql/bmove_upp.c \
- libmysql/longlong2str.c libmysql/strtoull.c libmysql/strtoll.c
libmysql/charset.c libmysql/ctype.c"
-
- PHP_NEW_EXTENSION(mysql, php_mysql.c $sources, $ext_shared,,[EMAIL
PROTECTED]@/libmysql)
- PHP_ADD_BUILD_DIR($ext_builddir/libmysql)
-
-elif test "$PHP_MYSQL" != "no"; then
-
- MYSQL_TYPE_CHECKS
-
- PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
-
- for i in $PHP_MYSQL; do
+if test "$PHP_MYSQL" != "no"; then
+ for i in /usr /usr/local $PHP_MYSQL; do
if test -r $i/include/mysql/mysql.h; then
MYSQL_DIR=$i
MYSQL_INC_DIR=$i/include/mysql
@@ -111,8 +82,6 @@
AC_MSG_ERROR(Cannot find MySQL header files under $PHP_MYSQL)
fi
- MYSQL_MODULE_TYPE=external
-
for i in lib lib/mysql; do
MYSQL_LIB_CHK($i)
done
@@ -145,16 +114,7 @@
])
PHP_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD)
- MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS"
-
PHP_ADD_INCLUDE($MYSQL_INC_DIR)
- MYSQL_INCLUDE=-I$MYSQL_INC_DIR
-else
- MYSQL_MODULE_TYPE=none
+ PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
fi
-
-PHP_SUBST(MYSQL_SHARED_LIBADD)
-PHP_SUBST_OLD(MYSQL_MODULE_TYPE)
-PHP_SUBST_OLD(MYSQL_LIBS)
-PHP_SUBST_OLD(MYSQL_INCLUDE)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
