kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-14 00:24:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow codec_gsm to be built using internal GSM library again (oops!)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37105 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2006-07-05 21:28:30 +00:00
parent 5c30f76ba3
commit 72c9c5def1
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
codecs/Makefile
View File

@@ -23,9 +23,9 @@ LIBLPC10:=lpc10/liblpc10.a
all: _all all: _all
ifeq ($(LIBGSM_LIB),internal) ifeq ($(GSM_LIB),internal)
LIBGSM_INCLUDE:=-Igsm/inc GSM_INCLUDE:=-Igsm/inc
LIBGSM_LIB:= GSM_LIB:=
codec_gsm.so: gsm/lib/libgsm.a codec_gsm.so: gsm/lib/libgsm.a
endif endif

7
configure vendored
View File

@@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.ac Revision: 37066 . # From configure.ac Revision: 37086 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59e. # Generated by GNU Autoconf 2.59e.
# #
@@ -15854,6 +15854,11 @@ fi
GSM_INTERNAL="yes" GSM_INTERNAL="yes"
GSM_SYSTEM="yes" GSM_SYSTEM="yes"
if test "${USE_GSM}" != "no"; then if test "${USE_GSM}" != "no"; then
if test "${GSM_DIR}" = "internal"; then
GSM_SYSTEM="no"
elif test "${GSM_DIR}" != ""; then
GSM_INTERNAL="no"
fi
if test "${GSM_SYSTEM}" = "yes"; then if test "${GSM_SYSTEM}" = "yes"; then
gsmlibdir="" gsmlibdir=""
if test "x${GSM_DIR}" != "x"; then if test "x${GSM_DIR}" != "x"; then

5
configure.ac
View File

@@ -300,6 +300,11 @@ AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
GSM_INTERNAL="yes" GSM_INTERNAL="yes"
GSM_SYSTEM="yes" GSM_SYSTEM="yes"
if test "${USE_GSM}" != "no"; then if test "${USE_GSM}" != "no"; then
if test "${GSM_DIR}" = "internal"; then
GSM_SYSTEM="no"
elif test "${GSM_DIR}" != ""; then
GSM_INTERNAL="no"
fi
if test "${GSM_SYSTEM}" = "yes"; then if test "${GSM_SYSTEM}" = "yes"; then
gsmlibdir="" gsmlibdir=""
if test "x${GSM_DIR}" != "x"; then if test "x${GSM_DIR}" != "x"; then