[asterisk-commits] branch group/autoconf_and_menuselect r21779 - in /team/group/autoconf_and_men...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu Apr 20 17:27:32 MST 2006 

Author: russell
Date: Thu Apr 20 19:27:29 2006
New Revision: 21779

URL: http://svn.digium.com/view/asterisk?rev=21779&view=rev
Log:
rename defaultbuild to defaultenabled and enable -DT38_SUPPORT by default

Modified:
    team/group/autoconf_and_menuselect/Makefile
    team/group/autoconf_and_menuselect/apps/app_ivrdemo.c
    team/group/autoconf_and_menuselect/apps/app_rpt.c
    team/group/autoconf_and_menuselect/apps/app_skel.c
    team/group/autoconf_and_menuselect/build_tools/cflags.xml
    team/group/autoconf_and_menuselect/build_tools/menuselect.c
    team/group/autoconf_and_menuselect/pbx/pbx_gtkconsole.c
    team/group/autoconf_and_menuselect/res/res_snmp.c

Modified: team/group/autoconf_and_menuselect/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/Makefile?rev=21779&r1=21778&r2=21779&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/Makefile (original)
+++ team/group/autoconf_and_menuselect/Makefile Thu Apr 20 19:27:29 2006
@@ -957,7 +957,7 @@
 menuselect: build_tools/menuselect makeopts.xml
 	- at build_tools/menuselect ${GLOBAL_MAKEOPTS} ${USER_MAKEOPTS} menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
 
-build_tools/menuselect: mxml/libmxml.a
+build_tools/menuselect: build_tools/menuselect.c build_tools/menuselect.h mxml/libmxml.a
 	$(MAKE) -C build_tools menuselect
 
 mxml/libmxml.a:

Modified: team/group/autoconf_and_menuselect/apps/app_ivrdemo.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/app_ivrdemo.c?rev=21779&r1=21778&r2=21779&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/app_ivrdemo.c (original)
+++ team/group/autoconf_and_menuselect/apps/app_ivrdemo.c Thu Apr 20 19:27:29 2006
@@ -26,7 +26,7 @@
  */
 
 /*** MODULEINFO
-	<defaultbuild>no</defaultbuild>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include <stdio.h>

Modified: team/group/autoconf_and_menuselect/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/app_rpt.c?rev=21779&r1=21778&r2=21779&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/app_rpt.c (original)
+++ team/group/autoconf_and_menuselect/apps/app_rpt.c Thu Apr 20 19:27:29 2006
@@ -97,7 +97,7 @@
 
 /*** MODULEINFO
 	<depend>zaptel</depend>
-	<defaultbuild>no</defaultbuild>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 /* The following is JUST GROSS!! There is some soft of underlying problem,

Modified: team/group/autoconf_and_menuselect/apps/app_skel.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/apps/app_skel.c?rev=21779&r1=21778&r2=21779&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/apps/app_skel.c (original)
+++ team/group/autoconf_and_menuselect/apps/app_skel.c Thu Apr 20 19:27:29 2006
@@ -27,7 +27,7 @@
  */
 
 /*** MODULEINFO
-	<defaultbuild>no</defaultbuild>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include <stdio.h>

Modified: team/group/autoconf_and_menuselect/build_tools/cflags.xml
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/cflags.xml?rev=21779&r1=21778&r2=21779&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/cflags.xml (original)
+++ team/group/autoconf_and_menuselect/build_tools/cflags.xml Thu Apr 20 19:27:29 2006
@@ -1,13 +1,25 @@
 	<category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" force_clean_on_change="yes">
-		<member name="-DDEBUG_SCHEDULER"/>
-		<member name="-DDEBUG_THREADS"/>
-		<member name="-DDETECT_DEADLOCKS"/>
-		<member name="-DDUMP_SCHEDULER"/>
-		<member name="-DLOW_MEMORY"/>
-		<member name="-DMALLOC_DEBUG"/>
-		<member name="-DMUFFIN_POWER"/>
-		<member name="-DRADIO_RELAX"/>
-		<member name="-DTRACE_FRAMES"/>
-		<member name="-DMTX_PROFILE"/>
-		<member name="-DT38_SUPPORT"/>
+		<member name="-DDEBUG_SCHEDULER">
+		</member>
+		<member name="-DDEBUG_THREADS">
+		</member>
+		<member name="-DDETECT_DEADLOCKS">
+		</member>
+		<member name="-DDUMP_SCHEDULER">
+		</member>
+		<member name="-DLOW_MEMORY">
+		</member>
+		<member name="-DMALLOC_DEBUG">
+		</member>
+		<member name="-DMUFFIN_POWER">
+		</member>
+		<member name="-DRADIO_RELAX">
+		</member>
+		<member name="-DTRACE_FRAMES">
+		</member>
+		<member name="-DMTX_PROFILE">
+		</member>
+		<member name="-DT38_SUPPORT">
+			<defaultenabled>yes</defaultenabled>
+		</member>
 	</category>

Modified: team/group/autoconf_and_menuselect/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/menuselect.c?rev=21779&r1=21778&r2=21779&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/menuselect.c (original)
+++ team/group/autoconf_and_menuselect/build_tools/menuselect.c Thu Apr 20 19:27:29 2006
@@ -268,11 +268,17 @@
 				mem->enabled = 1; /* Enabled by default */
 
 			mem->name = mxmlElementGetAttr(cur2, "name");
