embedaddon/php/ext/mysql/config.m4 - diff

Return to config.m4 CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / ext / mysql

Diff for /embedaddon/php/ext/mysql/config.m4 between versions 1.1.1.1 and 1.1.1.4

version 1.1.1.1, 2012/02/21 23:47:58	version 1.1.1.4, 2013/10/14 08:02:25
Line 41 AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [	Line 41 AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [

PHP_ARG_WITH(mysql, for MySQL support,	PHP_ARG_WITH(mysql, for MySQL support,
[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base	[ --with-mysql[=DIR] Include MySQL support. DIR is the MySQL base
directory. If mysqlnd is passed as DIR,	directory, if no DIR is passed or the value is
the MySQL native driver will be used [/usr/local]])	mysqlnd the MySQL native driver will be used])

PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,	PHP_ARG_WITH(mysql-sock, for specified location of the MySQL UNIX socket,
[ --with-mysql-sock[=DIR] MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.	[ --with-mysql-sock[=SOCKPATH] MySQL/MySQLi/PDO_MYSQL: Location of the MySQL unix socket pointer.
If unspecified, the default locations are searched], no, no)	If unspecified, the default locations are searched], no, no)

if test -z "$PHP_ZLIB_DIR"; then	if test -z "$PHP_ZLIB_DIR"; then
Line 53 if test -z "$PHP_ZLIB_DIR"; then	Line 53 if test -z "$PHP_ZLIB_DIR"; then
[ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix], no, no)	[ --with-zlib-dir[=DIR] MySQL: Set the path to libz install prefix], no, no)
fi	fi

if test "$PHP_MYSQL" = "mysqlnd"; then	if test "$PHP_MYSQL" = "yes" \|\| test "$PHP_MYSQL" = "mysqlnd"; then
dnl enables build of mysqnd library	dnl enables build of mysqnd library
PHP_MYSQLND_ENABLED=yes	PHP_MYSQLND_ENABLED=yes

Line 61 elif test "$PHP_MYSQL" != "no"; then	Line 61 elif test "$PHP_MYSQL" != "no"; then
MYSQL_DIR=	MYSQL_DIR=
MYSQL_INC_DIR=	MYSQL_INC_DIR=

for i in $PHP_MYSQL /usr/local /usr; do	if test -r $PHP_MYSQL/include/mysql/mysql.h; then
if test -r $i/include/mysql/mysql.h; then	MYSQL_DIR=$PHP_MYSQL
MYSQL_DIR=$i	MYSQL_INC_DIR=$PHP_MYSQL/include/mysql
MYSQL_INC_DIR=$i/include/mysql	break
break	elif test -r $PHP_MYSQL/include/mysql.h; then
elif test -r $i/include/mysql.h; then	MYSQL_DIR=$PHP_MYSQL
MYSQL_DIR=$i	MYSQL_INC_DIR=$PHP_MYSQL/include
MYSQL_INC_DIR=$i/include	break
break	fi
fi
done

if test -z "$MYSQL_DIR"; then	if test -z "$MYSQL_DIR"; then
AC_MSG_ERROR([Cannot find MySQL header files under $PHP_MYSQL.	AC_MSG_ERROR([Cannot find MySQL header files under $PHP_MYSQL.
Line 99 Note that the MySQL client library is not bundled anym	Line 97 Note that the MySQL client library is not bundled anym
done	done

if test -z "$MYSQL_LIB_DIR"; then	if test -z "$MYSQL_LIB_DIR"; then
	MYSQL_LIB_CHK(lib/x86_64-linux-gnu)
	fi
	if test -z "$MYSQL_LIB_DIR"; then
	MYSQL_LIB_CHK(lib/i386-linux-gnu)
	fi

	if test -z "$MYSQL_LIB_DIR"; then
AC_MSG_ERROR([Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.	AC_MSG_ERROR([Cannot find lib$MYSQL_LIBNAME under $MYSQL_DIR.
Note that the MySQL client library is not bundled anymore!])	Note that the MySQL client library is not bundled anymore!])
fi	fi
Line 155 if test "$PHP_MYSQL" != "no"; then	Line 160 if test "$PHP_MYSQL" != "no"; then
PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)	PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)
PHP_SUBST(MYSQL_SHARED_LIBADD)	PHP_SUBST(MYSQL_SHARED_LIBADD)

if test "$PHP_MYSQL" = "mysqlnd"; then	if test "$PHP_MYSQL" = "yes" \|\| test "$PHP_MYSQL" = "mysqlnd"; then
PHP_ADD_EXTENSION_DEP(mysql, mysqlnd)	PHP_ADD_EXTENSION_DEP(mysql, mysqlnd)
AC_DEFINE([MYSQL_USE_MYSQLND], 1, [Whether mysqlnd is enabled])	AC_DEFINE([MYSQL_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
fi	fi

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.4