svn commit: r573145 - in /apr/apr-util/branches/1.2.x: README.MySQL build/dbd.m4

[bo...@apache.org]

Author: bojan
Date: Wed Sep  5 21:07:44 2007
New Revision: 573145

URL: http://svn.apache.org/viewvc?rev=573145&view=rev
Log:
Disable building of MySQL DBD driver by default and let users know

Added:
    apr/apr-util/branches/1.2.x/README.MySQL
Modified:
    apr/apr-util/branches/1.2.x/build/dbd.m4

Added: apr/apr-util/branches/1.2.x/README.MySQL
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/README.MySQL?rev=573145&view=auto
==============================================================================
--- apr/apr-util/branches/1.2.x/README.MySQL (added)
+++ apr/apr-util/branches/1.2.x/README.MySQL Wed Sep  5 21:07:44 2007
@@ -0,0 +1,3 @@
+As of apr-util version 1.2.11, MySQL DBD driver is shipped as part of the
+distribution. However, unless you specify --with-mysql option to configure,
+MySQL DBD driver will NOT be built to avoid ABI breakage.

Modified: apr/apr-util/branches/1.2.x/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.2.x/build/dbd.m4?rev=573145&r1=573144&r2=573145&view=diff
==============================================================================
--- apr/apr-util/branches/1.2.x/build/dbd.m4 (original)
+++ apr/apr-util/branches/1.2.x/build/dbd.m4 Wed Sep  5 21:07:44 2007
@@ -79,7 +79,7 @@
   apu_have_mysql=0
 
   AC_ARG_WITH([mysql],
-    APR_HELP_STRING([--with-mysql=DIR], [specify MySQL location]),
+    APR_HELP_STRING([--with-mysql=DIR], [specify MySQL location (disabled by default)]),
   [
     apu_have_mysql=0
     if test "$withval" = "yes"; then
@@ -143,32 +143,6 @@
       CPPFLAGS="$old_cppflags"
       LDFLAGS="$old_ldflags"
     fi
-  ], [
-    apu_have_mysql=0
-
-    old_cppflags="$CPPFLAGS"
-    old_ldflags="$LDFLAGS"
-
-    AC_PATH_PROG([MYSQL_CONFIG],[mysql_config])
-    if test "x$MYSQL_CONFIG" != 'x'; then
-      mysql_CPPFLAGS="`$MYSQL_CONFIG --include`"
-      mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`"
-
-      APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS])
-      APR_ADDTO(LDFLAGS, [$mysql_LDFLAGS])
-    fi
-
-    AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]))
-
-    if test "$apu_have_mysql" != "0"; then
-      if test "x$MYSQL_CONFIG" != 'x'; then
-        APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS])
-        APR_ADDTO(APRUTIL_LDFLAGS, [$mysql_LDFLAGS])
-      fi
-    fi
-
-    CPPFLAGS="$old_cppflags"
-    LDFLAGS="$old_ldflags"
   ])
 
   AC_SUBST(apu_have_mysql)