[asterisk-commits] trunk r37277 - in /trunk: ./ apps/ pbx/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Thu Jul  6 19:48:40 2006
New Revision: 37277

URL: http://svn.digium.com/view/asterisk?rev=37277&view=rev
Log:
various minor fixes

Modified:
    trunk/Makefile
    trunk/apps/app_voicemail.c
    trunk/pbx/Makefile
    trunk/pbx/pbx_kdeconsole.cc

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=37277&r1=37276&r2=37277&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Jul  6 19:48:40 2006
@@ -898,7 +898,7 @@
 	@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
 	$(MAKE) -C mxml libmxml.a
 
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml
 	@echo "Generating list of available modules ..."
 	@build_tools/prep_moduledeps 2>/dev/null > $@
 

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?rev=37277&r1=37276&r2=37277&view=diff
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Thu Jul  6 19:48:40 2006
@@ -54,6 +54,7 @@
 	</member>
 	<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
 		<depend>imap_tk</depend>
+		<use>ssl</use>
 		<defaultenabled>no</defaultenabled>
 	</member>
 </category>

Modified: trunk/pbx/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/pbx/Makefile?rev=37277&r1=37276&r2=37277&view=diff
==============================================================================
--- trunk/pbx/Makefile (original)
+++ trunk/pbx/Makefile Thu Jul  6 19:48:40 2006
@@ -14,9 +14,11 @@
   include ../menuselect.makedeps
 endif
 
-SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)) $(patsubst %.cc,%,$(wildcard pbx_*.cc)))
 
 MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
+
+CC_MODS:=pbx_kdeconsole
 
 all: _all
 

Modified: trunk/pbx/pbx_kdeconsole.cc
URL: http://svn.digium.com/view/asterisk/trunk/pbx/pbx_kdeconsole.cc?rev=37277&r1=37276&r2=37277&view=diff
==============================================================================
--- trunk/pbx/pbx_kdeconsole.cc (original)
+++ trunk/pbx/pbx_kdeconsole.cc Thu Jul  6 19:48:40 2006
@@ -13,6 +13,7 @@
 
 /*** MODULEINFO
 	<depend>qt</depend>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "pbx_kdeconsole.moc"