[svn-commits] mjordan: trunk r418850 - in /trunk: ./ menuselect/

[SVN commits to the Digium repositories]

Author: mjordan
Date: Thu Jul 17 14:31:05 2014
New Revision: 418850

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418850
Log:
configure: Fix libxml2 development library dependency checking

The commit that added libxml2 support didn't fully check for the libxml2
development script in the Asterisk configure file. As a result, Asterisk could
be configured, then fail on menuselect. This patch fixes it so that Asterisk
should detect the libxml2 dependency failure first.

Modified:
    trunk/UPGRADE.txt
    trunk/configure
    trunk/configure.ac
    trunk/menuselect/configure
    trunk/menuselect/configure.ac

Modified: trunk/UPGRADE.txt
URL: http://svnview.digium.com/svn/asterisk/trunk/UPGRADE.txt?view=diff&rev=418850&r1=418849&r2=418850
==============================================================================
--- trunk/UPGRADE.txt (original)
+++ trunk/UPGRADE.txt Thu Jul 17 14:31:05 2014
@@ -24,7 +24,8 @@
 From 12 to 13:
 
  - The menuselect utility has been pulled into the Asterisk repository. As a
-   result, the libxml2 library is now a required dependency for Asterisk.
+   result, the libxml2 development library is now a required dependency for
+   Asterisk.
 
  - The asterisk command line -I option and the asterisk.conf internal_timing
    option are removed and always enabled if any timing module is loaded.

Modified: trunk/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/configure.ac?view=diff&rev=418850&r1=418849&r2=418850
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Jul 17 14:31:05 2014
@@ -550,9 +550,14 @@
   AC_MSG_ERROR([*** JSON support not found (this typically means the libjansson development package is missing)])
 fi
 
-if test "x$PBX_LIBXML2" == "x"; then
-	AC_MSG_NOTICE(*** The Asterisk menuselect tool requires the 'libxml2' package.)
-	AC_MSG_NOTICE(*** Please install the 'libxml2' package.)
+AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
+        [#include <libxml/tree.h>
+        #include <libxml/parser.h>],
+        [LIBXML_TEST_VERSION])
+
+if test "${PBX_LIBXML2}" != 1; then
+	AC_MSG_NOTICE(*** The Asterisk menuselect tool requires the 'libxml2' development package.)
+	AC_MSG_NOTICE(*** Please install the 'libxml2' development package.)
 	exit 1
 fi
 
@@ -569,10 +574,6 @@
 	esac], [disable_xmldoc=no])
 
 if test "${disable_xmldoc}" != "yes"; then
-	AST_EXT_TOOL_CHECK([LIBXML2], [xml2-config], , ,
-	[#include <libxml/tree.h>
-	#include <libxml/parser.h>],
-	[LIBXML_TEST_VERSION])
         AST_EXT_LIB_CHECK([LIBXSLT], [xslt], [xsltLoadStylesheetPI], [libxslt/xsltInternals.h], [${LIBXML2_LIB}], [${LIBXML2_INCLUDE}])
         AST_EXT_LIB_CHECK([LIBXSLT_CLEANUP], [xslt], [xsltCleanupGlobals], [libxslt/xsltInternals.h], [${LIBXML2_LIB}], [${LIBXML2_INCLUDE}])
 

Modified: trunk/menuselect/configure.ac
URL: http://svnview.digium.com/svn/asterisk/trunk/menuselect/configure.ac?view=diff&rev=418850&r1=418849&r2=418850
==============================================================================
--- trunk/menuselect/configure.ac (original)
+++ trunk/menuselect/configure.ac Thu Jul 17 14:31:05 2014
@@ -131,7 +131,7 @@
         [LIBXML_TEST_VERSION])
 
 if test "${PBX_LIBXML2}" != 1; then
-  AC_MSG_ERROR([coult not find required 'Libxml2' development package])
+  AC_MSG_ERROR([Could not find required 'Libxml2' development package])
 fi
 
 PBX_GTK2=0