diff options
| author | bojan <bojan@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-24 23:32:45 +0000 |
|---|---|---|
| committer | bojan <bojan@13f79535-47bb-0310-9956-ffa450edef68> | 2009-02-24 23:32:45 +0000 |
| commit | 4823658b00eb2c021a92e27a3352cb4d34684507 (patch) | |
| tree | 619857eb7ee613ca154b7757fa3c1508c7592c49 | |
| parent | 932bed61bd2b90b431d50b57f20785fc862bfa89 (diff) | |
| download | libapr-util-4823658b00eb2c021a92e27a3352cb4d34684507.tar.gz | |
Correct FreeTDS header detection.
Don't look for the second header if we have one already.
git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@747612 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | build/dbd.m4 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/build/dbd.m4 b/build/dbd.m4 index 6696f61a..5f943dfb 100644 --- a/build/dbd.m4 +++ b/build/dbd.m4 @@ -409,7 +409,10 @@ 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 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 @@ AC_DEFUN([APU_CHECK_DBD_FREETDS], [ 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) |