mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	menuselect: Add libxml2 support (Patch 3)
This is the final patch in adding menuselect to Asterisk. - The first patch (r418832) added menuselect along with mxml - The second patch (r418833) removed mxml from menuselect This patch adds support for libxml2 to menuselect, and makes libxml2 a required library for Asterisk. Note that the libxml2 portion of this patch was written by Sean Bright, and was made available on a team branch: http://svn.digium.com/svn/menuselect/team/seanbright/libxml2/ Review: https://reviewboard.asterisk.org/r/3773/ ASTERISK-20703 #close patches: some_mysterious_team_branch uploaded by seanbright (License 5060) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@418834 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		
							
								
								
									
										20
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										20
									
								
								configure
									
									
									
									
										vendored
									
									
								
							| @@ -1,5 +1,5 @@ | ||||
| #! /bin/sh | ||||
| # From configure.ac Revision: 418034 . | ||||
| # From configure.ac Revision: 418035 . | ||||
| # Guess values for system-dependent variables and create Makefiles. | ||||
| # Generated by GNU Autoconf 2.68 for asterisk trunk. | ||||
| # | ||||
| @@ -12646,6 +12646,14 @@ if test "x$JANSSON_LIB" == "x"; then | ||||
|   as_fn_error $? "*** JSON support not found (this typically means the libjansson development package is missing)" "$LINENO" 5 | ||||
| fi | ||||
|  | ||||
| if test "x$PBX_LIBXML2" == "x"; then | ||||
| 	{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Asterisk requires the 'libxml2' development package." >&5 | ||||
| $as_echo "$as_me: *** Asterisk requires the 'libxml2' development package." >&6;} | ||||
| 	{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Please install the 'libxml2' development package." >&5 | ||||
| $as_echo "$as_me: *** Please install the 'libxml2' development package." >&6;} | ||||
| 	exit 1 | ||||
| fi | ||||
|  | ||||
|  | ||||
| if test "x${PBX_URIPARSER}" != "x1" -a "${USE_URIPARSER}" != "no"; then | ||||
|    pbxlibdir="" | ||||
| @@ -12915,16 +12923,6 @@ $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h | ||||
| 		fi | ||||
| 	fi | ||||
|  | ||||
| 	if test "${PBX_LIBXML2}" != 1; then | ||||
| 		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** XML documentation will not be available because the 'libxml2' development package is missing." >&5 | ||||
| $as_echo "$as_me: *** XML documentation will not be available because the 'libxml2' development package is missing." >&6;} | ||||
| 		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** Please run the 'configure' script with the '--disable-xmldoc' parameter option" >&5 | ||||
| $as_echo "$as_me: *** Please run the 'configure' script with the '--disable-xmldoc' parameter option" >&6;} | ||||
| 		{ $as_echo "$as_me:${as_lineno-$LINENO}: *** or install the 'libxml2' development package." >&5 | ||||
| $as_echo "$as_me: *** or install the 'libxml2' development package." >&6;} | ||||
| 		exit 1 | ||||
| 	fi | ||||
|  | ||||
|  | ||||
| if test "x${PBX_LIBXSLT}" != "x1" -a "${USE_LIBXSLT}" != "no"; then | ||||
|    pbxlibdir="" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user