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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37105 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/Makefile b/codecs/Makefile
index 23e9e673b7b780f8bf0982960965b276598ea0ba..f98637aa11577e0694f49fd3f5c43f5da44db005 100644 (file)
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -23,9 +23,9 @@ LIBLPC10:=lpc10/liblpc10.a
 
 all: _all
 
-ifeq ($(LIBGSM_LIB),internal)
-LIBGSM_INCLUDE:=-Igsm/inc
-LIBGSM_LIB:=
+ifeq ($(GSM_LIB),internal)
+GSM_INCLUDE:=-Igsm/inc
+GSM_LIB:=
 
 codec_gsm.so: gsm/lib/libgsm.a
 endif

diff --git a/configure b/configure
index bccfe9dc1a76787d1a9ee0b44d3f848fc90935a4..513b2790e59b73155090c9b657926c47ce988ef7 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 37066 .
+# From configure.ac Revision: 37086 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59e.
 #
@@ -15854,6 +15854,11 @@ fi
 GSM_INTERNAL="yes"
 GSM_SYSTEM="yes"
 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
       gsmlibdir=""
       if test "x${GSM_DIR}" != "x"; then

diff --git a/configure.ac b/configure.ac
index acdc551879443b5731b20fc371a64132fa01c331..4a6b924f42b70eeb68a38c02b4ece773ae000367 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -300,6 +300,11 @@ AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
 GSM_INTERNAL="yes"
 GSM_SYSTEM="yes"
 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
       gsmlibdir=""
       if test "x${GSM_DIR}" != "x"; then