]>
Commit | Line | Data |
---|---|---|
1b6f7009 ER |
1 | --- asterisk-1.6.1.12/codecs/codec_lpc10.c 2009-12-31 13:37:17.453275676 +0200 |
2 | +++ asterisk-1.6.1.12/codecs/codec_lpc10.c 2009-12-31 13:18:26.630953709 +0200 | |
3 | @@ -26,6 +26,9 @@ | |
4 | * | |
5 | * \ingroup codecs | |
6 | */ | |
7 | +/*** MODULEINFO | |
8 | + <depend>lpc10</depend> | |
9 | + ***/ | |
10 | ||
11 | #include "asterisk.h" | |
12 | ||
13 | @@ -33,7 +36,7 @@ | |
14 | #include "asterisk/module.h" | |
15 | #include "asterisk/utils.h" | |
16 | ||
17 | -#include "lpc10/lpc10.h" | |
18 | +#include <lpc10.h> | |
19 | ||
20 | /* Sample frame data */ | |
21 | #include "slin_lpc10_ex.h" | |
22 | --- asterisk-1.6.1.12/build_tools/menuselect-deps.in~ 2009-12-31 13:39:17.000000000 +0200 | |
23 | +++ asterisk-1.6.1.12/build_tools/menuselect-deps.in 2009-12-31 14:19:55.440132344 +0200 | |
24 | @@ -5,6 +5,7 @@ | |
25 | FREETDS=@PBX_FREETDS@ | |
26 | GMIME=@PBX_GMIME@ | |
27 | GNU_LD=@GNU_LD@ | |
28 | +LPC10=@PBX_LPC10@ | |
29 | GSM=@PBX_GSM@ | |
30 | GTK2=@PBX_GTK2@ | |
31 | GTK=@PBX_GTK@ | |
32 | --- asterisk-1.6.1.12/codecs/Makefile~ 2009-07-21 16:48:38.000000000 +0300 | |
33 | +++ asterisk-1.6.1.12/codecs/Makefile 2009-12-31 13:11:04.977664417 +0200 | |
34 | @@ -42,7 +42,9 @@ | |
35 | $(LIBLPC10): | |
36 | @$(MAKE) -C lpc10 all | |
37 | ||
38 | +ifneq ($(LPC10_INTERNAL),no) | |
39 | $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10) | |
40 | +endif | |
41 | ||
42 | $(LIBILBC): | |
43 | @$(MAKE) -C ilbc all _ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations -Wshadow,$(_ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)" | |
4d1fedef CM |
44 | --- asterisk-1.8.0/makeopts.in.orig 2010-10-23 13:03:13.000000000 +0300 |
45 | +++ asterisk-1.8.0/makeopts.in 2010-10-23 13:10:09.850817002 +0300 | |
46 | @@ -131,6 +131,10 @@ | |
1b6f7009 ER |
47 | GSM_INCLUDE=@GSM_INCLUDE@ |
48 | GSM_LIB=@GSM_LIB@ | |
49 | ||
50 | +LPC10_INTERNAL=@LPC10_INTERNAL@ | |
51 | +LPC10_INCLUDE=@LPC10_INCLUDE@ | |
52 | +LPC10_LIB=@LPC10_LIB@ | |
53 | + | |
4d1fedef CM |
54 | GTK2_INCLUDE=@GTK2_INCLUDE@ |
55 | GTK2_LIB=@GTK2_LIB@ | |
1b6f7009 | 56 | |
4d1fedef CM |
57 | --- asterisk-1.8.0/configure.ac.orig 2010-10-23 13:03:13.547483666 +0300 |
58 | +++ asterisk-1.8.0/configure.ac 2010-10-23 13:07:06.384150337 +0300 | |
59 | @@ -373,6 +373,7 @@ | |
17686c6e | 60 | AST_EXT_LIB_SETUP([BKTR], [Stack Backtrace], [execinfo]) |
61 | AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise]) | |
17686c6e | 62 | AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2]) |
4d1fedef CM |
63 | +AST_EXT_LIB_SETUP([LPC10], [External lpc10 library], [lpc10], [, use 'internal' lpc10 otherwise]) |
64 | AST_EXT_LIB_SETUP([GMIME], [GMime], [gmime]) | |
65 | AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323]) | |
66 | AST_EXT_LIB_SETUP([HOARD], [Hoard Memory Allocator], [hoard]) | |
67 | @@ -1095,6 +1096,72 @@ | |
1b6f7009 ER |
68 | fi |
69 | fi | |
70 | ||
71 | +LPC10_INTERNAL="yes" | |
72 | +AC_SUBST(LPC10_INTERNAL) | |
73 | +LPC10_SYSTEM="yes" | |
74 | +if test "${USE_LPC10}" != "no"; then | |
25745de5 ER |
75 | + case "$host_cpu" in |
76 | + x86_64|s390x) | |
77 | + _lib=lib64 | |
78 | + ;; | |
79 | + *) | |
80 | + _lib=lib | |
81 | + ;; | |
82 | + esac | |
83 | + | |
1b6f7009 ER |
84 | + if test "${LPC10_DIR}" = "internal"; then |
85 | + LPC10_SYSTEM="no" | |
86 | + elif test "${LPC10_DIR}" != ""; then | |
87 | + LPC10_INTERNAL="no" | |
88 | + fi | |
89 | + if test "${LPC10_SYSTEM}" = "yes"; then | |
90 | + lpc10libdir="" | |
91 | + if test "x${LPC10_DIR}" != "x"; then | |
25745de5 ER |
92 | + if test -d ${LPC10_DIR}/${_lib}; then |
93 | + lpc10libdir="-L${LPC10_DIR}/${_lib}" | |
1b6f7009 ER |
94 | + else |
95 | + lpc10libdir="-L${LPC10_DIR}" | |
96 | + fi | |
97 | + fi | |
98 | + AC_CHECK_LIB([lpc10], [lpc10_encode], AC_DEFINE_UNQUOTED([HAVE_LPC10], 1, | |
99 | + [Define to indicate the GSM library]), [], ${gsmlibdir}) | |
100 | + if test "${ac_cv_lib_lpc10_lpc10_encode}" = "yes"; then | |
101 | + if test "x${LPC10_DIR}" != "x" ; then | |
102 | + AC_CHECK_HEADER([${LPC10_DIR}/include/lpc10.h], [LPC10_HEADER_FOUND=1], [LPC10_HEADER_FOUND=0]) | |
103 | + else | |
104 | + AC_CHECK_HEADER([lpc10.h], [LPC10_HEADER_FOUND=1], [LPC10_HEADER_FOUND=0]) | |
105 | + fi | |
106 | + if test "${LPC10_HEADER_FOUND}" = "0" ; then | |
107 | + if test "x${LPC10_MANDATORY}" = "xyes" ; then | |
108 | + AC_MSG_NOTICE([***]) | |
109 | + AC_MSG_NOTICE([*** It appears that you do not have the lpc10 development package installed.]) | |
110 | + AC_MSG_NOTICE([*** Please install it to include ${LPC10_DESCRIP} support, or re-run configure]) | |
111 | + AC_MSG_NOTICE([*** without explicitly specifying --with-${LPC10_OPTION}]) | |
112 | + exit 1 | |
113 | + fi | |
114 | + fi | |
115 | + LPC10_OK=0 | |
116 | + if test "${LPC10_HEADER_FOUND}" = "1" ; then | |
117 | + AC_DEFINE_UNQUOTED([HAVE_LPC10_HEADER], 1, [Define to indicate that lpc10.h has no prefix for its location]) | |
118 | + LPC10_OK=1 | |
119 | + fi | |
120 | + if test "${LPC10_OK}" = "1" ; then | |
121 | + LPC10_LIB="-llpc10" | |
122 | + if test "x${LPC10_DIR}" != "x"; then | |
123 | + LPC10_LIB="${lpc10libdir} ${LPC10_LIB}" | |
124 | + LPC10_INCLUDE="-I${LPC10_DIR}/include" | |
125 | + fi | |
126 | + PBX_LPC10=1 | |
127 | + LPC10_INTERNAL="no" | |
128 | + fi | |
129 | + fi | |
130 | + fi | |
131 | + if test "${LPC10_INTERNAL}" = "yes"; then | |
132 | + PBX_LPC10=1 | |
133 | + AC_DEFINE_UNQUOTED([HAVE_LPC10_HEADER], 1, [Define to indicate that lpc10.h has no prefix for its location]) | |
134 | + fi | |
135 | +fi | |
136 | + | |
137 | AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h]) | |
138 | # Some versions of Linux package iconv in glibc | |
139 | AST_EXT_LIB_CHECK([ICONV], [c], [iconv_close], [iconv.h]) |