Return-Path: X-Original-To: apmail-apr-commits-archive@www.apache.org Delivered-To: apmail-apr-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 01E8C34F0 for ; Mon, 9 May 2011 00:40:08 +0000 (UTC) Received: (qmail 5740 invoked by uid 500); 9 May 2011 00:40:07 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 5695 invoked by uid 500); 9 May 2011 00:40:07 -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 5688 invoked by uid 99); 9 May 2011 00:40:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 May 2011 00:40:07 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 09 May 2011 00:40:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3091B2388901; Mon, 9 May 2011 00:39:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1100852 - /apr/apr-util/branches/1.4.x/build/dbd.m4 Date: Mon, 09 May 2011 00:39:47 -0000 To: commits@apr.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110509003947.3091B2388901@eris.apache.org> Author: covener Date: Mon May 9 00:39:46 2011 New Revision: 1100852 URL: http://svn.apache.org/viewvc?rev=1100852&view=rev Log: backport r1100848 from trunk: PR51071: check the --with-odbc arg to see if it's an executable file (odbc_config itself) before defaulting to using it as a prefix for libs/includes. Required for getting the right architecture odbc on AIX packaging, which share a prefix. Modified: apr/apr-util/branches/1.4.x/build/dbd.m4 Modified: apr/apr-util/branches/1.4.x/build/dbd.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/dbd.m4?rev=1100852&r1=1100851&r2=1100852&view=diff ============================================================================== --- apr/apr-util/branches/1.4.x/build/dbd.m4 (original) +++ apr/apr-util/branches/1.4.x/build/dbd.m4 Mon May 9 00:39:46 2011 @@ -505,8 +505,14 @@ AC_DEFUN([APU_CHECK_DBD_ODBC], [ odbc_LDFLAGS="-L`$ODBC_CONFIG --lib-prefix`" odbc_LIBS="`$ODBC_CONFIG --libs`" else - odbc_CPPFLAGS="-I$withval/include" - odbc_LDFLAGS="-L$withval/lib " + if test -f "$withval" && test -x "$withval"; then + odbc_CPPFLAGS="-I`$withval --include-prefix`" + odbc_LDFLAGS="-L`$withval --lib-prefix`" + odbc_LIBS="`$withval --libs`" + else + odbc_CPPFLAGS="-I$withval/include" + odbc_LDFLAGS="-L$withval/lib " + fi fi APR_ADDTO(CPPFLAGS, [$odbc_CPPFLAGS])