[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 configure.ac |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit 5b2d065ef87514ca32af325f793ee37fabd6af19
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Jul 3 19:56:56 2012 +0900

    Bug 34266 - configs silently ignored if libxml2 doesn't support SAX1 interface
    
    Check if libxml2 has built with --with-sax1

diff --git a/configure.ac b/configure.ac
index 644fc1a..140cb70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,18 @@ if test "$enable_libxml2" = "yes"; then
 
     AC_SUBST(LIBXML2_CFLAGS)
     AC_SUBST(LIBXML2_LIBS)
+
+    fc_saved_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS $LIBXML2_CFLAGS"
+    AC_MSG_CHECKING([SAX1 support in libxml2])
+    AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+	#include <libxml/xmlversion.h>
+	#if !defined(LIBXML_SAX1_ENABLED)
+	#  include "error: No SAX1 support in libxml2"
+	#endif
+	]])], [AC_MSG_RESULT([found])], [AC_MSG_ERROR([
+*** SAX1 support in libxml2 is required. enable it or use expat instead.])])
+    CFLAGS="$fc_saved_CFLAGS"
 fi
 
 #