Update to libXrandr 1.4.1

1 files changed, 62 insertions, 67 deletions

diff --git a/lib/libXrandr/configure b/lib/libXrandr/configure
index 508809052..694805004 100644
--- a/lib/libXrandr/configure
+++ b/lib/libXrandr/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libXrandr 1.4.0.
+# Generated by GNU Autoconf 2.69 for libXrandr 1.4.1.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libXrandr'
 PACKAGE_TARNAME='libXrandr'
-PACKAGE_VERSION='1.4.0'
-PACKAGE_STRING='libXrandr 1.4.0'
+PACKAGE_VERSION='1.4.1'
+PACKAGE_STRING='libXrandr 1.4.1'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -662,6 +662,8 @@ FILE_MAN_SUFFIX
 LIB_MAN_SUFFIX
 APP_MAN_SUFFIX
 INSTALL_CMD
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 CHANGELOG_CMD
 STRICT_CFLAGS
@@ -714,9 +716,6 @@ build_vendor
 build_cpu
 build
 LIBTOOL
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
 am__untar
 am__tar
 AMTAR
@@ -781,7 +780,6 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
 enable_shared
 enable_static
 with_pic
@@ -805,6 +803,8 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 RANDR_CFLAGS
 RANDR_LIBS'
 
@@ -1347,7 +1347,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libXrandr 1.4.0 to adapt to many kinds of systems.
+\`configure' configures libXrandr 1.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1417,7 +1417,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXrandr 1.4.0:";;
+     short | recursive ) echo "Configuration of libXrandr 1.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1425,9 +1425,6 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode
-                          enable make rules and dependencies not useful (and
-                          sometimes confusing) to the casual installer
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-static[=PKGS]  build static libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1467,6 +1464,10 @@ Some influential environment variables:
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
   PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
   RANDR_CFLAGS
               C compiler flags for RANDR, overriding pkg-config
   RANDR_LIBS  linker flags for RANDR, overriding pkg-config
@@ -1537,7 +1538,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libXrandr configure 1.4.0
+libXrandr configure 1.4.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1861,7 +1862,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXrandr $as_me 1.4.0, which was
+It was created by libXrandr $as_me 1.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2690,7 +2691,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXrandr'
- VERSION='1.4.0'
+ VERSION='1.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2737,29 +2738,6 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
-    # Check whether --enable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then :
-  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
-$as_echo "$USE_MAINTAINER_MODE" >&6; }
-   if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
 # Initialize libtool
 case `pwd` in
   *\ * | *\	*)
@@ -11537,6 +11515,11 @@ fi
 
 
 
+
+
+
+
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -11649,7 +11632,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
-
 fi
 
 
@@ -17541,46 +17523,46 @@ pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for RANDR" >&5
 $as_echo_n "checking for RANDR... " >&6; }
 
-if test -n "$PKG_CONFIG"; then
-    if test -n "$RANDR_CFLAGS"; then
-        pkg_cv_RANDR_CFLAGS="$RANDR_CFLAGS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$RANDR_CFLAGS"; then
+    pkg_cv_RANDR_CFLAGS="$RANDR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 randrproto >= \$RANDR_VERSION xext xextproto xrender renderproto\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_RANDR_CFLAGS=`$PKG_CONFIG --cflags "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
-if test -n "$PKG_CONFIG"; then
-    if test -n "$RANDR_LIBS"; then
-        pkg_cv_RANDR_LIBS="$RANDR_LIBS"
-    else
-        if test -n "$PKG_CONFIG" && \
+if test -n "$RANDR_LIBS"; then
+    pkg_cv_RANDR_LIBS="$RANDR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11 randrproto >= \$RANDR_VERSION xext xextproto xrender renderproto\""; } >&5
   ($PKG_CONFIG --exists --print-errors "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_RANDR_LIBS=`$PKG_CONFIG --libs "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
 fi
-    fi
-else
-	pkg_failed=untried
+ else
+    pkg_failed=untried
 fi
 
 
 
 if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -17588,9 +17570,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto"`
+	        RANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto" 2>&1`
         else
-	        RANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto"`
+	        RANDR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "x11 randrproto >= $RANDR_VERSION xext xextproto xrender renderproto" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$RANDR_PKG_ERRORS" >&5
@@ -17604,9 +17586,10 @@ installed software in a non-standard prefix.
 
 Alternatively, you may set the environment variables RANDR_CFLAGS
 and RANDR_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
@@ -17617,14 +17600,14 @@ Alternatively, you may set the environment variables RANDR_CFLAGS
 and RANDR_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
 See \`config.log' for more details" "$LINENO" 5; }
 else
 	RANDR_CFLAGS=$pkg_cv_RANDR_CFLAGS
 	RANDR_LIBS=$pkg_cv_RANDR_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+
 fi
 
 # Check for _XEatDataWords function that may be patched into older Xlib release
@@ -17643,6 +17626,22 @@ done
 
 LIBS="$SAVE_LIBS"
 
+# Check for _XEatDataWords function that may be patched into older Xlib release
+SAVE_LIBS="$LIBS"
+LIBS="$RANDR_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 xrandr.pc"
 
 cat >confcache <<\_ACEOF
@@ -17770,10 +17769,6 @@ else
   am__EXEEXT_FALSE=
 fi
 
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18179,7 +18174,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libXrandr $as_me 1.4.0, which was
+This file was extended by libXrandr $as_me 1.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18245,7 +18240,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libXrandr config.status 1.4.0
+libXrandr config.status 1.4.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"