various minor fixes

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

diff --git a/Makefile b/Makefile
index 0305d249b6e36658271efaf1978f6c2434b8c55d..6b1522d61e6c963e95beb10cf2c816cefbe06189 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -898,7 +898,7 @@ mxml/libmxml.a:
        @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 > $@
 

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ebb26ffd2c183212aa6c34495079561ad9369366..657945b2359d0274f4a6369ed7900703d79f5d99 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -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>

diff --git a/pbx/Makefile b/pbx/Makefile
index 19fb905c40207b684de75cc3983c7c0a8b59069d..747843ff4b4f4966cffe8b6d000e18904ac71d61 100644 (file)
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -14,10 +14,12 @@ ifneq ($(wildcard ../menuselect.makeopts),)
   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
 
 include $(ASTTOPDIR)/Makefile.moddir_rules

diff --git a/pbx/pbx_kdeconsole.cc b/pbx/pbx_kdeconsole.cc
index 10a3f289f7fb2ead54d57672e951f1157c6e3a05..4a9af64d3fc4c2de6f8f46df5ad1deaa3e04a204 100644 (file)
--- a/pbx/pbx_kdeconsole.cc
+++ b/pbx/pbx_kdeconsole.cc
@@ -13,6 +13,7 @@
 
 /*** MODULEINFO
        <depend>qt</depend>
+       <defaultenabled>no</defaultenabled>
  ***/
 
 #include "pbx_kdeconsole.moc"