[asterisk-commits] eliel: branch group/appdocsxml r135299 - in /team/group/appdocsxml: ./ includ...

[SVN commits to the Asterisk project]

Author: eliel
Date: Sat Aug  2 02:07:32 2008
New Revision: 135299

URL: http://svn.digium.com/view/asterisk?view=rev&rev=135299
Log:
Make libxml2 a new needed mandatory dependecy for compiling the core.


Modified:
    team/group/appdocsxml/Makefile
    team/group/appdocsxml/configure
    team/group/appdocsxml/configure.ac
    team/group/appdocsxml/include/asterisk/autoconfig.h.in
    team/group/appdocsxml/main/Makefile
    team/group/appdocsxml/makeopts.in

Modified: team/group/appdocsxml/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/Makefile?view=diff&rev=135299&r1=135298&r2=135299
==============================================================================
--- team/group/appdocsxml/Makefile (original)
+++ team/group/appdocsxml/Makefile Sat Aug  2 02:07:32 2008
@@ -104,6 +104,9 @@
 # CFLAGS and LDFLAGS in the COPTS and LDOPTS variables.
 ASTCFLAGS+=$(COPTS)
 ASTLDFLAGS+=$(LDOPTS)
+
+# libxml2 cflags
+ASTCFLAGS+=$(LIBXML2_INCLUDE)
 
 #Uncomment this to see all build commands instead of 'quiet' output
 #NOISY_BUILD=yes

Modified: team/group/appdocsxml/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/configure.ac?view=diff&rev=135299&r1=135298&r2=135299
==============================================================================
--- team/group/appdocsxml/configure.ac (original)
+++ team/group/appdocsxml/configure.ac Sat Aug  2 02:07:32 2008
@@ -221,6 +221,7 @@
 AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
 AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
 AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
+AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
 AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
 AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
 AST_EXT_LIB_SETUP([MISDN], [mISDN User Library], [misdn])
@@ -1220,6 +1221,15 @@
 
 AST_EXT_LIB_CHECK([LDAP], [ldap], [ldap_initialize], [ldap.h])
 
+AST_EXT_TOOL_CHECK([LIBXML2], [xml2], , ,
+[#include <libxml/tree.h>
+#include <libxml/parser.h>],
+[LIBXML_TEST_VERSION])
+
+if test "${PBX_LIBXML2}" = 0; then
+  AC_MSG_ERROR( *** Please install libxml2 development package.  It is required to build Asterisk!)
+fi
+
 AST_EXT_LIB_CHECK([MISDN], [mISDN], [mISDN_open], [mISDNuser/mISDNlib.h])
 
 if test "${PBX_MISDN}" = 1; then

Modified: team/group/appdocsxml/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/include/asterisk/autoconfig.h.in?view=diff&rev=135299&r1=135298&r2=135299
==============================================================================
--- team/group/appdocsxml/include/asterisk/autoconfig.h.in (original)
+++ team/group/appdocsxml/include/asterisk/autoconfig.h.in Sat Aug  2 02:07:32 2008
@@ -400,6 +400,9 @@
 
 /* Define to 1 if you have the <libintl.h> header file. */
 #undef HAVE_LIBINTL_H
+
+/* Define if your system has the LIBXML2 libraries. */
+#undef HAVE_LIBXML2
 
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H

Modified: team/group/appdocsxml/main/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/main/Makefile?view=diff&rev=135299&r1=135298&r2=135299
==============================================================================
--- team/group/appdocsxml/main/Makefile (original)
+++ team/group/appdocsxml/main/Makefile Sat Aug  2 02:07:32 2008
@@ -42,7 +42,7 @@
 AST_LIBS += $(SSL_LIB)
 AST_LIBS += $(BKTR_LIB)
 AST_LIBS += -lmxml -L../menuselect/mxml
-
+AST_LIBS += -lxml2
 
 ifeq ($(POLL_AVAILABLE),)
   OBJS+=poll.o

Modified: team/group/appdocsxml/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/group/appdocsxml/makeopts.in?view=diff&rev=135299&r1=135298&r2=135299
==============================================================================
--- team/group/appdocsxml/makeopts.in (original)
+++ team/group/appdocsxml/makeopts.in Sat Aug  2 02:07:32 2008
@@ -235,6 +235,9 @@
 TERMCAP_LIB=@TERMCAP_LIB@
 TERMCAP_DIR=@TERMCAP_DIR@
 
+LIBXML2_INCLUDE=@LIBXML2_INCLUDE@
+LIBXML2_LIB=@LIBXML2_LIB@
+
 TINFO_INCLUDE=@TINFO_INCLUDE@
 TINFO_LIB=@TINFO_LIB@
 TINFO_DIR=@TINFO_DIR@