cvs: php4 / configure.in /ext/mysql config.m4

zeev Tue Jun 20 15:12:22 2000 EDT Modified files: /php4 configure.in /php4/ext/mysql config.m4 Log: Warn about using the built-in MySQL library Index: php4/configure.in diff -u php4/configure.in:1.151 php4/configure.in:1.152 --- php4/configure.in:1.151 Fri Jun 16 15:08:50 2000 +++ php4/configure.in Tue Jun 20 15:12:22 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.151 2000/06/16 22:08:50 hholzgra Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.152 2000/06/20 22:12:22 zeev Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -852,7 +852,8 @@ if test "$REDIRECT" = "0"; then if test "$DISCARD_PATH" = "0"; then echo "+--------------------------------------------------------------------+" - echo "| Warning: |" + echo "| *** WARNING *** |" + echo "| |" echo "| You will be compiling the CGI version of PHP without any |" echo "| redirection checking. By putting this cgi binary somewhere in |" echo "| your web space, users may be able to circumvent existing .htaccess |" @@ -867,7 +868,8 @@ rm -f config.cache cat <<X +--------------------------------------------------------------------+ -| ATTENTION! | +| *** ATTENTION *** | +| | | Something is likely to be messed up here, because the configure | | script was not able to detect a simple feature on your platform. | | This is often caused by incorrect configuration parameters. Please | @@ -876,6 +878,20 @@ | If you are unable to fix this, send the file debug.log to the | | php-install@lists.php.net mailing list and include appropiate | | information about your setup. | +X + fi + + if test "$MYSQL_MODULE_TYPE" = "builtin" ; then +cat <<X ++--------------------------------------------------------------------+ +| *** WARNING *** | +| | +| You chose to compile PHP with the built-in MySQL support. If you | +| are compiling a server module, and intend to use other server | +| modules that also use MySQL (e.g, mod_auth_mysql, PHP 3.0, | +| mod_perl) you must NOT rely on PHP's built-in MySQL support, and | +| instead build it with your local MySQL support files, by adding | +| --with-mysql=/path/to/mysql to your configure line. | X fi Index: php4/ext/mysql/config.m4 diff -u php4/ext/mysql/config.m4:1.25 php4/ext/mysql/config.m4:1.26 --- php4/ext/mysql/config.m4:1.25 Sat Jun 10 00:48:55 2000 +++ php4/ext/mysql/config.m4 Tue Jun 20 15:12:22 2000 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.25 2000/06/10 07:48:55 sas Exp $ +dnl $Id: config.m4,v 1.26 2000/06/20 22:12:22 zeev Exp $ sinclude(ext/mysql/libmysql/acinclude.m4) sinclude(ext/mysql/libmysql/mysql.m4) @@ -51,6 +51,7 @@ PHP_SUBST(MYSQL_SUBDIRS) LIB_BUILD($ext_builddir/libmysql,$ext_shared,yes) AC_ADD_INCLUDE($ext_srcdir/libmysql) + MYSQL_MODULE_TYPE="builtin" elif test "$PHP_MYSQL" != "no"; then for i in $PHP_MYSQL; do if test -r $i/include/mysql/mysql.h; then @@ -66,6 +67,7 @@ AC_MSG_ERROR(Cannot find header files under $PHP_MYSQL) fi + MYSQL_MODULE_TYPE="external" for i in lib lib/mysql; do MYSQL_LIB_CHK($i) done @@ -77,5 +79,7 @@ AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD) AC_ADD_INCLUDE($MYSQL_INC_DIR) +else + MYSQL_MODULE_TYPE="none" fi PHP_SUBST(MYSQL_SHARED_LIBADD)