merge libXi 1.1.3

4 files changed, 23 insertions, 25 deletions

diff --git a/lib/libXi/Makefile.in b/lib/libXi/Makefile.in
index 0dfe69a22..b1552d9bf 100644
--- a/lib/libXi/Makefile.in
+++ b/lib/libXi/Makefile.in
@@ -655,7 +655,7 @@ uninstall-info: uninstall-info-recursive
 .PHONY: ChangeLog
 
 ChangeLog:
-	GIT_DIR=${srcdir}/.git git-log > ChangeLog
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 
 dist-hook: ChangeLog
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lib/libXi/configure b/lib/libXi/configure
index 311633af3..6b3ed906f 100644
--- a/lib/libXi/configure
+++ b/lib/libXi/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for libXi 1.0.2.
+# Generated by GNU Autoconf 2.59 for libXi 1.1.3.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='libXi'
 PACKAGE_TARNAME='libXi'
-PACKAGE_VERSION='1.0.2'
-PACKAGE_STRING='libXi 1.0.2'
+PACKAGE_VERSION='1.1.3'
+PACKAGE_STRING='libXi 1.1.3'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 # Factoring default headers for most tests.
@@ -965,7 +965,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 libXi 1.0.2 to adapt to many kinds of systems.
+\`configure' configures libXi 1.1.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1031,7 +1031,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libXi 1.0.2:";;
+     short | recursive ) echo "Configuration of libXi 1.1.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1179,7 +1179,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-libXi configure 1.0.2
+libXi configure 1.1.3
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1193,7 +1193,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libXi $as_me 1.0.2, which was
+It was created by libXi $as_me 1.1.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1836,7 +1836,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libXi'
- VERSION='1.0.2'
+ VERSION='1.1.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18691,12 +18691,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_XI_CFLAGS="$XI_CFLAGS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto x11 xextproto xext inputproto\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xproto x11 xextproto xext inputproto") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto x11 xextproto xext inputproto >= 1.4\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xproto x11 xextproto xext inputproto >= 1.4") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_XI_CFLAGS=`$PKG_CONFIG --cflags "xproto x11 xextproto xext inputproto" 2>/dev/null`
+  pkg_cv_XI_CFLAGS=`$PKG_CONFIG --cflags "xproto x11 xextproto xext inputproto >= 1.4" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18709,12 +18709,12 @@ if test -n "$PKG_CONFIG"; then
         pkg_cv_XI_LIBS="$XI_LIBS"
     else
         if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto x11 xextproto xext inputproto\"") >&5
-  ($PKG_CONFIG --exists --print-errors "xproto x11 xextproto xext inputproto") 2>&5
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xproto x11 xextproto xext inputproto >= 1.4\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xproto x11 xextproto xext inputproto >= 1.4") 2>&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-  pkg_cv_XI_LIBS=`$PKG_CONFIG --libs "xproto x11 xextproto xext inputproto" 2>/dev/null`
+  pkg_cv_XI_LIBS=`$PKG_CONFIG --libs "xproto x11 xextproto xext inputproto >= 1.4" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -18733,14 +18733,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        XI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto x11 xextproto xext inputproto"`
+	        XI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xproto x11 xextproto xext inputproto >= 1.4"`
         else
-	        XI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto x11 xextproto xext inputproto"`
+	        XI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xproto x11 xextproto xext inputproto >= 1.4"`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$XI_PKG_ERRORS" >&5
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (xproto x11 xextproto xext inputproto) were not met:
+	{ { echo "$as_me:$LINENO: error: Package requirements (xproto x11 xextproto xext inputproto >= 1.4) were not met:
 
 $XI_PKG_ERRORS
 
@@ -18751,7 +18751,7 @@ Alternatively, you may set the environment variables XI_CFLAGS
 and XI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.
 " >&5
-echo "$as_me: error: Package requirements (xproto x11 xextproto xext inputproto) were not met:
+echo "$as_me: error: Package requirements (xproto x11 xextproto xext inputproto >= 1.4) were not met:
 
 $XI_PKG_ERRORS
 
@@ -19370,7 +19370,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by libXi $as_me 1.0.2, which was
+This file was extended by libXi $as_me 1.1.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19433,7 +19433,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-libXi config.status 1.0.2
+libXi config.status 1.1.3
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/lib/libXi/man/Makefile.am b/lib/libXi/man/Makefile.am
index 51f1e3045..9efc88c2e 100644
--- a/lib/libXi/man/Makefile.am
+++ b/lib/libXi/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:23:03 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
@@ -72,7 +71,7 @@ XORGRELSTRING = @PACKAGE_STRING@
 SUFFIXES = .$(LIB_MAN_SUFFIX) .man
 
 .man.$(LIB_MAN_SUFFIX):
-	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' < $< > $@
+	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/;  s/__LIB_MAN_SUFFIX__/$(LIB_MAN_SUFFIX)/' < $< > $@
 
 # Generate man page shadow files (Replaces InstallManPageAliases from Imake)
 
diff --git a/lib/libXi/man/Makefile.in b/lib/libXi/man/Makefile.in
index 9648775a5..9fce3ba06 100644
--- a/lib/libXi/man/Makefile.in
+++ b/lib/libXi/man/Makefile.in
@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:23:03 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
@@ -489,7 +488,7 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA
 
 
 .man.$(LIB_MAN_SUFFIX):
-	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' < $< > $@
+	sed 's/__xorgversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/;  s/__LIB_MAN_SUFFIX__/$(LIB_MAN_SUFFIX)/' < $< > $@
 
 shadows.DONE:
 	-rm -f $(all_shadows:=.@LIB_MAN_SUFFIX@)