fix merge issues.

14 files changed, 1 insertions, 157 deletions

diff --git a/lib/libXRes/configure b/lib/libXRes/configure
index 38bf883b8..439f73d9b 100644
--- a/lib/libXRes/configure
+++ b/lib/libXRes/configure
@@ -17640,22 +17640,6 @@ done
 
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XRES_LIBS"
-for ac_func in _XEatDataWords
-do :
-  ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
-if test "x$ac_cv_func__XEatDataWords" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__XEATDATAWORDS 1
-_ACEOF
-
-fi
-done
-
-LIBS="$SAVE_LIBS"
-
 ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xres.pc"
 
 cat >confcache <<\_ACEOF
diff --git a/lib/libXRes/configure.ac b/lib/libXRes/configure.ac
index 74f2a0ac0..aba201315 100644
--- a/lib/libXRes/configure.ac
+++ b/lib/libXRes/configure.ac
@@ -1,5 +1,5 @@
 dnl 
-dnl  $Id: configure.ac,v 1.6 2013/05/31 15:23:23 matthieu Exp $
+dnl  $Id: configure.ac,v 1.7 2013/05/31 18:38:27 matthieu Exp $
 #
 #  Copyright © 2003 Keith Packard, Noah Levitt
 #
@@ -63,12 +63,6 @@ LIBS="$XRES_LIBS"
 AC_CHECK_FUNCS([_XEatDataWords])
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XRES_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
 AC_CONFIG_FILES([Makefile
 		src/Makefile
 		man/Makefile
diff --git a/lib/libXi/configure b/lib/libXi/configure
index 9148d6b93..6f9007829 100644
--- a/lib/libXi/configure
+++ b/lib/libXi/configure
@@ -18412,22 +18412,6 @@ done
 
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib releases
-SAVE_LIBS="$LIBS"
-LIBS="$XI_LIBS"
-for ac_func in _XEatDataWords
-do :
-  ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
-if test "x$ac_cv_func__XEatDataWords" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__XEATDATAWORDS 1
-_ACEOF
-
-fi
-done
-
-LIBS="$SAVE_LIBS"
-
 # Check for xmlto and asciidoc for man page conversion
 # (only needed by people building tarballs)
 if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then
diff --git a/lib/libXi/configure.ac b/lib/libXi/configure.ac
index e7ac315e2..d0239ac89 100644
--- a/lib/libXi/configure.ac
+++ b/lib/libXi/configure.ac
@@ -36,12 +36,6 @@ LIBS="$XI_LIBS"
 AC_CHECK_FUNCS([_XEatDataWords])
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib releases
-SAVE_LIBS="$LIBS"
-LIBS="$XI_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
 # Check for xmlto and asciidoc for man page conversion
 # (only needed by people building tarballs)
 if test "$have_xmlto" = yes && test "$have_asciidoc" = yes; then
diff --git a/lib/libXinerama/configure b/lib/libXinerama/configure
index 43b59d749..a7a0947c7 100644
--- a/lib/libXinerama/configure
+++ b/lib/libXinerama/configure
@@ -17619,22 +17619,6 @@ done
 
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib releases
-SAVE_LIBS="$LIBS"
-LIBS="$XINERAMA_LIBS"
-for ac_func in _XEatDataWords
-do :
-  ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
-if test "x$ac_cv_func__XEatDataWords" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__XEATDATAWORDS 1
-_ACEOF
-
-fi
-done
-
-LIBS="$SAVE_LIBS"
-
 # Allow checking code with lint, sparse, etc.
 
 
diff --git a/lib/libXinerama/configure.ac b/lib/libXinerama/configure.ac
index ce1d50fa5..17c5cb1fd 100644
--- a/lib/libXinerama/configure.ac
+++ b/lib/libXinerama/configure.ac
@@ -48,12 +48,6 @@ LIBS="$XINERAMA_LIBS"
 AC_CHECK_FUNCS([_XEatDataWords])
 LIBS="$SAVE_LIBS"
 
-# 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"
-
 # Allow checking code with lint, sparse, etc.
 XORG_WITH_LINT
 LINT_FLAGS="${LINT_FLAGS} ${XINERAMA_CFLAGS}"
diff --git a/lib/libXtst/configure b/lib/libXtst/configure
index 12073da29..661ab1db2 100644
--- a/lib/libXtst/configure
+++ b/lib/libXtst/configure
@@ -18142,22 +18142,6 @@ done
 
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XTST_LIBS"
-for ac_func in _XEatDataWords
-do :
-  ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
-if test "x$ac_cv_func__XEatDataWords" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__XEATDATAWORDS 1
-_ACEOF
-
-fi
-done
-
-LIBS="$SAVE_LIBS"
-
 # Determine if the source for man pages is available
 # It may already be present (tarball) or can be generated using xmlto
  if test -f "$srcdir/man/XTestQueryExtension.man" || test "x$have_xmlto" = xyes; then
diff --git a/lib/libXtst/configure.ac b/lib/libXtst/configure.ac
index cf4314c04..c169598fe 100644
--- a/lib/libXtst/configure.ac
+++ b/lib/libXtst/configure.ac
@@ -53,12 +53,6 @@ LIBS="$XTST_LIBS"
 AC_CHECK_FUNCS([_XEatDataWords])
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XTST_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
 # Determine if the source for man pages is available
 # It may already be present (tarball) or can be generated using xmlto
 AM_CONDITIONAL([INSTALL_MANPAGES],
diff --git a/lib/libXxf86dga/configure b/lib/libXxf86dga/configure
index b9d124c20..4664fcef5 100644
--- a/lib/libXxf86dga/configure
+++ b/lib/libXxf86dga/configure
@@ -17608,22 +17608,6 @@ done
 
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XXF86DGA_LIBS"
-for ac_func in _XEatDataWords
-do :
-  ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
-if test "x$ac_cv_func__XEatDataWords" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__XEATDATAWORDS 1
-_ACEOF
-
-fi
-done
-
-LIBS="$SAVE_LIBS"
-
 ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xxf86dga.pc"
 
 cat >confcache <<\_ACEOF
diff --git a/lib/libXxf86dga/configure.ac b/lib/libXxf86dga/configure.ac
index 7e83cb523..3127c6e03 100644
--- a/lib/libXxf86dga/configure.ac
+++ b/lib/libXxf86dga/configure.ac
@@ -28,12 +28,6 @@ LIBS="$XXF86DGA_LIBS"
 AC_CHECK_FUNCS([_XEatDataWords])
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XXF86DGA_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
 AC_CONFIG_FILES([Makefile
 		src/Makefile
 		man/Makefile
diff --git a/lib/libXxf86vm/configure b/lib/libXxf86vm/configure
index 8beafc4b1..094164194 100644
--- a/lib/libXxf86vm/configure
+++ b/lib/libXxf86vm/configure
@@ -17608,22 +17608,6 @@ done
 
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XXF86VM_LIBS"
-for ac_func in _XEatDataWords
-do :
-  ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
-if test "x$ac_cv_func__XEatDataWords" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__XEATDATAWORDS 1
-_ACEOF
-
-fi
-done
-
-LIBS="$SAVE_LIBS"
-
 ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xxf86vm.pc"
 
 cat >confcache <<\_ACEOF
diff --git a/lib/libXxf86vm/configure.ac b/lib/libXxf86vm/configure.ac
index a21de90c6..d0dbcef28 100644
--- a/lib/libXxf86vm/configure.ac
+++ b/lib/libXxf86vm/configure.ac
@@ -28,12 +28,6 @@ LIBS="$XXF86VM_LIBS"
 AC_CHECK_FUNCS([_XEatDataWords])
 LIBS="$SAVE_LIBS"
 
-# Check for _XEatDataWords function that may be patched into older Xlib release
-SAVE_LIBS="$LIBS"
-LIBS="$XXF86VM_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
 AC_CONFIG_FILES([Makefile
 		src/Makefile
 		man/Makefile
diff --git a/lib/libdmx/configure b/lib/libdmx/configure
index f1f86ff05..24af06585 100644
--- a/lib/libdmx/configure
+++ b/lib/libdmx/configure
@@ -17637,23 +17637,6 @@ done
 LIBS="$SAVE_LIBS"
 
 
-# Check for _XEatDataWords function that may be patched into older Xlib releases
-SAVE_LIBS="$LIBS"
-LIBS="$DMX_LIBS"
-for ac_func in _XEatDataWords
-do :
-  ac_fn_c_check_func "$LINENO" "_XEatDataWords" "ac_cv_func__XEatDataWords"
-if test "x$ac_cv_func__XEatDataWords" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE__XEATDATAWORDS 1
-_ACEOF
-
-fi
-done
-
-LIBS="$SAVE_LIBS"
-
-
 ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile dmx.pc"
 
 cat >confcache <<\_ACEOF
diff --git a/lib/libdmx/configure.ac b/lib/libdmx/configure.ac
index 47f511e23..56805cef9 100644
--- a/lib/libdmx/configure.ac
+++ b/lib/libdmx/configure.ac
@@ -50,13 +50,6 @@ AC_CHECK_FUNCS([_XEatDataWords])
 LIBS="$SAVE_LIBS"
 
 
-# Check for _XEatDataWords function that may be patched into older Xlib releases
-SAVE_LIBS="$LIBS"
-LIBS="$DMX_LIBS"
-AC_CHECK_FUNCS([_XEatDataWords])
-LIBS="$SAVE_LIBS"
-
-
 AC_CONFIG_FILES([Makefile
 		src/Makefile
 		man/Makefile