[Gaim-commits] SF.net SVN: gaim: [17282] trunk/configure.ac

[<nos...@us...>]

Revision: 17282
          http://svn.sourceforge.net/gaim/?rev=17282&view=rev
Author:   nosnilmot
Date:     2006-09-14 19:05:23 -0700 (Thu, 14 Sep 2006)

Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/configure.ac

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2006-09-15 01:21:53 UTC (rev 17281)
+++ trunk/configure.ac	2006-09-15 02:05:23 UTC (rev 17282)
@@ -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 #######################################################################


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.