Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 98487 invoked from network); 25 Feb 2009 00:24:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 Feb 2009 00:24:58 -0000 Received: (qmail 59285 invoked by uid 500); 25 Feb 2009 00:24:57 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 59241 invoked by uid 500); 25 Feb 2009 00:24:57 -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 59231 invoked by uid 99); 25 Feb 2009 00:24:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Feb 2009 16:24:57 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Feb 2009 00:24:56 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C1D1223888F1; Wed, 25 Feb 2009 00:24:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r747623 - in /apr/apr-util/trunk: build/dbd.m4 dbd/apr_dbd_mysql.c Date: Wed, 25 Feb 2009 00:24:36 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090225002436.C1D1223888F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bojan Date: Wed Feb 25 00:24:36 2009 New Revision: 747623 URL: http://svn.apache.org/viewvc?rev=747623&view=rev Log: Use of my_init() requires my_global.h and my_sys.h. Modified: apr/apr-util/trunk/build/dbd.m4 apr/apr-util/trunk/dbd/apr_dbd_mysql.c Modified: apr/apr-util/trunk/build/dbd.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbd.m4?rev=747623&r1=747622&r2=747623&view=diff ============================================================================== --- apr/apr-util/trunk/build/dbd.m4 (original) +++ apr/apr-util/trunk/build/dbd.m4 Wed Feb 25 00:24:36 2009 @@ -176,9 +176,15 @@ APR_ADDTO(LIBS, [$mysql_LIBS]) fi - AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], + AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), + [apu_have_mysql=0; break], + [#include ]) if test "$apu_have_mysql" = "0"; then - AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], + AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), + [apu_have_mysql=0; break], + [#include ]) fi if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) @@ -201,10 +207,16 @@ APR_ADDTO(LIBS, [$mysql_LIBS]) AC_MSG_NOTICE(checking for mysql in $withval) - AC_CHECK_HEADERS(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + AC_CHECK_HEADERS([mysql.h my_global.h my_sys.h], + AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), + [apu_have_mysql=0; break], + [#include ]) if test "$apu_have_mysql" != "1"; then - AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) + AC_CHECK_HEADERS([mysql/mysql.h mysql/my_global.h mysql/my_sys.h], + AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1]), + [apu_have_mysql=0; break], + [#include ]) fi if test "$apu_have_mysql" != "0"; then APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS]) Modified: apr/apr-util/trunk/dbd/apr_dbd_mysql.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd_mysql.c?rev=747623&r1=747622&r2=747623&view=diff ============================================================================== --- apr/apr-util/trunk/dbd/apr_dbd_mysql.c (original) +++ apr/apr-util/trunk/dbd/apr_dbd_mysql.c Wed Feb 25 00:24:36 2009 @@ -25,6 +25,16 @@ #include #include +#ifdef HAVE_MY_GLOBAL_H +#include +#elif defined(HAVE_MYSQL_MY_GLOBAL_H) +#include +#endif +#ifdef HAVE_MY_SYS_H +#include +#elif defined(HAVE_MYSQL_MY_SYS_H) +#include +#endif #ifdef HAVE_MYSQL_H #include #include