[asterisk-commits] dlee: trunk r383633 - in /trunk/main: Makefile json.c

[SVN commits to the Asterisk project]

Author: dlee
Date: Fri Mar 22 15:51:33 2013
New Revision: 383633

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383633
Log:
Fixed another issue from r383579.

Core modules don't honor <depend> flags in MODULEINFO, which broke jansson
if specified --with-jansson to configure.

Modified:
    trunk/main/Makefile
    trunk/main/json.c

Modified: trunk/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/trunk/main/Makefile?view=diff&rev=383633&r1=383632&r2=383633
==============================================================================
--- trunk/main/Makefile (original)
+++ trunk/main/Makefile Fri Mar 22 15:51:33 2013
@@ -151,6 +151,7 @@
 db.o: _ASTCFLAGS+=$(SQLITE3_INCLUDE)
 asterisk.o: _ASTCFLAGS+=$(LIBEDIT_INCLUDE)
 cli.o: _ASTCFLAGS+=$(LIBEDIT_INCLUDE)
+json.o: _ASTCFLAGS+=$(JANSSON_INCLUDE)
 
 ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
 http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)

Modified: trunk/main/json.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/json.c?view=diff&rev=383633&r1=383632&r2=383633
==============================================================================
--- trunk/main/json.c (original)
+++ trunk/main/json.c Fri Mar 22 15:51:33 2013
@@ -27,7 +27,6 @@
  */
 
 /*** MODULEINFO
-	<depend>jansson</depend>
 	<support_level>core</support_level>
  ***/