From commits-return-10064-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Sun Jan 04 11:58:35 2009 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 9932 invoked from network); 4 Jan 2009 11:58:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jan 2009 11:58:35 -0000 Received: (qmail 69910 invoked by uid 500); 4 Jan 2009 11:58:35 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 69866 invoked by uid 500); 4 Jan 2009 11:58:34 -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 69848 invoked by uid 99); 4 Jan 2009 11:58:34 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Jan 2009 03:58:34 -0800 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; Sun, 04 Jan 2009 11:58:33 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C42A42388B49; Sun, 4 Jan 2009 03:58:13 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r731225 - in /apr/apr-util/trunk: CHANGES build/dbd.m4 dbd/apr_dbd_freetds.c Date: Sun, 04 Jan 2009 11:58:13 -0000 To: commits@apr.apache.org From: minfrin@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090104115813.C42A42388B49@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: minfrin Date: Sun Jan 4 03:58:13 2009 New Revision: 731225 URL: http://svn.apache.org/viewvc?rev=731225&view=rev Log: apr_dbd_freetds: The sybdb.h header file might be freetds/sybdb.h or sybdb.h. Modified: apr/apr-util/trunk/CHANGES apr/apr-util/trunk/build/dbd.m4 apr/apr-util/trunk/dbd/apr_dbd_freetds.c Modified: apr/apr-util/trunk/CHANGES URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/CHANGES?rev=731225&r1=731224&r2=731225&view=diff ============================================================================== --- apr/apr-util/trunk/CHANGES [utf-8] (original) +++ apr/apr-util/trunk/CHANGES [utf-8] Sun Jan 4 03:58:13 2009 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with APR-util 1.4.0 + *) apr_dbd_freetds: The sybdb.h header file might be freetds/sybdb.h + or sybdb.h. [Graham Leggett] + *) Fix a bogus initialisation of the IV size in the NSS crypto driver. [Graham Leggett] Modified: apr/apr-util/trunk/build/dbd.m4 URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/build/dbd.m4?rev=731225&r1=731224&r2=731225&view=diff ============================================================================== --- apr/apr-util/trunk/build/dbd.m4 (original) +++ apr/apr-util/trunk/build/dbd.m4 Sun Jan 4 03:58:13 2009 @@ -397,7 +397,7 @@ APR_HELP_STRING([--with-freetds=DIR], [specify FreeTDS location]), [ if test "$withval" = "yes"; then - AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1])) + AC_CHECK_HEADERS(sybdb.h freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1])) elif test "$withval" = "no"; then : else @@ -408,13 +408,13 @@ APR_ADDTO(LDFLAGS, [$sybdb_LDFLAGS]) AC_MSG_NOTICE(checking for freetds in $withval) - AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1])) + AC_CHECK_HEADERS(sybdb.h freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1])) if test "$apu_have_freetds" != "0"; then APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/include]) fi fi ], [ - AC_CHECK_HEADERS(sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1])) + AC_CHECK_HEADERS(sybdb.h freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1])) ]) AC_SUBST(apu_have_freetds) Modified: apr/apr-util/trunk/dbd/apr_dbd_freetds.c URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/dbd/apr_dbd_freetds.c?rev=731225&r1=731224&r2=731225&view=diff ============================================================================== --- apr/apr-util/trunk/dbd/apr_dbd_freetds.c (original) +++ apr/apr-util/trunk/dbd/apr_dbd_freetds.c Sun Jan 4 03:58:13 2009 @@ -36,7 +36,13 @@ #include "apr_pools.h" #include "apr_dbd_internal.h" +#ifdef HAVE_FREETDS_SYBDB_H +#include +#endif +#ifdef HAVE_SYBDB_H #include +#endif + #include #include #include