From: Sascha Schumann <sas@php.net>
Date: Thu, 30 Mar 2000 19:03:15 +0000 (+0000)
Subject: Non-functional changes
X-Git-Tag: php-4.0RC2~564
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27b736a19245e872c90a8a50668fa1a82e933496;p=php

Non-functional changes
---

diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index f04301c5c6..77c242d9b0 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -18,17 +18,16 @@ AC_DEFUN(PHP_MYSQL_SOCK,[
   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 @@ if test "$PHP_MYSQL" = "yes"; then
   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 @@ elif test "$PHP_MYSQL" != "no"; then
   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