[XaraXtreme-commits] Commit Complete

[subversion@xxxxxxxxxxxxxx]

Commit by  : phil
Repository : xara
Revision   : 958
Date       : Fri May  5 11:44:10 BST 2006

Changed paths:
   M /Trunk/XaraLX/configure.in

Link to libxml2 of at least version 2.6


Diff:
Index: Trunk/XaraLX/configure.in
===================================================================
--- Trunk/XaraLX/configure.in	(revision 957)
+++ Trunk/XaraLX/configure.in	(revision 958)
@@ -150,6 +150,14 @@
 	AC_MSG_ERROR([wxWidgets 2.6.3 or newer is required])
 fi
 
+# Test for libxml2
+# This is the simple version. Note that xml2-config script is also available
+# for more detailed configuration.
+LIBXML2_CFLAGS=""
+LIBXML2_LIBS=""
+PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
+
+# Define FTCONFIG
 FTCONFIG=freetype-config
 AC_ARG_WITH(freetype-config,
 [[  --with-freetype-config=FILE   Use the given path to freetype-config when determining
@@ -179,13 +187,13 @@
 	FT_CFLAGS="`$FTCONFIG --cflags`"
 
 	# check for the Pango package
-	PkgError = "no"
+	PkgError="no"
 	PKG_CHECK_MODULES(PANGOX, pangox,
 			  [
 				PANGO_CFLAGS="$PANGOX_CFLAGS"
 			  ],
 			  [
-				PkgError = "yes"
+				PkgError="yes"
 			  ]
 			  )
 	if test PkgError = "yes"; then
@@ -208,8 +216,8 @@
 fi
 
 # pass the Pango, FreeType and GTK flags (required for wxGTK font rendering)
-CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS"
-CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS"
+CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS"
+CXXFLAGS="$CXXFLAGS $WX_CPPFLAGS $PANGO_CFLAGS $FT_CFLAGS $GTK_CFLAGS $LIBXML2_CFLAGS"
 
 AC_MSG_CHECKING([Linker])
 case $host in
@@ -256,5 +264,6 @@
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 AC_SUBST(CDRAW_LIB_DIR)
+AC_SUBST(LIBXML2_LIBS)
 
 AC_OUTPUT(Makefile PreComp/Makefile Kernel/Makefile wxOil/Makefile tools/Makefile wxXtra/Makefile po/Makefile.in)


Xara