cvs: /php4/ext/mysql config.m4

sas Thu Mar 30 11:03:46 2000 EDT Modified files: /php4/ext/mysql config.m4 Log: Non-functional changes Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.19 php4/ext/mysql/config.m4:1.20 --- php4/ext/mysql/config.m4:1.19 Sun Mar 26 11:51:10 2000 +++ php4/ext/mysql/config.m4 Thu Mar 30 11:03:15 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.19 2000/03/26 19:51:10 sas Exp $ +dnl $Id: config.m4,v 1.20 2000/03/30 19:03:15 sas Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) @@ -18,17 +18,16 @@ AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "$MYSQL_SOCK", [ ]) AC_MSG_RESULT($MYSQL_SOCK) ]) - -AC_MSG_CHECKING(for MySQL support) -AC_ARG_WITH(mysql, + +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.],[ - PHP_MYSQL=$withval -],[ - PHP_MYSQL=yes -]) -AC_MSG_RESULT($PHP_MYSQL) + will be used.], yes) + +if test "$PHP_MYSQL" != "no"; then + AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) + PHP_EXTENSION(mysql) +fi if test "$PHP_MYSQL" = "yes"; then PHP_MYSQL_SOCK @@ -38,7 +37,6 @@ PHP_SUBST(MYSQL_LIBADD) PHP_SUBST(MYSQL_SUBDIRS) - PHP_EXTENSION(mysql) AC_ADD_INCLUDE(${ext_src_base}libmysql) elif test "$PHP_MYSQL" != "no"; then for i in $PHP_MYSQL; do @@ -58,9 +56,4 @@ AC_ADD_LIBPATH($MYSQL_DIR/lib/mysql) AC_ADD_LIBRARY(mysqlclient) AC_ADD_INCLUDE($MYSQL_INC_DIR) - PHP_EXTENSION(mysql) -fi - -if test "$PHP_MYSQL" != "no"; then - AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) fi