From be2f5169a0461fe9b4e221bad0c785c683c5e1c2 Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Wed, 5 Jul 2006 21:28:30 +0000
Subject: allow codec_gsm to be built using internal GSM library again (oops!)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@37105 f38db490-d61c-443f-a65b-d21fe96a405b
---
 codecs/Makefile | 6 +++---
 configure       | 7 ++++++-
 configure.ac    | 5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/codecs/Makefile b/codecs/Makefile
index 23e9e673b..f98637aa1 100644
--- 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 bccfe9dc1..513b2790e 100755
--- 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 acdc55187..4a6b924f4 100644
--- 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
-- 
cgit v1.2.3