Skip to content

Commit c8ec0fa

Browse files
author
Sascha Schumann
committed
Fix building mysql client library
Run client lib specific checks only when clientlib is used Remove second invocation of MYSQL_SOCK
1 parent 1962e1e commit c8ec0fa

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

ext/mysql/config.m4

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ PHP_ARG_WITH(mysql, for MySQL support,
4141

4242
if test "$PHP_MYSQL" != "no"; then
4343
PHP_MYSQL_SOCK
44-
MYSQL_CHECKS
4544
AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL])
4645
fi
4746

4847
if test "$PHP_MYSQL" = "yes"; then
4948
MYSQL_MODULE_TYPE=builtin
49+
MYSQL_CHECKS
5050
sources="libmysql/libmysql.c libmysql/errmsg.c libmysql/net.c libmysql/violite.c libmysql/password.c \
5151
libmysql/my_init.c libmysql/my_lib.c libmysql/my_static.c libmysql/my_malloc.c libmysql/my_realloc.c libmysql/my_create.c \
5252
libmysql/my_delete.c libmysql/my_tempnam.c libmysql/my_open.c libmysql/mf_casecnv.c libmysql/my_read.c \
@@ -60,7 +60,7 @@ if test "$PHP_MYSQL" = "yes"; then
6060
libmysql/strcont.c libmysql/strcend.c libmysql/bchange.c libmysql/bmove.c libmysql/bmove_upp.c \
6161
libmysql/longlong2str.c libmysql/strtoull.c libmysql/strtoll.c libmysql/charset.c libmysql/ctype.c"
6262

63-
PHP_NEW_EXTENSION(mysql, php_mysql.c, $sources $ext_shared,,-I@ext_srcdir@/libmysql)
63+
PHP_NEW_EXTENSION(mysql, php_mysql.c $sources, $ext_shared,,-I@ext_srcdir@/libmysql)
6464
PHP_ADD_BUILD_DIR($ext_builddir/libmysql)
6565

6666
elif test "$PHP_MYSQL" != "no"; then
@@ -118,8 +118,7 @@ elif test "$PHP_MYSQL" != "no"; then
118118
MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient $MYSQL_LIBS"
119119

120120
PHP_ADD_INCLUDE($MYSQL_INC_DIR)
121-
MYSQL_INCLUDE="-I$MYSQL_INC_DIR"
122-
PHP_MYSQL_SOCK
121+
MYSQL_INCLUDE=-I$MYSQL_INC_DIR
123122

124123
else
125124
MYSQL_MODULE_TYPE=none

0 commit comments

Comments
 (0)