You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by bo...@apache.org on 2008/05/21 01:55:10 UTC
svn commit: r658493 - /apr/apr-util/trunk/build/dbd.m4
Author: bojan
Date: Tue May 20 16:55:10 2008
New Revision: 658493
URL: http://svn.apache.org/viewvc?rev=658493&view=rev
Log:
Do pgsql_LDFLAGS in two steps, Windows doesn't like it in one.
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=658493&r1=658492&r2=658493&view=diff
==============================================================================
--- apr/apr-util/trunk/build/dbd.m4 (original)
+++ apr/apr-util/trunk/build/dbd.m4 Tue May 20 16:55:10 2008
@@ -34,7 +34,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])
@@ -53,7 +54,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 "
@@ -75,7 +77,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])