- Remove register_globals warning, and "built-in MySQL lib" warning

diff --git a/configure.in b/configure.in
index 7bda74b15ab08e5649fc59aeaebc9d565483fe6e..e7a2d85eb5a7eb7dc06aceeb0a08ff590af3543d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1273,20 +1273,6 @@ cat <<X
 X
   fi
 
-  if test "$MYSQL_MODULE_TYPE" = "builtin" && test "$PHP_SAPI" != "cgi" && test "$PHP_SAPI" != "cli" && test "$php_multiple_shlib_versions_ok" != "yes"; 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
-
   # Warn about linking Apache with libpthread if oci8 extension is enabled on linux.
   if test "$PHP_OCI8" != "no" -o "$PHP_ORACLE" != "no"; then
     if test "$PHP_SAPI" = "apache"; then
@@ -1322,16 +1308,6 @@ cat <<X
 | If you do not agree with the terms of this license, you must abort |
 | the installation process at this point.                            |
 +--------------------------------------------------------------------+
-|                          *** NOTE ***                              |
-|            The default for register_globals is now OFF!            |
-|                                                                    |
-| If your application relies on register_globals being ON, you       |
-| should explicitly set it to on in your php.ini file.               |
-| Note that you are strongly encouraged to read                      |
-| http://www.php.net/manual/en/security.registerglobals.php          |
-| about the implications of having register_globals set to on, and   |
-| avoid using it if possible.                                        |
-+--------------------------------------------------------------------+
 
 Thank you for using PHP.