Correct FreeTDS header detection.
AC_CHECK_HEADERS will execute ACTION-IF-NOT-FOUND when one of the header
files is not found.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@747612 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/build/dbd.m4 b/build/dbd.m4
index 6696f61..5f943df 100644
--- a/build/dbd.m4
+++ b/build/dbd.m4
@@ -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)
