Change the internal name of the menuselect options that are used to control
authorKevin P. Fleming <kpfleming@digium.com>
Fri, 14 Oct 2011 21:37:51 +0000 (21:37 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Fri, 14 Oct 2011 21:37:51 +0000 (21:37 +0000)
whether modules are embedded or not; using just the bare category name led to
accidentally enabling these options when users used the wrong "--enable"
operation on the menuselect command line.

Now the internal option names are prefixed with "EMBED_", so they won't be
the same as the name of the category containing the modules they control
the embedding of.
........

Merged revisions 341022 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 341023 from http://svn.asterisk.org/svn/asterisk/branches/10

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

Makefile.moddir_rules
build_tools/embed_modules.xml

index c0db889..e96342e 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Asterisk -- A telephony toolkit for Linux.
-# 
+#
 # Makefile rules for subdirectories containing modules
 #
 # Copyright (C) 2006, Digium, Inc.
@@ -46,7 +46,7 @@ endif
 C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
 CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
 
-ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
+ifneq ($(findstring EMBED_$(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
     EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
 else
     LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
index bf13ea9..a7e4cfd 100644 (file)
@@ -1,45 +1,45 @@
        <category name="MENUSELECT_EMBED" displayname="Module Embedding" positive_output="yes" remove_on_change="main/asterisk">
-               <member name="ADDONS" displayname="Add-ons" remove_on_change="addons/*.o addons/*.oo">
+               <member name="EMBED_ADDONS" displayname="Add-ons" remove_on_change="addons/*.o addons/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="APPS" displayname="Applications" remove_on_change="apps/*.o apps/*.oo">
+               <member name="EMBED_APPS" displayname="Applications" remove_on_change="apps/*.o apps/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="BRIDGES" displayname="Bridging Technologies" remove_on_change="bridges/*.o bridges/*.oo">
+               <member name="EMBED_BRIDGES" displayname="Bridging Technologies" remove_on_change="bridges/*.o bridges/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o cdr/*.oo">
+               <member name="EMBED_CDR" displayname="Call Detail Recording" remove_on_change="cdr/*.o cdr/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o channels/*.oo channels/*/*.oo">
+               <member name="EMBED_CHANNELS" displayname="Channels" remove_on_change="channels/*.o channels/*/*.o channels/*.oo channels/*/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a codecs/*.oo codecs/*/*.oo">
+               <member name="EMBED_CODECS" displayname="Coders/Decoders" remove_on_change="codecs/*.o codecs/*/*.o codecs/*/*/*.o codecs/*/*.a codecs/*/*/*.a codecs/*.oo codecs/*/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="FORMATS" displayname="File Formats" remove_on_change="formats/*.o formats/*.oo">
+               <member name="EMBED_FORMATS" displayname="File Formats" remove_on_change="formats/*.o formats/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o funcs/*.oo">
+               <member name="EMBED_FUNCS" displayname="Dialplan Functions" remove_on_change="funcs/*.o funcs/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o pbx/*.oo pbx/*/*.oo">
+               <member name="EMBED_PBX" displayname="PBX Functionality" remove_on_change="pbx/*.o pbx/*/*.o pbx/*.oo pbx/*/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o res/*.oo res/*/*.oo">
+               <member name="EMBED_RES" displayname="Resource Modules" remove_on_change="res/*.o res/*/*.o res/*.oo res/*/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>
-               <member name="TEST" displayname="Test Modules" remove_on_change="tests/*.o tests/*.oo">
+               <member name="EMBED_TEST" displayname="Test Modules" remove_on_change="tests/*.o tests/*.oo">
                        <depend>gnu_ld</depend>
                        <support_level>extended</support_level>
                </member>