diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-29 07:50:01 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-29 07:50:01 +0000 |
| commit | 50c6c0be43f142305bb99a1d1ef73c033485d0fb (patch) | |
| tree | 40fcc57aa7708a6c89a8ef05b3a886eeabf00e56 | |
| parent | ead171c77dfdbdcd9d556f11d9e047a897236987 (diff) | |
move FreeTDS version check into configure script
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@36255 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | cdr/Makefile | 12 | ||||
| -rw-r--r-- | codecs/Makefile | 7 | ||||
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | configure.ac | 16 |
4 files changed, 34 insertions, 19 deletions
diff --git a/cdr/Makefile b/cdr/Makefile index 1e7791269..e713d94bf 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -16,18 +16,6 @@ endif 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 diff --git a/codecs/Makefile b/codecs/Makefile index 61c551078..23e9e673b 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -18,12 +18,7 @@ endif 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 @@ -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 @@ fi +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 diff --git a/configure.ac b/configure.ac index 9839a8575..7da4da62e 100644 --- a/configure.ac +++ b/configure.ac @@ -635,6 +635,22 @@ AST_EXT_LIB([speex], [speex_encode], [speex/speex.h], [SPEEX], [Speex], [-lm]) 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]) |