Hello community,
here is the log from the commit of package xorg-x11-proto-devel
checked in at Tue Dec 19 17:28:32 CET 2006.
--------
--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2006-12-04 00:01:57.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2006-12-17 12:05:17.000000000 +0100
@@ -1,0 +2,9 @@
+Sun Dec 17 12:04:13 CET 2006 - sndirsch@suse.de
+
+- updated util-macros to release 1.1.4
+ * Makefile.am: make ChangeLog hook safer
+- updated xproto to release 7.0.10
+ * Makefile.am: make ChangeLog hook safer
+ * don't distribute Xfuncproto.h and Xpoll.h
+
+-------------------------------------------------------------------
Old:
----
util-macros-1.1.3.tar.bz2
xproto-7.0.9.tar.bz2
New:
----
util-macros-1.1.4.tar.bz2
xproto-7.0.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.0G4WyE/_old 2006-12-19 17:28:22.000000000 +0100
+++ /var/tmp/diff_new_pack.0G4WyE/_new 2006-12-19 17:28:22.000000000 +0100
@@ -13,7 +13,7 @@
Name: xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.2
-Release: 10
+Release: 13
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
@@ -36,7 +36,7 @@
Source15: resourceproto-X11R7.0-1.0.2.tar.bz2
Source16: scrnsaverproto-X11R7.1-1.1.0.tar.bz2
Source17: trapproto-X11R7.0-3.4.3.tar.bz2
-Source18: util-macros-1.1.3.tar.bz2
+Source18: util-macros-1.1.4.tar.bz2
Source19: videoproto-X11R7.0-2.2.2.tar.bz2
Source20: windowswmproto-X11R7.0-1.0.3.tar.bz2
Source21: xcmiscproto-X11R7.0-1.1.2.tar.bz2
@@ -48,7 +48,7 @@
Source27: xf86rushproto-X11R7.0-1.1.2.tar.bz2
Source28: xf86vidmodeproto-X11R7.0-2.2.2.tar.bz2
Source29: xineramaproto-X11R7.0-1.1.2.tar.bz2
-Source30: xproto-7.0.9.tar.bz2
+Source30: xproto-7.0.10.tar.bz2
Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2
Source32: evieext-X11R7.0-1.0.2.tar.bz2
Source33: xcb-proto-1.0.tar.bz2
@@ -126,6 +126,12 @@
/usr/share/xcb/
%changelog -n xorg-x11-proto-devel
+* Sun Dec 17 2006 - sndirsch@suse.de
+- updated util-macros to release 1.1.4
+ * Makefile.am: make ChangeLog hook safer
+- updated xproto to release 7.0.10
+ * Makefile.am: make ChangeLog hook safer
+ * don't distribute Xfuncproto.h and Xpoll.h
* Sun Dec 03 2006 - sndirsch@suse.de
- udpated xcb-proto to release 1.0
- added libpthread-stubs (required since xcb 1.0)
++++++ util-macros-1.1.3.tar.bz2 -> util-macros-1.1.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.3/ChangeLog new/util-macros-1.1.4/ChangeLog
--- old/util-macros-1.1.3/ChangeLog 2006-11-30 21:05:50.000000000 +0100
+++ new/util-macros-1.1.4/ChangeLog 2006-12-16 00:14:52.000000000 +0100
@@ -1,3 +1,16 @@
+commit 0a4aadbda211a5128bae1c2e860b781c95c4bbf5
+Author: Daniel Stone
+Date: Sat Dec 16 01:14:27 2006 +0200
+
+ bump to 1.1.4
+
+commit eb371188086824c4655840dd72831d16fbfb17ce
+Author: Daniel Stone
+Date: Wed Dec 6 19:02:46 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+ Make ChangeLog hook as safe as possible.
+
commit e091014e3c7573a49ce51d67f359bd0f3d3e1893
Author: Daniel Stone
Date: Thu Nov 30 22:05:27 2006 +0200
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.3/Makefile.am new/util-macros-1.1.4/Makefile.am
--- old/util-macros-1.1.3/Makefile.am 2006-08-27 11:51:00.000000000 +0200
+++ new/util-macros-1.1.4/Makefile.am 2006-12-06 18:02:31.000000000 +0100
@@ -27,7 +27,7 @@
.PHONY: ChangeLog
ChangeLog:
- (cd $(srcdir) && 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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.3/Makefile.in new/util-macros-1.1.4/Makefile.in
--- old/util-macros-1.1.3/Makefile.in 2006-11-30 21:05:48.000000000 +0100
+++ new/util-macros-1.1.4/Makefile.in 2006-12-16 00:14:50.000000000 +0100
@@ -479,7 +479,7 @@
.PHONY: ChangeLog
ChangeLog:
- (cd $(srcdir) && 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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.3/aclocal.m4 new/util-macros-1.1.4/aclocal.m4
--- old/util-macros-1.1.3/aclocal.m4 2006-11-30 21:05:46.000000000 +0100
+++ new/util-macros-1.1.4/aclocal.m4 2006-12-16 00:14:48.000000000 +0100
@@ -385,10 +385,10 @@
AMDEPSHOWCMDSAT=''
AMPRETTYECHO=true
AMCMDECHO=echo
-if test "x$enable_pretty_cmds" == xyes;
+if test "x$enable_pretty_cmds" = xyes;
then
AMSHOWCMDSAT='@'
- _AM_IF_OPTION([no-dependencies],,test x$enable_dependency_tracking == xno &&) AMDEPSHOWCMDSAT='@'
+ _AM_IF_OPTION([no-dependencies],,test "x$enable_dependency_tracking" = xno &&) AMDEPSHOWCMDSAT='@'
AMPRETTYECHO=echo
AMCMDECHO=true
LT_QUIET='--quiet'
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.3/configure new/util-macros-1.1.4/configure
--- old/util-macros-1.1.3/configure 2006-11-30 21:05:47.000000000 +0100
+++ new/util-macros-1.1.4/configure 2006-12-16 00:14:49.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for util-macros 1.1.3.
+# Generated by GNU Autoconf 2.60 for util-macros 1.1.4.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='util-macros'
PACKAGE_TARNAME='util-macros'
-PACKAGE_VERSION='1.1.3'
-PACKAGE_STRING='util-macros 1.1.3'
+PACKAGE_VERSION='1.1.4'
+PACKAGE_STRING='util-macros 1.1.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1134,7 +1134,7 @@
# 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 util-macros 1.1.3 to adapt to many kinds of systems.
+\`configure' configures util-macros 1.1.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1200,7 +1200,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of util-macros 1.1.3:";;
+ short | recursive ) echo "Configuration of util-macros 1.1.4:";;
esac
cat <<\_ACEOF
@@ -1278,7 +1278,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-util-macros configure 1.1.3
+util-macros configure 1.1.4
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1292,7 +1292,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by util-macros $as_me 1.1.3, which was
+It was created by util-macros $as_me 1.1.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -1951,10 +1951,10 @@
AMDEPSHOWCMDSAT=''
AMPRETTYECHO=true
AMCMDECHO=echo
-if test "x$enable_pretty_cmds" == xyes;
+if test "x$enable_pretty_cmds" = xyes;
then
AMSHOWCMDSAT='@'
- test x$enable_dependency_tracking == xno && AMDEPSHOWCMDSAT='@'
+ test "x$enable_dependency_tracking" = xno && AMDEPSHOWCMDSAT='@'
AMPRETTYECHO=echo
AMCMDECHO=true
LT_QUIET='--quiet'
@@ -1985,7 +1985,7 @@
# Define the identity of the package.
PACKAGE='util-macros'
- VERSION='1.1.3'
+ VERSION='1.1.4'
cat >>confdefs.h <<_ACEOF
@@ -2566,7 +2566,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by util-macros $as_me 1.1.3, which was
+This file was extended by util-macros $as_me 1.1.4, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2609,7 +2609,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-util-macros config.status 1.1.3
+util-macros config.status 1.1.4
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.3/configure.ac new/util-macros-1.1.4/configure.ac
--- old/util-macros-1.1.3/configure.ac 2006-11-30 21:05:21.000000000 +0100
+++ new/util-macros-1.1.4/configure.ac 2006-12-16 00:14:19.000000000 +0100
@@ -23,7 +23,7 @@
AC_PREREQ([2.57])
AC_INIT([util-macros],
- [1.1.3],
+ [1.1.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/util-macros-1.1.3/xorg-macros.m4 new/util-macros-1.1.4/xorg-macros.m4
--- old/util-macros-1.1.3/xorg-macros.m4 2006-11-30 21:05:50.000000000 +0100
+++ new/util-macros-1.1.4/xorg-macros.m4 2006-12-16 00:14:52.000000000 +0100
@@ -45,7 +45,7 @@
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.3
+ [XORG_MACROS_version=1.1.4
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
++++++ xproto-7.0.9.tar.bz2 -> xproto-7.0.10.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/ChangeLog new/xproto-7.0.10/ChangeLog
--- old/xproto-7.0.9/ChangeLog 2006-10-25 23:46:26.000000000 +0200
+++ new/xproto-7.0.10/ChangeLog 2006-12-16 00:11:02.000000000 +0100
@@ -1,3 +1,23 @@
+commit 5951f0355c6b1c591241bccb2023e6c4d493e701
+Author: Daniel Stone
+Date: Sat Dec 16 01:09:50 2006 +0200
+
+ bump to 7.0.10
+
+commit 0422755ef9373fbb6f69fbb599d791331837f747
+Author: Daniel Stone
+Date: Sat Dec 16 01:09:44 2006 +0200
+
+ don't distribute Xfuncproto.h and Xpoll.h
+ Don't distribute these two files, as they're generated during the build.
+
+commit cf44526713681ccfb6ef929a9c25ea650c5d1a32
+Author: Daniel Stone
+Date: Wed Dec 6 19:02:19 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+ Make ChangeLog hook as safe as possible.
+
commit 528e313fd1f1ae6f2303d3963afe41545f55ef88
Author: Daniel Stone
Date: Thu Oct 26 00:45:44 2006 +0300
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/Makefile.am new/xproto-7.0.10/Makefile.am
--- old/xproto-7.0.9/Makefile.am 2006-09-21 13:55:24.000000000 +0200
+++ new/xproto-7.0.10/Makefile.am 2006-12-16 00:07:48.000000000 +0100
@@ -11,14 +11,12 @@
Xatom.h \
Xdefs.h \
XF86keysym.h \
- Xfuncproto.h \
Xfuncs.h \
X.h \
Xmd.h \
Xosdefs.h \
Xos.h \
Xos_r.h \
- Xpoll.h \
Xproto.h \
Xprotostr.h \
Xthreads.h \
@@ -27,6 +25,10 @@
Xwindows.h \
Xwinsock.h
+nodist_xproto_HEADERS = \
+ Xfuncproto.h \
+ Xpoll.h
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xproto.pc
@@ -37,7 +39,7 @@
.PHONY: ChangeLog
ChangeLog:
- (cd $(srcdir) && 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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/Makefile.in new/xproto-7.0.10/Makefile.in
--- old/xproto-7.0.9/Makefile.in 2006-10-25 21:49:12.000000000 +0200
+++ new/xproto-7.0.10/Makefile.in 2006-12-16 00:08:25.000000000 +0100
@@ -61,11 +61,13 @@
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xprotodir)"
+am__installdirs = "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xprotodir)" \
+ "$(DESTDIR)$(xprotodir)"
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
+nodist_xprotoHEADERS_INSTALL = $(INSTALL_HEADER)
xprotoHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(xproto_HEADERS)
+HEADERS = $(nodist_xproto_HEADERS) $(xproto_HEADERS)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -80,8 +82,12 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
+AMCMDECHO = @AMCMDECHO@
+AMDEPSHOWCMDSAT = @AMDEPSHOWCMDSAT@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
+AMPRETTYECHO = @AMPRETTYECHO@
+AMSHOWCMDSAT = @AMSHOWCMDSAT@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
@@ -106,6 +112,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
+LT_QUIET = @LT_QUIET@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
@@ -176,14 +183,12 @@
Xatom.h \
Xdefs.h \
XF86keysym.h \
- Xfuncproto.h \
Xfuncs.h \
X.h \
Xmd.h \
Xosdefs.h \
Xos.h \
Xos_r.h \
- Xpoll.h \
Xproto.h \
Xprotostr.h \
Xthreads.h \
@@ -192,6 +197,10 @@
Xwindows.h \
Xwinsock.h
+nodist_xproto_HEADERS = \
+ Xfuncproto.h \
+ Xpoll.h
+
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xproto.pc
EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog
@@ -206,33 +215,40 @@
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
+ @AMPRETTYECHO@ ' [AUTOMAKE ] rebuild all'; \
+ @AMCMDECHO@ ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
cd $(srcdir) && $(AUTOMAKE) --foreign \
&& exit 0; \
exit 1;; \
esac; \
done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
+ @AMPRETTYECHO@ ' [AUTOMAKE ] Makefile'; \
+ @AMCMDECHO@ ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
- echo ' $(SHELL) ./config.status'; \
+ @AMPRETTYECHO@ ' [SH ] config.status'; \
+ @AMCMDECHO@ ' $(SHELL) ./config.status'; \
$(SHELL) ./config.status;; \
*) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
+ @AMPRETTYECHO@ ' [SH ] config.status $@'; \
+ @AMCMDECHO@ ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
esac;
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- $(SHELL) ./config.status --recheck
+ @@AMPRETTYECHO@ ' [SH ] config.status'
+ @AMSHOWCMDSAT@$(SHELL) ./config.status --recheck
$(top_srcdir)/configure: $(am__configure_deps)
- cd $(srcdir) && $(AUTOCONF)
+ @@AMPRETTYECHO@ ' [AUTOCONF ] Regenerate'
+ @AMSHOWCMDSAT@cd $(srcdir) && $(AUTOCONF)
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ @@AMPRETTYECHO@ ' [ACLOCAL ] Regenerate'
+ @AMSHOWCMDSAT@cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
do-not-use-config.h: stamp-h1
@if test ! -f $@; then \
@@ -242,11 +258,13 @@
stamp-h1: $(srcdir)/do-not-use-config.h.in $(top_builddir)/config.status
@rm -f stamp-h1
- cd $(top_builddir) && $(SHELL) ./config.status do-not-use-config.h
+ @@AMPRETTYECHO@ ' [SH ] Regenerate do-not-use-config.h'
+ @AMSHOWCMDSAT@cd $(top_builddir) && $(SHELL) ./config.status do-not-use-config.h
$(srcdir)/do-not-use-config.h.in: $(am__configure_deps)
- cd $(top_srcdir) && $(AUTOHEADER)
- rm -f stamp-h1
- touch $@
+ @@AMPRETTYECHO@ ' [AUTOHEADER] Regenerate'
+ @AMSHOWCMDSAT@cd $(top_srcdir) && $(AUTOHEADER)
+ @AMSHOWCMDSAT@rm -f stamp-h1
+ @AMSHOWCMDSAT@touch $@
Xfuncproto.h: stamp-h2
@if test ! -f $@; then \
@@ -256,10 +274,12 @@
stamp-h2: $(srcdir)/Xfuncproto.h.in $(top_builddir)/config.status
@rm -f stamp-h2
- cd $(top_builddir) && $(SHELL) ./config.status Xfuncproto.h
+ @@AMPRETTYECHO@ ' [SH ] Regenerate Xfuncproto.h'
+ @AMSHOWCMDSAT@cd $(top_builddir) && $(SHELL) ./config.status Xfuncproto.h
distclean-hdr:
- -rm -f do-not-use-config.h stamp-h1 Xfuncproto.h stamp-h2
+ @@AMPRETTYECHO@ ' [RM ] do-not-use-config.h stamp-h1 Xfuncproto.h stamp-h2'
+ @AMSHOWCMDSAT@-rm -f do-not-use-config.h stamp-h1 Xfuncproto.h stamp-h2
Xpoll.h: $(top_builddir)/config.status $(srcdir)/Xpoll.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
xproto.pc: $(top_builddir)/config.status $(srcdir)/xproto.pc.in
@@ -267,11 +287,13 @@
uninstall-info-am:
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ @@AMPRETTYECHO@ ' [MKDIR ] $(DESTDIR)$(pkgconfigdir)'
+ @AMSHOWCMDSAT@test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ @AMPRETTYECHO@ " [INSTALL ] '$$d$$p' -> '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ @AMCMDECHO@ " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
$(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
done
@@ -279,16 +301,39 @@
@$(NORMAL_UNINSTALL)
@list='$(pkgconfig_DATA)'; for p in $$list; do \
f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
+ @AMPRETTYECHO@ " [RM ] $(DESTDIR)$(pkgconfigdir)/$$f"; \
+ @AMCMDECHO@ " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
done
+install-nodist_xprotoHEADERS: $(nodist_xproto_HEADERS)
+ @$(NORMAL_INSTALL)
+ @@AMPRETTYECHO@ ' [MKDIR ] $(DESTDIR)$(xprotodir)'
+ @AMSHOWCMDSAT@test -z "$(xprotodir)" || $(mkdir_p) "$(DESTDIR)$(xprotodir)"
+ @list='$(nodist_xproto_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ @AMPRETTYECHO@ " [INSTALL ] '$$d$$p' -> '$(DESTDIR)$(xprotodir)/$$f'"; \
+ @AMCMDECHO@ " $(nodist_xprotoHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xprotodir)/$$f'"; \
+ $(nodist_xprotoHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xprotodir)/$$f"; \
+ done
+
+uninstall-nodist_xprotoHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(nodist_xproto_HEADERS)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ @AMPRETTYECHO@ " [RM ] $(DESTDIR)$(xprotodir)/$$f"; \
+ @AMCMDECHO@ " rm -f '$(DESTDIR)$(xprotodir)/$$f'"; \
+ rm -f "$(DESTDIR)$(xprotodir)/$$f"; \
+ done
install-xprotoHEADERS: $(xproto_HEADERS)
@$(NORMAL_INSTALL)
- test -z "$(xprotodir)" || $(mkdir_p) "$(DESTDIR)$(xprotodir)"
+ @@AMPRETTYECHO@ ' [MKDIR ] $(DESTDIR)$(xprotodir)'
+ @AMSHOWCMDSAT@test -z "$(xprotodir)" || $(mkdir_p) "$(DESTDIR)$(xprotodir)"
@list='$(xproto_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
- echo " $(xprotoHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xprotodir)/$$f'"; \
+ @AMPRETTYECHO@ " [INSTALL ] '$$d$$p' -> '$(DESTDIR)$(xprotodir)/$$f'"; \
+ @AMCMDECHO@ " $(xprotoHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(xprotodir)/$$f'"; \
$(xprotoHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(xprotodir)/$$f"; \
done
@@ -296,23 +341,25 @@
@$(NORMAL_UNINSTALL)
@list='$(xproto_HEADERS)'; for p in $$list; do \
f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(xprotodir)/$$f'"; \
+ @AMPRETTYECHO@ " [RM ] $(DESTDIR)$(xprotodir)/$$f"; \
+ @AMCMDECHO@ " rm -f '$(DESTDIR)$(xprotodir)/$$f'"; \
rm -f "$(DESTDIR)$(xprotodir)/$$f"; \
done
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ @AMSHOWCMDSAT@list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
+ @AMPRETTYECHO@ ' [MKID ] $$unique'; \
mkid -fID $$unique
tags: TAGS
TAGS: $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ @AMSHOWCMDSAT@tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) do-not-use-config.h.in Xfuncproto.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -322,13 +369,14 @@
END { for (i in files) print i; }'`; \
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
test -n "$$unique" || unique=$$empty_fix; \
+ @AMPRETTYECHO@ " [ETAGS ] $$tags"; \
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique; \
fi
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) do-not-use-config.h.in Xfuncproto.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
- tags=; \
+ @AMSHOWCMDSAT@tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) do-not-use-config.h.in Xfuncproto.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -337,21 +385,27 @@
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
+ || ( \
+ @AMPRETTYECHO@ " [CTAGS ] $$tags"; \
+ $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique )
GTAGS:
- here=`$(am__cd) $(top_builddir) && pwd` \
+ @@AMPRETTYECHO@ ' [GTAGS ]'
+ @AMSHOWCMDSAT@here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ @@AMPRETTYECHO@ ' [RM ] TAGS ID GTAGS GRTAGS GSYMS GPATH tags'
+ @AMSHOWCMDSAT@-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/.
+ @AMSHOWCMDSAT@$(am__remove_distdir)
+ @@AMPRETTYECHO@ ' [MKDIR ] $(distdir)'
+ @AMSHOWCMDSAT@mkdir $(distdir)
+ @@AMPRETTYECHO@ ' [MKDIR ] $(distdir)/.'
+ @AMSHOWCMDSAT@$(mkdir_p) $(distdir)/.
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -378,59 +432,71 @@
|| exit 1; \
fi; \
done
- $(MAKE) $(AM_MAKEFLAGS) \
+ @AMSHOWCMDSAT@$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+ @AMSHOWCMDSAT@-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r $(distdir)
+ || ( @AMPRETTYECHO@ ' [CHMOD ] a+r $(distdir)'; chmod -R a+r $(distdir) )
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
+ @@AMPRETTYECHO@ ' [TAR.GZ ] $(distdir).tar.gz'
+ @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ @AMSHOWCMDSAT@$(am__remove_distdir)
dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ @@AMPRETTYECHO@ ' [TAR.BZ2 ] $(distdir).tar.bz2'
+ @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ @AMSHOWCMDSAT@$(am__remove_distdir)
dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
+ @@AMPRETTYECHO@ ' [TAR.Z ] $(distdir).tar.Z'
+ @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+ @AMSHOWCMDSAT@$(am__remove_distdir)
dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
+ @@AMPRETTYECHO@ ' [SHAR.GZ ] $(distdir).shar.gz'
+ @AMSHOWCMDSAT@shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ @AMSHOWCMDSAT@$(am__remove_distdir)
dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
+ @@AMPRETTYECHO@ ' [ZIP ] $(distdir).zip'
+ @AMSHOWCMDSAT@-rm -f $(distdir).zip
+ @AMSHOWCMDSAT@zip -rq $(distdir).zip $(distdir)
+ @AMSHOWCMDSAT@$(am__remove_distdir)
dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
+ @@AMPRETTYECHO@ ' [TAR.GZ ] $(distdir).tar.gz'
+ @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ @@AMPRETTYECHO@ ' [TAR.BZ2 ] $(distdir).tar.bz2'
+ @AMSHOWCMDSAT@tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+ @AMSHOWCMDSAT@$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
# it guarantees that the distribution is self-contained by making another
# tarfile.
distcheck: dist
- case '$(DIST_ARCHIVES)' in \
+ @AMSHOWCMDSAT@case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
+ @AMPRETTYECHO@ ' [UNTAR.GZ ] $(distdir).tar.gz'; \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
+ @AMPRETTYECHO@ ' [UNTAR.BZ2 ] $(distdir).tar.bz2'; \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.Z*) \
+ @AMPRETTYECHO@ ' [UNTAR.Z ] $(distdir).tar.Z'; \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
+ @AMPRETTYECHO@ ' [UNSHAR.GZ ] $(distdir).shar.gz'; \
GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
*.zip*) \
+ @AMPRETTYECHO@ ' [UNZIP ] $(distdir).zip'; \
unzip $(distdir).zip ;;\
esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
+ @AMSHOWCMDSAT@chmod -R a-w $(distdir); chmod a+w $(distdir)
+ @AMSHOWCMDSAT@mkdir $(distdir)/_build
+ @AMSHOWCMDSAT@mkdir $(distdir)/_inst
+ @AMSHOWCMDSAT@chmod a-w $(distdir)
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& cd $(distdir)/_build \
@@ -482,8 +548,8 @@
check: check-am
all-am: Makefile $(DATA) $(HEADERS) do-not-use-config.h Xfuncproto.h
installdirs:
- for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xprotodir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ @AMSHOWCMDSAT@for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(xprotodir)" "$(DESTDIR)$(xprotodir)"; do \
+ test -z "$$dir" || ( @AMPRETTYECHO@ " [MKDIR ] $$dir"; $(mkdir_p) "$$dir" ); \
done
install: install-am
install-exec: install-exec-am
@@ -495,17 +561,19 @@
installcheck: installcheck-am
install-strip:
- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ @AMSHOWCMDSAT@$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
`test -z '$(STRIP)' || \
echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
clean-generic:
+ @@AMPRETTYECHO@ ' [RM ] $(CLEANFILES)'
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
distclean-generic:
- -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ @@AMPRETTYECHO@ ' [RM ] $(CONFIG_CLEAN_FILES)'
+ @AMSHOWCMDSAT@-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@@ -515,8 +583,10 @@
clean-am: clean-generic mostlyclean-am
distclean: distclean-am
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -f Makefile
+ @@AMPRETTYECHO@ ' [RM ] $(am__CONFIG_DISTCLEAN_FILES)'
+ @AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ @@AMPRETTYECHO@ ' [RM ] Makefile'
+ @AMSHOWCMDSAT@-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
dvi: dvi-am
@@ -529,7 +599,8 @@
info-am:
-install-data-am: install-pkgconfigDATA install-xprotoHEADERS
+install-data-am: install-nodist_xprotoHEADERS install-pkgconfigDATA \
+ install-xprotoHEADERS
install-exec-am:
@@ -540,9 +611,12 @@
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf $(top_srcdir)/autom4te.cache
- -rm -f Makefile
+ @@AMPRETTYECHO@ ' [RM ] $(am__CONFIG_DISTCLEAN_FILES)'
+ @AMSHOWCMDSAT@-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ @@AMPRETTYECHO@ ' [RM ] autom4te.cache/'
+ @AMSHOWCMDSAT@-rm -rf $(top_srcdir)/autom4te.cache
+ @@AMPRETTYECHO@ ' [RM ] Makefile'
+ @AMSHOWCMDSAT@-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-am
@@ -557,8 +631,8 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA \
- uninstall-xprotoHEADERS
+uninstall-am: uninstall-info-am uninstall-nodist_xprotoHEADERS \
+ uninstall-pkgconfigDATA uninstall-xprotoHEADERS
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
clean-generic ctags dist dist-all dist-bzip2 dist-gzip \
@@ -567,18 +641,19 @@
distdir distuninstallcheck dvi dvi-am html html-am info \
info-am install install-am install-data install-data-am \
install-exec install-exec-am install-info install-info-am \
- install-man install-pkgconfigDATA install-strip \
- install-xprotoHEADERS installcheck installcheck-am installdirs \
- maintainer-clean maintainer-clean-generic mostlyclean \
- mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
- uninstall-am uninstall-info-am uninstall-pkgconfigDATA \
+ install-man install-nodist_xprotoHEADERS install-pkgconfigDATA \
+ install-strip install-xprotoHEADERS installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am tags uninstall uninstall-am uninstall-info-am \
+ uninstall-nodist_xprotoHEADERS uninstall-pkgconfigDATA \
uninstall-xprotoHEADERS
.PHONY: ChangeLog
ChangeLog:
- (cd $(srcdir) && 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 -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/Xfuncproto.h new/xproto-7.0.10/Xfuncproto.h
--- old/xproto-7.0.9/Xfuncproto.h 2006-10-25 23:45:48.000000000 +0200
+++ new/xproto-7.0.10/Xfuncproto.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,118 +0,0 @@
-/* Xfuncproto.h. Generated from Xfuncproto.h.in by configure. */
-/* $Xorg: Xfuncproto.h,v 1.4 2001/02/09 02:03:22 xorgcvs Exp $ */
-/*
- *
-Copyright 1989, 1991, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
- *
- */
-/* $XFree86: xc/include/Xfuncproto.h,v 3.4 2001/12/14 19:53:25 dawes Exp $ */
-
-/* Definitions to make function prototypes manageable */
-
-#ifndef _XFUNCPROTO_H_
-#define _XFUNCPROTO_H_
-
-#ifndef NeedFunctionPrototypes
-#define NeedFunctionPrototypes 1
-#endif /* NeedFunctionPrototypes */
-
-#ifndef NeedVarargsPrototypes
-#define NeedVarargsPrototypes 1
-#endif /* NeedVarargsPrototypes */
-
-#if NeedFunctionPrototypes
-
-#ifndef NeedNestedPrototypes
-#define NeedNestedPrototypes 1
-#endif /* NeedNestedPrototypes */
-
-#ifndef _Xconst
-#define _Xconst const
-#endif /* _Xconst */
-
-/* Function prototype configuration (see configure for more info) */
-#ifndef NARROWPROTO
-#define NARROWPROTO
-#endif
-#ifndef FUNCPROTO
-#define FUNCPROTO 15
-#endif
-
-#ifndef NeedWidePrototypes
-#ifdef NARROWPROTO
-#define NeedWidePrototypes 0
-#else
-#define NeedWidePrototypes 1 /* default to make interropt. easier */
-#endif
-#endif /* NeedWidePrototypes */
-
-#endif /* NeedFunctionPrototypes */
-
-#ifndef _XFUNCPROTOBEGIN
-#if defined(__cplusplus) || defined(c_plusplus) /* for C++ V2.0 */
-#define _XFUNCPROTOBEGIN extern "C" { /* do not leave open across includes */
-#define _XFUNCPROTOEND }
-#else
-#define _XFUNCPROTOBEGIN
-#define _XFUNCPROTOEND
-#endif
-#endif /* _XFUNCPROTOBEGIN */
-
-#if defined(__GNUC__) && (__GNUC__ >= 4)
-# define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
-# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
-#else
-# define _X_SENTINEL(x)
-# define _X_ATTRIBUTE_PRINTF(x,y)
-#endif /* GNUC >= 4 */
-
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303)
-# define _X_EXPORT __attribute__((visibility("default")))
-# define _X_HIDDEN __attribute__((visibility("hidden")))
-# define _X_INTERNAL __attribute__((visibility("internal")))
-# define _X_LIKELY(x) __builtin_expect(!!(x), 1)
-# define _X_UNLIKELY(x) __builtin_expect(!!(x), 0)
-# define _X_INLINE inline
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-# define _X_EXPORT __global
-# define _X_HIDDEN __hidden
-# define _X_INTERNAL __hidden
-# define _X_LIKELY(x) (x)
-# define _X_UNLIKELY(x) (x)
-# define _X_INLINE inline
-#else /* not gcc >= 3.3 and not Sun Studio >= 8 */
-# define _X_EXPORT
-# define _X_HIDDEN
-# define _X_INTERNAL
-# define _X_LIKELY(x) (x)
-# define _X_UNLIKELY(x) (x)
-# define _X_INLINE
-#endif
-
-#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 301)
-# define _X_DEPRECATED __attribute__((deprecated))
-#else /* not gcc >= 3.1 */
-# define _X_DEPRECATED
-#endif
-
-#endif /* _XFUNCPROTO_H_ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/Xpoll.h new/xproto-7.0.10/Xpoll.h
--- old/xproto-7.0.9/Xpoll.h 2006-10-25 21:49:15.000000000 +0200
+++ new/xproto-7.0.10/Xpoll.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,255 +0,0 @@
-/* $Xorg: Xpoll.h,v 1.4 2001/02/09 02:03:23 xorgcvs Exp $ */
-
-/*
-
-Copyright 1994, 1998 The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall
-not be used in advertising or otherwise to promote the sale, use or
-other dealings in this Software without prior written authorization
-from The Open Group.
-
-*/
-
-/*
- * Copyright © 2005 Daniel Stone
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Daniel Stone not be used in advertising
- * or publicity pertaining to distribution of the software without specific,
- * written prior permission. Daniel Stone makes no representations about the
- * suitability of this software for any purpose. It is provided "as is"
- * without express or implied warranty.
- *
- * DANIEL STONE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * DANIEL STONE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*/
-
-/* $XFree86: xc/include/Xpoll.h,v 3.8 2001/01/17 17:53:11 dawes Exp $ */
-
-#ifndef _XPOLL_H_
-#define _XPOLL_H_
-
-#ifndef WIN32
-
-#ifndef USE_POLL
-
-#include
-
-/* Below is the monster branch from hell. Basically, most systems will drop to
- * 'the branch below is the fallthrough for halfway modern systems', and include
- * , so we get the FD_* macros. */
-#if !defined(DGUX)
-# if (defined(SVR4) || defined(CRAY) || defined(AIXV3)) && !defined(FD_SETSIZE)
-# include
-# ifdef luna
-# include
-# endif
-# else /* not SVR4/CRAY/AIXv3 */
-# if defined(AIXV4) /* AIX 4.2 fubar-ed , so try really hard. */
-# if !defined(NFDBITS)
-# include
-# endif
-# else /* the branch below is the fallthrough for halfway modern systems */
-# ifdef __QNX__ /* Make sure we get 256 bit select masks */
-# define FD_SETSIZE 256
-# endif
-# include
-# endif
-# endif
-#else /* DGUX -- No sys/select in Intel DG/ux */
-# include
-# include
-# include
-#endif
-
-#include
-
-#ifdef CSRG_BASED
-#include
-# if BSD < 199103
-typedef long fd_mask;
-# endif
-#endif
-
-#define XFD_SETSIZE 256
-
-#ifndef FD_SETSIZE
-#define FD_SETSIZE XFD_SETSIZE
-#endif
-
-#ifndef NBBY
-#define NBBY 8 /* number of bits in a byte */
-#endif
-
-#ifndef NFDBITS
-#define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */
-#endif
-
-#ifndef howmany
-#define howmany(x,y) (((x)+((y)-1))/(y))
-#endif
-
-#if defined(BSD) && BSD < 198911 && !defined(luna)
-typedef struct fd_set {
- fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)];
-} fd_set;
-#endif
-
-#ifndef hpux /* and perhaps old BSD ??? */
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-#else
-# ifndef _XPG4_EXTENDED /* HPUX 9.x and earlier */
-# define Select(n,r,w,e,t) select(n,(int*)r,(int*)w,(int*)e,(struct timeval*)t)
-# else
-# define Select(n,r,w,e,t) select(n,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-# endif
-#endif
-
-#define __X_FDS_BITS __fds_bits
-
-#ifndef __FDS_BITS
-# define __FDS_BITS(p) ((p)->__X_FDS_BITS)
-#endif
-
-#define __XFDS_BITS(p, n) (__FDS_BITS(p))[n]
-
-#ifndef FD_SET
-#define FD_SET(n, p) (__XFDS_BITS(p, ((n)/NFDBITS)) |= ((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_CLR
-#define FD_CLR(n, p) (__XFDS_BITS((p), ((n)/NFDBITS)) &= ~((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_ISSET
-#define FD_ISSET(n, p) ((__XFDS_BITS((p), ((n)/NFDBITS))) & ((fd_mask)1 << ((n) % NFDBITS)))
-#endif
-#ifndef FD_ZERO
-#define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))
-#endif
-
-/*
- * The howmany(FD_SETSIZE, NFDBITS) computes the number of elements in the
- * array. before accessing an element in the array we check it exists.
- * If it does not exist then the compiler discards the code to access it.
- */
-#define XFD_ANYSET(p) \
- ((howmany(FD_SETSIZE, NFDBITS) > 0 && (__XFDS_BITS(p, 0))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 1 && (__XFDS_BITS(p, 1))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 2 && (__XFDS_BITS(p, 2))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 3 && (__XFDS_BITS(p, 3))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 4 && (__XFDS_BITS(p, 4))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 5 && (__XFDS_BITS(p, 5))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 6 && (__XFDS_BITS(p, 6))) || \
- (howmany(FD_SETSIZE, NFDBITS) > 7 && (__XFDS_BITS(p, 7))))
-
-#define XFD_COPYSET(src,dst) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = __XFDS_BITS((src), __i__); \
- }
-#define XFD_ANDSET(dst,b1,b2) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) & (__XFDS_BITS((b2), __i__))); \
- }
-#define XFD_ORSET(dst,b1,b2) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) = ((__XFDS_BITS((b1), __i__)) | (__XFDS_BITS((b2), __i__))); \
- }
-#define XFD_UNSET(dst,b1) { \
- int __i__; \
- for (__i__ = 0; __i__ < howmany(FD_SETSIZE, NFDBITS); __i__++) \
- __XFDS_BITS((dst), __i__) &= ~(__XFDS_BITS((b1), __i__)); \
- }
-
-#else /* USE_POLL */
-#include
-#endif /* USE_POLL */
-
-#else /* WIN32 */
-
-#define XFD_SETSIZE 256
-#ifndef FD_SETSIZE
-#define FD_SETSIZE XFD_SETSIZE
-#endif
-#include
-
-#define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval*)t)
-
-#define XFD_SETCOUNT(p) (((fd_set FAR *)(p))->fd_count)
-#define XFD_FD(p,i) (((fd_set FAR *)(p))->fd_array[i])
-#define XFD_ANYSET(p) XFD_SETCOUNT(p)
-
-#define XFD_COPYSET(src,dst) { \
- u_int __i; \
- FD_ZERO(dst); \
- for (__i = 0; __i < XFD_SETCOUNT(src) ; __i++) { \
- XFD_FD(dst,__i) = XFD_FD(src,__i); \
- } \
- XFD_SETCOUNT(dst) = XFD_SETCOUNT(src); \
-}
-
-#define XFD_ANDSET(dst,b1,b2) { \
- u_int __i; \
- FD_ZERO(dst); \
- for (__i = 0; __i < XFD_SETCOUNT(b1) ; __i++) { \
- if (FD_ISSET(XFD_FD(b1,__i), b2)) \
- FD_SET(XFD_FD(b1,__i), dst); \
- } \
-}
-
-#define XFD_ORSET(dst,b1,b2) { \
- u_int __i; \
- if (dst != b1) XFD_COPYSET(b1,dst); \
- for (__i = 0; __i < XFD_SETCOUNT(b2) ; __i++) { \
- if (!FD_ISSET(XFD_FD(b2,__i), dst)) \
- FD_SET(XFD_FD(b2,__i), dst); \
- } \
-}
-
-/* this one is really sub-optimal */
-#define XFD_UNSET(dst,b1) { \
- u_int __i; \
- for (__i = 0; __i < XFD_SETCOUNT(b1) ; __i++) { \
- FD_CLR(XFD_FD(b1,__i), dst); \
- } \
-}
-
-/* we have to pay the price of having an array here, unlike with bitmasks
- calling twice FD_SET with the same fd is not transparent, so be careful */
-#undef FD_SET
-#define FD_SET(fd,set) do { \
- if (XFD_SETCOUNT(set) < FD_SETSIZE && !FD_ISSET(fd,set)) \
- XFD_FD(set,XFD_SETCOUNT(set)++)=(fd); \
-} while(0)
-
-#define getdtablesize() FD_SETSIZE
-
-#endif /* WIN32 */
-
-#endif /* _XPOLL_H_ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/aclocal.m4 new/xproto-7.0.10/aclocal.m4
--- old/xproto-7.0.9/aclocal.m4 2006-10-25 21:49:10.000000000 +0200
+++ new/xproto-7.0.10/aclocal.m4 2006-12-16 00:08:23.000000000 +0100
@@ -40,7 +40,8 @@
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -53,6 +54,23 @@
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\).*/\1/p'`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\).*/\2/p'`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([[^\.]]\+\)\.\([[^\.]]\+\)\.\([[^\.]]\+\).*/\3/p'`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
@@ -475,6 +493,7 @@
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
])
+AC_REQUIRE([AM_PRETTY_CMDS])
])
@@ -716,6 +735,42 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# serial 8
+
+
+# AM_PRETTY_CMDS
+# ------------
+AC_DEFUN([AM_PRETTY_CMDS],
+[AC_ARG_ENABLE(pretty-cmds,
+[ --disable-pretty-cmds show all commands executed
+ --enable-pretty-cmds do not output the entire command lines])
+AMSHOWCMDSAT=''
+AMDEPSHOWCMDSAT=''
+AMPRETTYECHO=true
+AMCMDECHO=echo
+if test "x$enable_pretty_cmds" = xyes;
+then
+ AMSHOWCMDSAT='@'
+ _AM_IF_OPTION([no-dependencies],,test "x$enable_dependency_tracking" = xno &&) AMDEPSHOWCMDSAT='@'
+ AMPRETTYECHO=echo
+ AMCMDECHO=true
+ LT_QUIET='--quiet'
+fi
+AC_SUBST([AMSHOWCMDSAT])
+AC_SUBST([AMDEPSHOWCMDSAT])
+AC_SUBST([AMPRETTYECHO])
+AC_SUBST([AMCMDECHO])
+AC_SUBST([LT_QUIET])
+])
+
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/configure new/xproto-7.0.10/configure
--- old/xproto-7.0.9/configure 2006-10-25 21:49:12.000000000 +0200
+++ new/xproto-7.0.10/configure 2006-12-16 00:08:24.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for Xproto 7.0.9.
+# Generated by GNU Autoconf 2.60 for Xproto 7.0.10.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='Xproto'
PACKAGE_TARNAME='xproto'
-PACKAGE_VERSION='7.0.9'
-PACKAGE_STRING='Xproto 7.0.9'
+PACKAGE_VERSION='7.0.10'
+PACKAGE_STRING='Xproto 7.0.10'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -621,6 +621,11 @@
AMTAR
am__tar
am__untar
+AMSHOWCMDSAT
+AMDEPSHOWCMDSAT
+AMPRETTYECHO
+AMCMDECHO
+LT_QUIET
build
build_cpu
build_vendor
@@ -1158,7 +1163,7 @@
# 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.9 to adapt to many kinds of systems.
+\`configure' configures Xproto 7.0.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1228,13 +1233,15 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Xproto 7.0.9:";;
+ short | recursive ) echo "Configuration of Xproto 7.0.10:";;
esac
cat <<\_ACEOF
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-pretty-cmds show all commands executed
+ --enable-pretty-cmds do not output the entire command lines
--enable-function-prototypes
force function prototypes (default: auto)
--enable-varargs-prototypes
@@ -1326,7 +1333,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Xproto configure 7.0.9
+Xproto configure 7.0.10
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1340,7 +1347,7 @@
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.9, which was
+It was created by Xproto $as_me 7.0.10, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -1990,6 +1997,29 @@
fi
rmdir .tst 2>/dev/null
+# Check whether --enable-pretty-cmds was given.
+if test "${enable_pretty_cmds+set}" = set; then
+ enableval=$enable_pretty_cmds;
+fi
+
+AMSHOWCMDSAT=''
+AMDEPSHOWCMDSAT=''
+AMPRETTYECHO=true
+AMCMDECHO=echo
+if test "x$enable_pretty_cmds" = xyes;
+then
+ AMSHOWCMDSAT='@'
+ test "x$enable_dependency_tracking" = xno && AMDEPSHOWCMDSAT='@'
+ AMPRETTYECHO=echo
+ AMCMDECHO=true
+ LT_QUIET='--quiet'
+fi
+
+
+
+
+
+
# test to see if srcdir already configured
if test "`cd $srcdir && pwd`" != "`pwd`" &&
test -f $srcdir/config.status; then
@@ -2010,7 +2040,7 @@
# Define the identity of the package.
PACKAGE='xproto'
- VERSION='7.0.9'
+ VERSION='7.0.10'
cat >>confdefs.h <<_ACEOF
@@ -2157,6 +2187,7 @@
+
ac_config_headers="$ac_config_headers do-not-use-config.h"
ac_config_headers="$ac_config_headers Xfuncproto.h"
@@ -3926,6 +3957,29 @@
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
fi
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\).*/\1/p'`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\).*/\2/p'`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | sed -ne 's/^\([^\.]\+\)\.\([^\.]\+\)\.\([^\.]\+\).*/\3/p'`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile Xpoll.h xproto.pc"
@@ -4326,7 +4380,7 @@
# 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.9, which was
+This file was extended by Xproto $as_me 7.0.10, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -4379,7 +4433,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Xproto config.status 7.0.9
+Xproto config.status 7.0.10
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -4618,6 +4672,11 @@
AMTAR!$AMTAR$ac_delim
am__tar!$am__tar$ac_delim
am__untar!$am__untar$ac_delim
+AMSHOWCMDSAT!$AMSHOWCMDSAT$ac_delim
+AMDEPSHOWCMDSAT!$AMDEPSHOWCMDSAT$ac_delim
+AMPRETTYECHO!$AMPRETTYECHO$ac_delim
+AMCMDECHO!$AMCMDECHO$ac_delim
+LT_QUIET!$LT_QUIET$ac_delim
build!$build$ac_delim
build_cpu!$build_cpu$ac_delim
build_vendor!$build_vendor$ac_delim
@@ -4647,7 +4706,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/configure.ac new/xproto-7.0.10/configure.ac
--- old/xproto-7.0.9/configure.ac 2006-10-25 21:48:41.000000000 +0200
+++ new/xproto-7.0.10/configure.ac 2006-12-16 00:08:18.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.9], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.10], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xproto-7.0.9/do-not-use-config.h.in new/xproto-7.0.10/do-not-use-config.h.in
--- old/xproto-7.0.9/do-not-use-config.h.in 2006-10-25 21:49:16.000000000 +0200
+++ new/xproto-7.0.10/do-not-use-config.h.in 2006-12-16 00:08:24.000000000 +0100
@@ -24,5 +24,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Version number of package */
#undef VERSION
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org