[asterisk-commits] seanbright: branch 1.6.0 r114697 - in /branches/1.6.0: ./ configure configure.ac

[SVN commits to the Asterisk project]

Author: seanbright
Date: Sat Apr 26 20:30:44 2008
New Revision: 114697

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114697
Log:
Merged revisions 114696 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114696 | seanbright | 2008-04-26 21:28:32 -0400 (Sat, 26 Apr 2008) | 13 lines

Merged revisions 114695 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114695 | seanbright | 2008-04-26 21:26:15 -0400 (Sat, 26 Apr 2008) | 5 lines

When we don't explicitly pass a path to the --with-tds configure option, we
may end up finding tds.h in /usr/local/include instead of /usr/include.  If
this happens, the grep that looks for the version (from tdsver.h) will fail
and we'll have some problems during the build.

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configure
    branches/1.6.0/configure.ac

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configure.ac
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/configure.ac?view=diff&rev=114697&r1=114696&r2=114697
==============================================================================
--- branches/1.6.0/configure.ac (original)
+++ branches/1.6.0/configure.ac Sat Apr 26 20:30:44 2008
@@ -1336,9 +1336,19 @@
 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
-	*0.64*)
-		FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
+    if test "${FREETDS_DIR}x" = "x";
+    then
+        for tds_dir in /usr /usr/local;
+        do
+            if test -f "${tds_dir}/include/tdsver.h";
+            then
+                FREETDS_DIR="${tds_dir}"
+            fi
+        done
+    fi
+    case `${GREP} TDS_VERSION_NO ${FREETDS_DIR:-/usr}/include/tdsver.h` in
+    *0.64*)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_64"
 	;;
     *0.63*)
         FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63"