[svn-commits] trunk r36255 - in /trunk: cdr/Makefile codecs/Makefile configure configure.ac

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jun 29 02:50:01 2006
New Revision: 36255

URL: http://svn.digium.com/view/asterisk?rev=36255&view=rev
Log:
move FreeTDS version check into configure script

Modified:
    trunk/cdr/Makefile
    trunk/codecs/Makefile
    trunk/configure
    trunk/configure.ac

Modified: trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/cdr/Makefile?rev=36255&r1=36254&r2=36255&view=diff
==============================================================================
--- trunk/cdr/Makefile (original)
+++ trunk/cdr/Makefile Thu Jun 29 02:50:01 2006
@@ -16,18 +16,6 @@
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%,$(wildcard cdr_*.c)))
 
-ifneq ($(FREETDS_LIB),)
-  ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.63),1)
-    CFLAGS += -DFREETDS_0_63
-  else
-	ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/include/freetds/tdsver.h | grep -c 0.62),1)
-      CFLAGS += -DFREETDS_0_62
-    else
-      CFLAGS += -DFREETDS_PRE_0_62
-    endif
-  endif
-endif
-
 all: _all
 
 include ../Makefile.rules

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?rev=36255&r1=36254&r2=36255&view=diff
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Thu Jun 29 02:50:01 2006
@@ -18,12 +18,7 @@
 
 SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
 
-ifeq ($(wildcard ilbc/iLBC_decode.h),)
-  MODS:=$(filter-out codec_ilbc,$(MODS))
-else
-  LIBILBC:=ilbc/libilbc.a
-endif
-
+LIBILBC:=ilbc/libilbc.a
 LIBLPC10:=lpc10/liblpc10.a
 
 all: _all

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=36255&r1=36254&r2=36255&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Thu Jun 29 02:50:01 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 35832 .
+# From configure.ac Revision: 35852 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59e.
 #
@@ -15885,6 +15885,22 @@
 
 
 
+if test "${PBX_LIBFREETDS}" != "0";
+then
+    case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr/include}/tdsver.h` in
+    *0.63*)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63"
+	;;
+    *0.62*)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62"
+	;;
+    *)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62"
+	;;
+    esac
+fi
+
+
 
 # Check whether --with-termcap was given.
 if test "${with_termcap+set}" = set; then

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=36255&r1=36254&r2=36255&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jun 29 02:50:01 2006
@@ -635,6 +635,22 @@
 AST_EXT_LIB([sqlite], [sqlite_exec], [sqlite.h], [SQLITE], [SQLite])
 AST_EXT_LIB([ssl], [ssl2_connect], [openssl/ssl.h], [OPENSSL], [OpenSSL], [-lcrypto])
 AST_EXT_LIB([tds], [tds_version], [tds.h], [FREETDS], [FreeTDS])
+
+if test "${PBX_LIBFREETDS}" != "0";
+then
+    case `grep TDS_VERSION_NO ${FREETDS_DIR:-/usr/include}/tdsver.h` in
+    *0.63*)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_63"
+	;;
+    *0.62*)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_0_62"
+	;;
+    *)
+        FREETDS_INCLUDE="${FREETDS_INCLUDE} -DFREETDS_PRE_0_62"
+	;;
+    esac
+fi
+
 AST_EXT_LIB([termcap], [tgetent], [], [TERMCAP], [Termcap])
 AST_EXT_LIB([tinfo], [tgetent], [], [TINFO], [Term Info])