# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1158285923 0
# Node ID fe9222bf8b1de7746d3540cb0b2f02286c8fdae1
# Parent  81650a27f253c03e90ad55e842896ba4f7acfa13
[gaim-migrate @ 17282]
Sometimes the order in which things happen is quite important. In
this case the chicken quite definitely came before the egg.

Also make the libxml2 check explicit to what minimum version we need.

committer: Tailor Script <tailor@pidgin.im>

diff -r 81650a27f253 -r fe9222bf8b1d configure.ac
--- a/configure.ac	Fri Sep 15 01:21:53 2006 +0000
+++ b/configure.ac	Fri Sep 15 02:05:23 2006 +0000
@@ -207,6 +207,22 @@
 		[compile without Contact Availability Prediction plugin])],
 	enable_cap="no", enable_cap="yes")
 
+
+AC_PATH_XTRA
+# We can't assume that $x_libraries will be set, because autoconf does not
+# set it in the case when the X libraries are in a standard place.
+# Ditto for $x_includes
+if test X"$x_libraries" = X"" || test X"$x_libraries" = XNONE; then
+    x_libpath_add=
+else
+    x_libpath_add="-L$x_libraries"
+fi
+if test X"$x_includes" = X"" || test X"$x_includes" = XNONE; then
+    x_incpath_add=
+else
+    x_incpath_add="-I$x_includes"
+fi
+
 if test "x$enable_gtkui" = "xyes" ; then
 	PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0], , [
 		AC_MSG_RESULT(no)
@@ -413,11 +429,11 @@
 dnl #######################################################################
 dnl # Check for LibXML2 (required)
 dnl #######################################################################
-PKG_CHECK_MODULES(LIBXML, [libxml-2.0], , [
+PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.6.0], , [
 	AC_MSG_RESULT(no)
 	AC_MSG_ERROR([
 
-You must have the libxml2 development headers installed to build Gaim.
+You must have libxml2 >= 2.6.0 development headers installed to build Gaim.
 ])])
 AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
@@ -851,21 +867,6 @@
 
 AC_PATH_PROG(gaimpath, gaim)
 
-AC_PATH_XTRA
-# We can't assume that $x_libraries will be set, because autoconf does not
-# set it in the case when the X libraries are in a standard place.
-# Ditto for $x_includes
-if test X"$x_libraries" = X"" || test X"$x_libraries" = XNONE; then
-	x_libpath_add=
-else
-	x_libpath_add="-L$x_libraries"
-fi
-if test X"$x_includes" = X"" || test X"$x_includes" = XNONE; then
-	x_incpath_add=
-else
-	x_incpath_add="-I$x_includes"
-fi
-
 dnl #######################################################################
 dnl # Check for DBUS libraries
 dnl #######################################################################