[Asterisk-code-review] res pjsip dlg options: Fix MODULEINFO section. (asterisk[master])

Matt Jordan asteriskteam at digium.com
Sun May 3 09:19:16 CDT 2015


Matt Jordan has submitted this change and it was merged.

Change subject: res_pjsip_dlg_options: Fix MODULEINFO section.
......................................................................


res_pjsip_dlg_options: Fix MODULEINFO section.

Removed the extra space before "MODULEINFO" in res_pjsip_dlg_options.
This extra space prevented any of the dependencies from being seen by
menuselect, so building with default options would fail if PJSIP was
not installed.

This also makes the tool that extracts information for menuselect
tolerant of multiple spaces in the future.

ASTERISK-25033 #close
Reported by: Peter Whisker

Change-Id: Iccd54846f70c4a7a50cb5bf70b7bb5cb4bab3698
---
M build_tools/get_moduleinfo
M res/res_pjsip_dlg_options.c
2 files changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Matt Jordan: Looks good to me, approved; Verified
  George Joseph: Looks good to me, but someone else must approve



diff --git a/build_tools/get_moduleinfo b/build_tools/get_moduleinfo
index 4dbb294..e4e72bb 100644
--- a/build_tools/get_moduleinfo
+++ b/build_tools/get_moduleinfo
@@ -1,4 +1,4 @@
-/\/\*\*\* MODULEINFO/ {printit=1; next}
+/\/\*\*\* +MODULEINFO/ {printit=1; next}
 /<support_level>/ {if (gotsupportlevel) { next }; gotsupportlevel=1}
 /\*\*\*\// {printit=0}
 /.*/ {if (printit) print}
diff --git a/res/res_pjsip_dlg_options.c b/res/res_pjsip_dlg_options.c
index 45a1940..3415124 100644
--- a/res/res_pjsip_dlg_options.c
+++ b/res/res_pjsip_dlg_options.c
@@ -16,7 +16,7 @@
  * at the top of the source tree.
  */
 
-/***  MODULEINFO
+/*** MODULEINFO
 	<depend>pjproject</depend>
 	<depend>res_pjsip</depend>
 	<depend>res_pjsip_session</depend>

-- 
To view, visit https://gerrit.asterisk.org/335
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iccd54846f70c4a7a50cb5bf70b7bb5cb4bab3698
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: George Joseph <george.joseph at fairview5.com>
Gerrit-Reviewer: Matt Jordan <mjordan at digium.com>



More information about the asterisk-code-review mailing list