Merged revisions 52462 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r52462 | tilghman | 2007-01-27 23:15:07 -0600 (Sat, 27 Jan 2007) | 2 lines

Suggested change to fix normal usage of --with-tds=/usr/local (Sean Bright, via asterisk-dev mailing list)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@52463 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configure b/configure
index 70c3474..4643397 100755 (executable)
--- a/configure
+++ b/configure
@@ -28676,7 +28676,7 @@ fi
 
 if test "${PBX_FREETDS}" != "0";
 then
-    case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr/include}/tdsver.h` in
+    case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in
        *0.64*)
                FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
        ;;

diff --git a/configure.ac b/configure.ac
index 2b5cee0..f892735 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -784,7 +784,7 @@ AST_EXT_LIB_CHECK([OPENSSL], [ssl], [ssl2_connect], [openssl/ssl.h], [-lcrypto])
 AST_EXT_LIB_CHECK([FREETDS], [tds], [tds_version], [tds.h])
 if test "${PBX_FREETDS}" != "0";
 then
-    case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr/include}/tdsver.h` in
+    case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in
        *0.64*)
                FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
        ;;