From bb0b421ea8c2b40c0ab6be495e9de46f1852b6cf Mon Sep 17 00:00:00 2001
From: kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Mon, 5 Jun 2006 20:46:27 +0000
Subject: use module names, not file names, in menuselect work around XML
 parsing bug in menuselect for default sounds package

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32407 f38db490-d61c-443f-a65b-d21fe96a405b
---
 codecs/Makefile       | 17 ++++-------------
 codecs/codec_g723_1.c |  4 ++++
 2 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'codecs')

diff --git a/codecs/Makefile b/codecs/Makefile
index 6be3e9bbb..544f5b116 100644
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -11,27 +11,18 @@
 # the GNU General Public License
 #
 
-MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%.so,$(wildcard codec_*.c)))
-
-ifeq ($(wildcard g723.1/coder.c),)
-  MODS:=$(filter-out codec_g723_1.so,$(MODS))
-else
-  LIBG723=g723.1/libg723.a
-endif
-
-ifneq ($(wildcard g723.1b/coder2.c),)
-  MODS+=codec_g723_1b.so
-  LIBG723B=g723.1b/libg723b.a
-endif
+SELECTED_MODS:=$(filter-out $(MENUSELECT_CODECS),$(patsubst %.c,%,$(wildcard codec_*.c)))
 
 ifeq ($(wildcard ilbc/iLBC_decode.h),)
-  MODS:=$(filter-out codec_ilbc.so,$(MODS))
+  MODS:=$(filter-out codec_ilbc,$(MODS))
 else
   LIBILBC=ilbc/libilbc.a
 endif
 
 LIBLPC10=lpc10/liblpc10.a
 
+MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
+
 all: depend $(MODS)
 
 clean-depend:
diff --git a/codecs/codec_g723_1.c b/codecs/codec_g723_1.c
index 00a5ca635..87ccba82e 100644
--- a/codecs/codec_g723_1.c
+++ b/codecs/codec_g723_1.c
@@ -27,6 +27,10 @@
  * \ingroup codecs
  */
 
+/*** MODULEINFO
+	<defaultenabled>no</defaultenabled>
+ ***/
+
 #define TYPE_HIGH	 0x0
 #define TYPE_LOW	 0x1
 #define TYPE_SILENCE	 0x2
-- 
cgit v1.2.3