Update following xorg packages

inputproto-2.0.2
xproto-7.0.22
resourceproto-1.2.0

1 files changed, 173 insertions, 21 deletions

diff --git a/X11/configure b/X11/configure
index f39b39112..6414c97b9 100644
--- a/X11/configure
+++ b/X11/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for Xproto 7.0.20.
+# Generated by GNU Autoconf 2.68 for Xproto 7.0.22.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -621,8 +621,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Xproto'
 PACKAGE_TARNAME='xproto'
-PACKAGE_VERSION='7.0.20'
-PACKAGE_STRING='Xproto 7.0.20'
+PACKAGE_VERSION='7.0.22'
+PACKAGE_STRING='Xproto 7.0.22'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 PACKAGE_URL=''
 
@@ -672,6 +672,9 @@ HAVE_STYLESHEETS_TRUE
 XSL_STYLESHEET
 STYLESHEET_SRCDIR
 XORG_SGML_PATH
+HAVE_XSLTPROC_FALSE
+HAVE_XSLTPROC_TRUE
+XSLTPROC
 HAVE_FOP_FALSE
 HAVE_FOP_TRUE
 FOP
@@ -708,6 +711,8 @@ build_vendor
 build_cpu
 build
 INSTALL_CMD
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
 PKG_CONFIG
 CHANGELOG_CMD
 CWARNFLAGS
@@ -804,6 +809,7 @@ enable_silent_rules
 enable_specs
 with_xmlto
 with_fop
+with_xsltproc
 enable_function_prototypes
 enable_varargs_prototypes
 enable_const_prototypes
@@ -820,8 +826,11 @@ LIBS
 CPPFLAGS
 CPP
 PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 XMLTO
-FOP'
+FOP
+XSLTPROC'
 
 
 # Initialize some variables set by options.
@@ -1364,7 +1373,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 Xproto 7.0.20 to adapt to many kinds of systems.
+\`configure' configures Xproto 7.0.22 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1434,7 +1443,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Xproto 7.0.20:";;
+     short | recursive ) echo "Configuration of Xproto 7.0.22:";;
    esac
   cat <<\_ACEOF
 
@@ -1469,6 +1478,8 @@ Optional Packages:
   --with-xmlto            Use xmlto to regenerate documentation (default:
                           auto)
   --with-fop              Use fop to regenerate documentation (default: auto)
+  --with-xsltproc         Use xsltproc for the transformation of XML documents
+                          (default: auto)
 
 Some influential environment variables:
   CC          C compiler command
@@ -1480,8 +1491,13 @@ 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
   XMLTO       Path to xmlto command
   FOP         Path to fop command
+  XSLTPROC    Path to xsltproc command
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1549,7 +1565,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Xproto configure 7.0.20
+Xproto configure 7.0.22
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1908,7 +1924,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 Xproto $as_me 7.0.20, which was
+It was created by Xproto $as_me 7.0.22, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2723,7 +2739,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xproto'
- VERSION='7.0.20'
+ VERSION='7.0.22'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2787,7 +2803,7 @@ fi
 
 
 
-# Require xorg-macros minimum of 1.10 for DocBook XML documentation
+# Require xorg-macros minimum of 1.12 for DocBook external references
 
 
 
@@ -4355,6 +4371,10 @@ done
 
 
 
+
+
+
+
 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.
@@ -4467,7 +4487,6 @@ $as_echo "yes" >&6; }
 $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
-
 fi
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -4966,16 +4985,16 @@ $as_echo_n "checking the xmlto version... " >&6; }
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmlto_version" >&5
 $as_echo "$xmlto_version" >&6; }
     as_arg_v1=$xmlto_version
-as_arg_v2=0.0.20
+as_arg_v2=0.0.22
 awk "$as_awk_strverscmp" v1="$as_arg_v1" v2="$as_arg_v2" /dev/null
 case $? in #(
   1) :
     if test "x$use_xmlto" = xauto; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&5
-$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.20 needed" >&2;}
+            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&5
+$as_echo "$as_me: WARNING: xmlto version $xmlto_version found, but 0.0.22 needed" >&2;}
             have_xmlto=no
         else
-            as_fn_error $? "xmlto version $xmlto_version found, but 0.0.20 needed" "$LINENO" 5
+            as_fn_error $? "xmlto version $xmlto_version found, but 0.0.22 needed" "$LINENO" 5
         fi ;; #(
   0) :
      ;; #(
@@ -5141,12 +5160,141 @@ fi
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.5" >&5
-$as_echo_n "checking for X.Org SGML entities >= 1.5... " >&6; }
+
+
+
+# Check whether --with-xsltproc was given.
+if test "${with_xsltproc+set}" = set; then :
+  withval=$with_xsltproc; use_xsltproc=$withval
+else
+  use_xsltproc=auto
+fi
+
+
+
+if test "x$use_xsltproc" = x"auto"; then
+   # Extract the first word of "xsltproc", so it can be a program name with args.
+set dummy xsltproc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSLTPROC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSLTPROC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSLTPROC=$ac_cv_path_XSLTPROC
+if test -n "$XSLTPROC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test "x$XSLTPROC" = "x"; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: xsltproc not found - cannot transform XML documents" >&5
+$as_echo "$as_me: WARNING: xsltproc not found - cannot transform XML documents" >&2;}
+	have_xsltproc=no
+   else
+        have_xsltproc=yes
+   fi
+elif test "x$use_xsltproc" = x"yes" ; then
+   # Extract the first word of "xsltproc", so it can be a program name with args.
+set dummy xsltproc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_XSLTPROC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $XSLTPROC in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+XSLTPROC=$ac_cv_path_XSLTPROC
+if test -n "$XSLTPROC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5
+$as_echo "$XSLTPROC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+   if test "x$XSLTPROC" = "x"; then
+        as_fn_error $? "--with-xsltproc=yes specified but xsltproc not found in PATH" "$LINENO" 5
+   fi
+   have_xsltproc=yes
+elif test "x$use_xsltproc" = x"no" ; then
+   if test "x$XSLTPROC" != "x"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&5
+$as_echo "$as_me: WARNING: ignoring XSLTPROC environment variable since --with-xsltproc=no was specified" >&2;}
+   fi
+   have_xsltproc=no
+else
+   as_fn_error $? "--with-xsltproc expects 'yes' or 'no'" "$LINENO" 5
+fi
+
+# Checking for minimum version is not implemented
+# but we want to keep the interface consistent with other commands
+
+
+ if test "$have_xsltproc" = yes; then
+  HAVE_XSLTPROC_TRUE=
+  HAVE_XSLTPROC_FALSE='#'
+else
+  HAVE_XSLTPROC_TRUE='#'
+  HAVE_XSLTPROC_FALSE=
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X.Org SGML entities >= 1.8" >&5
+$as_echo_n "checking for X.Org SGML entities >= 1.8... " >&6; }
 XORG_SGML_PATH=
 if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.5\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.5") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xorg-sgml-doctools >= 1.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "xorg-sgml-doctools >= 1.8") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
@@ -5584,6 +5732,10 @@ if test -z "${HAVE_FOP_TRUE}" && test -z "${HAVE_FOP_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_FOP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_XSLTPROC_TRUE}" && test -z "${HAVE_XSLTPROC_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_XSLTPROC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_STYLESHEETS_TRUE}" && test -z "${HAVE_STYLESHEETS_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_STYLESHEETS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -5997,7 +6149,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 Xproto $as_me 7.0.20, which was
+This file was extended by Xproto $as_me 7.0.22, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6063,7 +6215,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="\\
-Xproto config.status 7.0.20
+Xproto config.status 7.0.22
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"