[svn-commits] branch group/new_loader_completion r37920 - in /team/group/new_loader_complet...

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Tue Jul 18 17:21:22 2006
New Revision: 37920

URL: http://svn.digium.com/view/asterisk?rev=37920&view=rev
Log:
get 'gsm=internal' handling working properly with embedded modules

Modified:
    team/group/new_loader_completion/codecs/Makefile
    team/group/new_loader_completion/configure
    team/group/new_loader_completion/configure.ac
    team/group/new_loader_completion/makeopts.in

Modified: team/group/new_loader_completion/codecs/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/codecs/Makefile?rev=37920&r1=37919&r2=37920&view=diff
==============================================================================
--- team/group/new_loader_completion/codecs/Makefile (original)
+++ team/group/new_loader_completion/codecs/Makefile Tue Jul 18 17:21:22 2006
@@ -33,9 +33,8 @@
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
 
-ifeq ($(GSM_LIB),internal)
+ifneq ($(GSM_INTERNAL),)
 GSM_INCLUDE:=-Igsm/inc
-GSM_LIB:=
 $(codec_gsm): gsm/lib/libgsm.a
 endif
 

Modified: team/group/new_loader_completion/configure
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/configure?rev=37920&r1=37919&r2=37920&view=diff
==============================================================================
--- team/group/new_loader_completion/configure (original)
+++ team/group/new_loader_completion/configure Tue Jul 18 17:21:22 2006
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 37681 .
+# From configure.ac Revision: 37915 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60.
 #
@@ -793,6 +793,7 @@
 EGREP
 LIBOBJS
 POW_LIB
+GSM_INTERNAL
 KDEINIT
 KDEDIR
 NETSNMP_CONFIG
@@ -15921,6 +15922,7 @@
 
 
 GSM_INTERNAL="yes"
+
 GSM_SYSTEM="yes"
 if test "${USE_GSM}" != "no"; then
    if test "${GSM_DIR}" = "internal"; then
@@ -16033,7 +16035,6 @@
       fi
    fi
    if test "${GSM_INTERNAL}" = "yes"; then
-      GSM_LIB="internal"
       PBX_GSM=1
    fi
 fi
@@ -29299,9 +29300,9 @@
 EGREP!$EGREP$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 POW_LIB!$POW_LIB$ac_delim
+GSM_INTERNAL!$GSM_INTERNAL$ac_delim
 KDEINIT!$KDEINIT$ac_delim
 KDEDIR!$KDEDIR$ac_delim
-NETSNMP_CONFIG!$NETSNMP_CONFIG$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -29343,6 +29344,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+NETSNMP_CONFIG!$NETSNMP_CONFIG$ac_delim
 PG_CONFIG!$PG_CONFIG$ac_delim
 QTMOC!$QTMOC$ac_delim
 EDITLINE_LIB!$EDITLINE_LIB$ac_delim
@@ -29358,7 +29360,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: team/group/new_loader_completion/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/configure.ac?rev=37920&r1=37919&r2=37920&view=diff
==============================================================================
--- team/group/new_loader_completion/configure.ac (original)
+++ team/group/new_loader_completion/configure.ac Tue Jul 18 17:21:22 2006
@@ -300,6 +300,7 @@
 AST_EXT_LIB_CHECK([CURSES], [curses], [initscr], [curses.h])
 
 GSM_INTERNAL="yes"
+AC_SUBST(GSM_INTERNAL)
 GSM_SYSTEM="yes"
 if test "${USE_GSM}" != "no"; then
    if test "${GSM_DIR}" = "internal"; then
@@ -329,7 +330,6 @@
       fi
    fi
    if test "${GSM_INTERNAL}" = "yes"; then
-      GSM_LIB="internal"
       PBX_GSM=1
    fi
 fi

Modified: team/group/new_loader_completion/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/makeopts.in?rev=37920&r1=37919&r2=37920&view=diff
==============================================================================
--- team/group/new_loader_completion/makeopts.in (original)
+++ team/group/new_loader_completion/makeopts.in Tue Jul 18 17:21:22 2006
@@ -55,6 +55,7 @@
 FREETDS_INCLUDE=@FREETDS_INCLUDE@
 FREETDS_LIB=@FREETDS_LIB@
 
+GSM_INTERNAL=@GSM_INTERNAL@
 GSM_INCLUDE=@GSM_INCLUDE@
 GSM_LIB=@GSM_LIB@