Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 61979 invoked from network); 20 Sep 2007 09:39:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 Sep 2007 09:39:51 -0000 Received: (qmail 16564 invoked by uid 500); 20 Sep 2007 09:39:42 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 16526 invoked by uid 500); 20 Sep 2007 09:39:42 -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 16515 invoked by uid 99); 20 Sep 2007 09:39:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 Sep 2007 02:39:42 -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, 20 Sep 2007 09:41:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1D26F1A9832; Thu, 20 Sep 2007 02:39:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r577654 - /apr/apr-util/trunk/build/dbd.m4 Date: Thu, 20 Sep 2007 09:39:27 -0000 To: commits@apr.apache.org From: jfclere@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070920093928.1D26F1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jfclere Date: Thu Sep 20 02:39:27 2007 New Revision: 577654 URL: http://svn.apache.org/viewvc?rev=577654&view=rev Log: Use the mysql libtool library when available. (Otherwise it breaks on one of the HP-UX where I am testing). Modified: apr/apr-util/trunk/build/dbd.m4 Modified: apr/apr-util/trunk/build/dbd.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbd.m4?rev=577654&r1=577653&r2=577654&view=diff ============================================================================== --- apr/apr-util/trunk/build/dbd.m4 (original) +++ apr/apr-util/trunk/build/dbd.m4 Thu Sep 20 02:39:27 2007 @@ -134,6 +134,12 @@ APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql]) fi fi + if test -f "$withval/lib/mysql/libmysqlclient_r.la"; then + mysql_LDFLAGS=$withval/lib/mysql/libmysqlclient_r.la + fi + if test -f "$withval/lib/libmysqlclient_r.la"; then + mysql_LDFLAGS=$withval/lib/libmysqlclient_r.la + fi CPPFLAGS="$old_cppflags" LDFLAGS="$old_ldflags" @@ -158,6 +164,12 @@ if test "$apu_have_mysql" != "0"; then if test "x$MYSQL_CONFIG" != 'x'; then APR_ADDTO(APRUTIL_INCLUDES, [$mysql_CPPFLAGS]) + if test -f "$withval/lib/mysql/libmysqlclient_r.la"; then + mysql_LDFLAGS=$withval/lib/mysql/libmysqlclient_r.la + fi + if test -f "$withval/lib/libmysqlclient_r.la"; then + mysql_LDFLAGS=$withval/lib/libmysqlclient_r.la + fi fi fi