apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r731226 - in /apr/apr-util/branches/1.4.x: ./ CHANGES build/dbd.m4 dbd/apr_dbd_freetds.c
Date Sun, 04 Jan 2009 12:00:49 GMT
Author: minfrin
Date: Sun Jan  4 04:00:49 2009
New Revision: 731226

URL: http://svn.apache.org/viewvc?rev=731226&view=rev
Log:
Backport r731225 to the apr-util v1.4 branch.

Modified:
    apr/apr-util/branches/1.4.x/   (props changed)
    apr/apr-util/branches/1.4.x/CHANGES
    apr/apr-util/branches/1.4.x/build/dbd.m4
    apr/apr-util/branches/1.4.x/dbd/apr_dbd_freetds.c

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan  4 04:00:49 2009
@@ -1 +1 @@
-/apr/apr-util/trunk:731033-731034
+/apr/apr-util/trunk:731033-731034,731225

Modified: apr/apr-util/branches/1.4.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/CHANGES?rev=731226&r1=731225&r2=731226&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.4.x/CHANGES [utf-8] Sun Jan  4 04:00:49 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/branches/1.4.x/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/build/dbd.m4?rev=731226&r1=731225&r2=731226&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/dbd.m4 (original)
+++ apr/apr-util/branches/1.4.x/build/dbd.m4 Sun Jan  4 04:00:49 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/branches/1.4.x/dbd/apr_dbd_freetds.c
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/dbd/apr_dbd_freetds.c?rev=731226&r1=731225&r2=731226&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/dbd/apr_dbd_freetds.c (original)
+++ apr/apr-util/branches/1.4.x/dbd/apr_dbd_freetds.c Sun Jan  4 04:00:49 2009
@@ -36,7 +36,13 @@
 #include "apr_pools.h"
 #include "apr_dbd_internal.h"
 
+#ifdef HAVE_FREETDS_SYBDB_H
+#include <freetds/sybdb.h>
+#endif
+#ifdef HAVE_SYBDB_H
 #include <sybdb.h>
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <regex.h>



Mime
View raw message