-
-			cur3 = mxmlFindElement(cur2, cur2, "defaultbuild", NULL, NULL, MXML_DESCEND);
-			if (cur3 && cur3->child && !strcmp("no", cur3->child->value.opaque))
-				mem->enabled = 0;
-
+			
+			cur3 = mxmlFindElement(cur2, cur2, "defaultenabled", NULL, NULL, MXML_DESCEND);
+			if (cur3 && cur3->child) {
+				if (!strcasecmp("no", cur3->child->value.opaque))
+					mem->enabled = 0;
+				else if (!strcasecmp("yes", cur3->child->value.opaque))
+					mem->enabled = 1;
+				else
+					fprintf(stderr, "Invalid value '%s' for <defaultenabled> !\n", cur3->child->value.opaque);
+			}
+			
 			for (cur3 = mxmlFindElement(cur2, cur2, "depend", NULL, NULL, MXML_DESCEND);
 			     cur3 && cur3->child;
 			     cur3 = mxmlFindElement(cur3, cur2, "depend", NULL, NULL, MXML_DESCEND))
@@ -936,8 +942,10 @@
 	free_member_list();
 
 	if (check_deps && !existing_config && !res) {
-		fprintf(stderr, "menuselect.makeopts file generated with default values!\n");
-		fprintf(stderr, "Please rerun make to build Asterisk.\n");
+		fprintf(stderr, "\n***********************************************************\n");
+		fprintf(stderr, "* menuselect.makeopts file generated with default values! *\n");
+		fprintf(stderr, "* Please rerun make to build Asterisk.                    *\n");
+		fprintf(stderr, "***********************************************************\n\n");
 		res = -1;
 	}
 

Modified: team/group/autoconf_and_menuselect/pbx/pbx_gtkconsole.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/pbx/pbx_gtkconsole.c?rev=21779&r1=21778&r2=21779&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/pbx/pbx_gtkconsole.c (original)
+++ team/group/autoconf_and_menuselect/pbx/pbx_gtkconsole.c Thu Apr 20 19:27:29 2006
@@ -24,7 +24,7 @@
 
 /*** MODULEINFO
 	<depend>gtk</depend>
-	<defaultbuild>no</defaultbuild>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include <sys/types.h>

Modified: team/group/autoconf_and_menuselect/res/res_snmp.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/res_snmp.c?rev=21779&r1=21778&r2=21779&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/res_snmp.c (original)
+++ team/group/autoconf_and_menuselect/res/res_snmp.c Thu Apr 20 19:27:29 2006
@@ -15,7 +15,7 @@
  */
 
 /*** MODULEINFO
-	<defaultbuild>no</defaultbuild>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "asterisk.h"

More information about the asterisk-commits mailing list