diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-06 09:31:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-06 09:31:01 +0200 |
| commit | 405ae9defaaa03d4d305b6264a744107c3dd460d (patch) | |
| tree | e119a54d876fa737d859718afbde7ef507702631 /fontconfig | |
| parent | 3a5976985ab1ca641b095a72730f1f3d3bd5f9bc (diff) | |
| parent | 336bad93d146931c160d8517edfdf0bee49ad9f7 (diff) | |
| download | vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.tar.gz vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.tar.bz2 vcxsrv-405ae9defaaa03d4d305b6264a744107c3dd460d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/privates.c
xorg-server/hw/kdrive/ephyr/ephyr.c
xorg-server/hw/kdrive/src/kinput.c
Diffstat (limited to 'fontconfig')
| -rw-r--r-- | fontconfig/configure.ac | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index 644fc1a58..140cb70aa 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/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 # |