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 2009/02/25 00:35:16 UTC
svn commit: r747614 - in /apr/apr-util/branches/1.3.x: ./ build/dbd.m4
dbd/apr_dbd_pgsql.c
Author: bojan
Date: Tue Feb 24 23:35:16 2009
New Revision: 747614
URL: http://svn.apache.org/viewvc?rev=747614&view=rev
Log:
Backport r747612 from the trunk.
Correct FreeTDS header detection.
AC_CHECK_HEADERS will execute ACTION-IF-NOT-FOUND when one of the header
files is not found.
Modified:
apr/apr-util/branches/1.3.x/ (props changed)
apr/apr-util/branches/1.3.x/build/dbd.m4
apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c (props changed)
Propchange: apr/apr-util/branches/1.3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 23:35:16 2009
@@ -1,2 +1,2 @@
/apr/apr-util/branches/1.3.x:692751
-/apr/apr-util/trunk:692751,731225,743986,744009,745771
+/apr/apr-util/trunk:692751,731225,743986,744009,745771,747612
Modified: apr/apr-util/branches/1.3.x/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/build/dbd.m4?rev=747614&r1=747613&r2=747614&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/build/dbd.m4 (original)
+++ apr/apr-util/branches/1.3.x/build/dbd.m4 Tue Feb 24 23:35:16 2009
@@ -409,7 +409,10 @@
APR_HELP_STRING([--with-freetds=DIR], [specify FreeTDS location]),
[
if test "$withval" = "yes"; then
- AC_CHECK_HEADERS(sybdb.h freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ if test "$apu_have_freetds" = "0"; then
+ AC_CHECK_HEADERS(freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ fi
elif test "$withval" = "no"; then
:
else
@@ -420,13 +423,19 @@
APR_ADDTO(LDFLAGS, [$sybdb_LDFLAGS])
AC_MSG_NOTICE(checking for freetds in $withval)
- AC_CHECK_HEADERS(sybdb.h freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ if test "$apu_have_freetds" = "0"; then
+ AC_CHECK_HEADERS(freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ fi
if test "$apu_have_freetds" != "0"; then
APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/include])
fi
fi
], [
- AC_CHECK_HEADERS(sybdb.h freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ if test "$apu_have_freetds" = "0"; then
+ AC_CHECK_HEADERS(freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
+ fi
])
AC_SUBST(apu_have_freetds)
Propchange: apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 23:35:16 2009
@@ -1,2 +1,2 @@
/apr/apr-util/branches/1.3.x/dbd/apr_dbd_pgsql.c:692751
-/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771
+/apr/apr-util/trunk/dbd/apr_dbd_pgsql.c:692751,704986,731225,743986,744009,745771,747612