From edd95182b26eb5d576d4878c559e0f17dddaa909 Mon Sep 17 00:00:00 2001 From: Michael Joost Date: Mon, 18 Nov 2013 16:11:26 +0100 Subject: Remove fallback for _XEatDataWords, require libX11 1.6 for it _XEatDataWords was orignally introduced with the May 2013 security patches, and in order to ease the process of delivering those, fallback versions of _XEatDataWords were included in the X extension library patches so they could be applied to older versions that didn't have libX11 1.6 yet. Now that we're past that hurdle, we can drop the fallbacks and just require libX11 1.6 for building new versions of the extension libraries. Reviewed-by: Alan Coopersmith Signed-off-by: Alan Coopersmith --- configure.ac | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 17c5cb1..e2b60db 100644 --- a/configure.ac +++ b/configure.ac @@ -40,13 +40,7 @@ XORG_DEFAULT_OPTIONS XORG_CHECK_MALLOC_ZERO # Obtain compiler/linker options for depedencies -PKG_CHECK_MODULES(XINERAMA, x11 xext xextproto [xineramaproto >= 1.1.99.1]) - -# Check for _XEatDataWords function that may be patched into older Xlib releases -SAVE_LIBS="$LIBS" -LIBS="$XINERAMA_LIBS" -AC_CHECK_FUNCS([_XEatDataWords]) -LIBS="$SAVE_LIBS" +PKG_CHECK_MODULES(XINERAMA, [x11 >= 1.6] xext xextproto [xineramaproto >= 1.1.99.1]) # Allow checking code with lint, sparse, etc. XORG_WITH_LINT -- cgit v1.2.3