Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 39116 invoked from network); 6 Sep 2007 04:08:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Sep 2007 04:08:08 -0000 Received: (qmail 29351 invoked by uid 500); 6 Sep 2007 04:08:03 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 29300 invoked by uid 500); 6 Sep 2007 04:08:03 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 29289 invoked by uid 99); 6 Sep 2007 04:08:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Sep 2007 21:08:02 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Sep 2007 04:09:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AE6AF1A9832; Wed, 5 Sep 2007 21:07:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r573145 - in /apr/apr-util/branches/1.2.x: README.MySQL build/dbd.m4 Date: Thu, 06 Sep 2007 04:07:45 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070906040745.AE6AF1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on 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)