Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma

1 files changed, 5 insertions, 13 deletions

diff --git a/libX11/configure.ac b/libX11/configure.ac
index 027b4bb37..8bd2e51e0 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -20,17 +20,18 @@ AM_MAINTAINER_MODE
 # Initialize libtool

 AC_PROG_LIBTOOL

 

-# Require xorg-macros minimum of 1.12 for DocBook external references

+# Require xorg-macros minimum of 1.15 for fop minimum version

 m4_ifndef([XORG_MACROS_VERSION],

-          [m4_fatal([must install xorg-macros 1.12 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.12)

+          [m4_fatal([must install xorg-macros 1.15 or later before running autoconf/autogen])])

+XORG_MACROS_VERSION(1.15)

 XORG_DEFAULT_OPTIONS

 XORG_ENABLE_SPECS

 XORG_WITH_XMLTO(0.0.22)

-XORG_WITH_FOP([no])

+XORG_WITH_FOP([],[no])

 XORG_WITH_XSLTPROC

 XORG_CHECK_SGML_DOCTOOLS(1.8)

 XORG_PROG_RAWCPP

+XORG_WITH_PERL

 

 # Required when PKG_CHECK_MODULES called within an if statement

 PKG_PROG_PKG_CONFIG

@@ -65,15 +66,6 @@ if test x"$LDFLAGS_FOR_BUILD" = x; then
 fi

 AC_SUBST(LDFLAGS_FOR_BUILD)

 

-# Find perl for "make check" tests in nls/Makefile.am

-AC_ARG_WITH(perl,

-	AS_HELP_STRING([--with-perl=<path>],

-			[path to perl interpreter for build-time tests]),

-	[PERL=$withval ; AC_MSG_CHECKING([perl]) ;

-	 AC_MSG_RESULT([(from --with-perl) $PERL])],

-	AC_CHECK_PROGS([PERL], [perl], [no]))

-AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno)

-

 # Checks for pkg-config packages

 

 # Always required