Revision
14093
Author
mikej
Date
2009-07-01 15:27:00 -0500 (Wed, 01 Jul 2009)

Log Message

allow comments (using ##) in modules.conf

Modified Paths

Diff

Modified: freeswitch/trunk/build/modules.conf.in (14092 => 14093)


--- freeswitch/trunk/build/modules.conf.in	2009-07-01 20:03:48 UTC (rev 14092)
+++ freeswitch/trunk/build/modules.conf.in	2009-07-01 20:27:00 UTC (rev 14093)
@@ -87,6 +87,6 @@
 
 
 
-# Experimental Modules (don't cry if they're broken)
+## Experimental Modules (don't cry if they're broken)
 #../../contrib/mod/endpoints/mod_khomp
 #../../contrib/mod/xml_int/mod_xml_odbc

Modified: freeswitch/trunk/configure.in (14092 => 14093)


--- freeswitch/trunk/configure.in	2009-07-01 20:03:48 UTC (rev 14092)
+++ freeswitch/trunk/configure.in	2009-07-01 20:27:00 UTC (rev 14093)
@@ -782,7 +782,7 @@
 LIBTOOL='`if test -z "$(VERBOSE)" ; then echo $(SHELL) $(switch_builddir)/quiet_libtool ;else echo $(switch_builddir)/libtool; fi;`'
 TOUCH_TARGET='if test -f "$@";then touch "$@";fi;'
 CONF_MODULES='$$(grep -v "\#" $(switch_builddir)/modules.conf | sed -e "s|^.*/||" | sort | uniq )'
-CONF_DISABLED_MODULES='$$(grep "\#" $(switch_builddir)/modules.conf | sed -e "s|^.*/||" | sort | uniq )'
+CONF_DISABLED_MODULES='$$(grep "\#" $(switch_builddir)/modules.conf | grep -v "\#\#" | sed -e "s|^.*/||" | sort | uniq )'
 OUR_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-all ; done )"; echo $$mods )'
 OUR_CLEAN_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-clean ; done )"; echo $$mods )'
 OUR_INSTALL_MODS='$$(if test -z "$(MODULES)" ; then tmp_mods="$(CONF_MODULES)"; else tmp_mods="$(MODULES)" ; fi ; mods="$$(for i in $$tmp_mods ; do echo $$i-install ; done)"; echo $$mods )'