make menuselect configure process be silent when possible

don't use #ifdef inside a macro call... it appears various versions of gcc have bugs related to this

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

diff --git a/Makefile b/Makefile
index e3ef712aa2e5b1ba6043581816c3695cc05f73b6..08de69c178cbdd671f21be859ea7d74f0d295d73 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -647,7 +647,7 @@ menuselect: menuselect/menuselect menuselect-tree
        -@menuselect/menuselect $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts && echo "menuselect changes saved!" || echo "menuselect changes NOT saved!"
 
 menuselect/menuselect: makeopts menuselect/menuselect.c menuselect/menuselect_curses.c menuselect/menuselect_stub.c menuselect/menuselect.h menuselect/linkedlists.h makeopts
-       @unset CC LD AR RANLIB && $(MAKE) -C menuselect
+       @unset CC LD AR RANLIB && $(MAKE) -C menuselect CONFIGURE_SILENT="--silent"
 
 menuselect-tree: $(foreach dir,$(filter-out main,$(MOD_SUBDIRS)),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml build_tools/embed_modules.xml
        @echo "Generating input for menuselect ..."

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 60b6e95219fa2b5654f830ae473bd6fd21c612c9..ae3e94277af80ec38cf5439c00684899739cb73d 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -11220,11 +11220,13 @@ static int reload(void)
        return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Zapata Telephony"
 #ifdef ZAPATA_PRI
-               " w/PRI"
+#define tdesc "Zapata Telephony w/PRI"
+#else
+#define tdesc "Zapata Telephony"
 #endif
-               ,
+
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
                .load = load_module,
                .unload = unload_module,
                .reload = reload,