apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject svn commit: r747613 - in /apr/apr-util/branches/1.4.x: ./ build/dbd.m4
Date Tue, 24 Feb 2009 23:35:00 GMT
Author: bojan
Date: Tue Feb 24 23:35:00 2009
New Revision: 747613

URL: http://svn.apache.org/viewvc?rev=747613&view=rev
Log:
Backport r747612 from the trunk.
Correct FreeTDS header detection.
AC_CHECK_HEADERS will execute ACTION-IF-NOT-FOUND when one of the header
files is not found.

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

Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 24 23:35:00 2009
@@ -1 +1 @@
-/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771
+/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612

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=747613&r1=747612&r2=747613&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/build/dbd.m4 (original)
+++ apr/apr-util/branches/1.4.x/build/dbd.m4 Tue Feb 24 23:35:00 2009
@@ -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)



Mime
View raw message