Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 29366 invoked from network); 20 May 2008 23:56:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 20 May 2008 23:56:31 -0000 Received: (qmail 73158 invoked by uid 500); 20 May 2008 23:56:32 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 73144 invoked by uid 500); 20 May 2008 23:56:32 -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 73135 invoked by uid 99); 20 May 2008 23:56:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 May 2008 16:56:32 -0700 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; Tue, 20 May 2008 23:55:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9651923889BA; Tue, 20 May 2008 16:56:10 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r658495 - /apr/apr-util/branches/1.2.x/build/dbd.m4 Date: Tue, 20 May 2008 23:56:10 -0000 To: commits@apr.apache.org From: bojan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080520235610.9651923889BA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bojan Date: Tue May 20 16:56:10 2008 New Revision: 658495 URL: http://svn.apache.org/viewvc?rev=658495&view=rev Log: Backport r658493 from the trunk. Do pgsql_LDFLAGS in two steps, Windows doesn't like it in one. Modified: apr/apr-util/branches/1.2.x/build/dbd.m4 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=658495&r1=658494&r2=658495&view=diff ============================================================================== --- apr/apr-util/branches/1.2.x/build/dbd.m4 (original) +++ apr/apr-util/branches/1.2.x/build/dbd.m4 Tue May 20 16:56:10 2008 @@ -35,7 +35,8 @@ AC_PATH_PROG([PGSQL_CONFIG],[pg_config]) if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" - pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir` `$PGSQL_CONFIG --libs`" + pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" + pgsql_LDFLAGS="$pgsql_LDFLAGS `$PGSQL_CONFIG --libs`" APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) @@ -54,7 +55,8 @@ AC_PATH_PROG([PGSQL_CONFIG],[pg_config],,[$withval/bin]) if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" - pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir` `$PGSQL_CONFIG --libs`" + pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" + pgsql_LDFLAGS="$pgsql_LDFLAGS `$PGSQL_CONFIG --libs`" else pgsql_CPPFLAGS="-I$withval/include" pgsql_LDFLAGS="-L$withval/lib " @@ -76,7 +78,8 @@ AC_PATH_PROG([PGSQL_CONFIG],[pg_config]) if test "x$PGSQL_CONFIG" != 'x'; then pgsql_CPPFLAGS="-I`$PGSQL_CONFIG --includedir`" - pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir` `$PGSQL_CONFIG --libs`" + pgsql_LDFLAGS="-L`$PGSQL_CONFIG --libdir`" + pgsql_LDFLAGS="$pgsql_LDFLAGS `$PGSQL_CONFIG --libs`" APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS])