[asterisk-commits] trunk r37105 - in /trunk: codecs/Makefile configure configure.ac

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Wed Jul  5 16:28:30 2006
New Revision: 37105

URL: http://svn.digium.com/view/asterisk?rev=37105&view=rev
Log:
allow codec_gsm to be built using internal GSM library again (oops!)

Modified:
    trunk/codecs/Makefile
    trunk/configure
    trunk/configure.ac

Modified: trunk/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/Makefile?rev=37105&r1=37104&r2=37105&view=diff
==============================================================================
--- trunk/codecs/Makefile (original)
+++ trunk/codecs/Makefile Wed Jul  5 16:28:30 2006
@@ -23,9 +23,9 @@
 
 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

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?rev=37105&r1=37104&r2=37105&view=diff
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Wed Jul  5 16:28:30 2006
@@ -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 @@
 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

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?rev=37105&r1=37104&r2=37105&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Wed Jul  5 16:28:30 2006
@@ -300,6 +300,11 @@
 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