From b9f2bdfbe0dfd6054854d634131a5ddda0a7143b Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Wed, 1 Jul 2009 20:27:00 +0000 Subject: [PATCH] allow comments (using ##) in modules.conf git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14093 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- build/modules.conf.in | 2 +- configure.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/modules.conf.in b/build/modules.conf.in index f678a2337c..3131741512 100644 --- a/build/modules.conf.in +++ b/build/modules.conf.in @@ -87,6 +87,6 @@ say/mod_say_ru -# 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 diff --git a/configure.in b/configure.in index 64d627e732..9c37a741e6 100644 --- a/configure.in +++ b/configure.in @@ -782,7 +782,7 @@ AM_CONDITIONAL(IS64BITLINUX, [test `uname -m` = x86_64]) 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 )'