From 5a4f754c849cbcf92fb33b565c47c8beb1842486 Mon Sep 17 00:00:00 2001
From: minfrin <minfrin@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 4 Jan 2009 11:58:13 +0000
Subject: apr_dbd_freetds: The sybdb.h header file might be freetds/sybdb.h or
 sybdb.h.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@731225 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES               | 3 +++
 build/dbd.m4          | 6 +++---
 dbd/apr_dbd_freetds.c | 6 ++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 40cec5ae..c0a078e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
 
diff --git a/build/dbd.m4 b/build/dbd.m4
index a63e9ef2..13d73d87 100644
--- a/build/dbd.m4
+++ b/build/dbd.m4
@@ -397,7 +397,7 @@ AC_DEFUN([APU_CHECK_DBD_FREETDS], [
     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 @@ AC_DEFUN([APU_CHECK_DBD_FREETDS], [
       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)
diff --git a/dbd/apr_dbd_freetds.c b/dbd/apr_dbd_freetds.c
index 4455512c..61e2bb6b 100644
--- a/dbd/apr_dbd_freetds.c
+++ b/dbd/apr_dbd_freetds.c
@@ -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>
-- 
cgit v1.2.1