Hello community,
here is the log from the commit of package xorg-x11-libs for openSUSE:Factory
checked in at Tue Jun 2 12:23:09 CEST 2009.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2009-04-25 04:58:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2009-05-29 18:32:37.000000000 +0200
@@ -1,0 +2,27 @@
+Fri May 29 18:31:51 CEST 2009 - sndirsch@suse.de
+
+- xcb-util 0.3.5
+ * various issues fixed
+
+-------------------------------------------------------------------
+Thu Apr 30 22:40:53 CEST 2009
+
+- fix a version typo that prevented the .la files to be found for
+ 11.0 <= version <= 11.1
+
+-------------------------------------------------------------------
+Thu Apr 30 21:53:45 CEST 2009
+
+- pack .la files in devel package
+
+-------------------------------------------------------------------
+Thu Apr 30 20:35:27 CEST 2009 - eich@suse.de
+
+- move static libraries to devel package
+
+-------------------------------------------------------------------
+Thu Apr 30 18:55:01 CEST 2009 - sndirsch@suse.de
+
+- build static libraries for versions <= 11.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xcb-util-0.3.4.tar.bz2
New:
----
xcb-util-0.3.5.diff
xcb-util-0.3.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.gG3619/_old 2009-06-02 12:22:50.000000000 +0200
+++ /var/tmp/diff_new_pack.gG3619/_new 2009-06-02 12:22:50.000000000 +0200
@@ -32,8 +32,8 @@
#
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 19
-License: X11/MIT
+Release: 20
+License: GPL v2 or later; X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
Summary: Remaining X.Org libraries
@@ -68,12 +68,13 @@
Source28: libXft1-X11R6.9-1.2.tar.bz2
Source29: libvnc-20070501.tar.bz2
Source30: libXcliplist-20070501.tar.bz2
-Source31: xcb-util-0.3.4.tar.bz2
+Source31: xcb-util-0.3.5.tar.bz2
Source33: libpciaccess-0.10.6.tar.bz2
Patch2: libXft-2.1.7-lcd-filter-2.patch
Patch3: p_xft_cjk.diff
Patch5: libxkbui.diff
Patch10: libXxf86misc-xcb.diff
+Patch11: xcb-util-0.3.5.diff
%description
This package contains the remaining X.Org libraries.
@@ -103,7 +104,7 @@
Susan Angebrandt
%package -n xorg-x11-devel
-License: X11/MIT
+License: GPL v2 or later; X11/MIT
Summary: Include Files and Libraries mandatory for X11 Development
Group: Development/Libraries/X11
Provides: xorg-x11-compat70-devel xorg-x11-man XFree86-devel
@@ -230,6 +231,9 @@
pushd libXxf86misc-*
%patch10 -p0
popd
+pushd xcb-util-*
+%patch11 -p0
+popd
%build
for dir in libXft1-* xbitmaps-* $(ls | grep -v -e libXft1 -e xbitmaps); do
@@ -242,7 +246,11 @@
*)
echo $dir | grep -q -E "libvnc|libXcliplist" && autoreconf -fi
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
- %configure --disable-static --with-pic --enable-type1 ${option}
+ %configure \
+%if %suse_version > 1110
+ --disable-static \
+%endif
+ --with-pic --enable-type1 ${option}
;;
esac
%{__make} %{?jobs:-j%jobs}
@@ -257,7 +265,7 @@
done
/sbin/ldconfig -n $RPM_BUILD_ROOT/usr/%_lib
mkdir -p $RPM_BUILD_ROOT/usr/include/X11/pixmaps/
-%if %suse_version > 1100
+%if %suse_version > 1110
rm $RPM_BUILD_ROOT/%{_libdir}/*.la
%endif
@@ -298,6 +306,10 @@
/usr/include/xcb/
/usr/%{_lib}/*.so
%exclude /usr/%{_lib}/libpciaccess.so.0*
+%if %suse_version <= 1110
+/usr/%{_lib}/*.a
+/usr/%{_lib}/*.la
+%endif
/usr/%{_lib}/pkgconfig/*.pc
/usr/share/aclocal/*.m4
%{_mandir}/man1/*
@@ -313,6 +325,18 @@
/usr/%{_lib}/libpciaccess.so
%changelog
+* Fri May 29 2009 sndirsch@suse.de
+- xcb-util 0.3.5
+ * various issues fixed
+ Thu Apr 30 22:40:53 CEST 2009
+- fix a version typo that prevented the .la files to be found for
+ 11.0 <= version <= 11.1
+ Thu Apr 30 21:53:45 CEST 2009
+- pack .la files in devel package
+* Thu Apr 30 2009 eich@suse.de
+- move static libraries to devel package
+* Thu Apr 30 2009 sndirsch@suse.de
+- build static libraries for versions <= 11.1
* Sat Apr 25 2009 sndirsch@suse.de
- libpciaccess 0.10.6
* Tue Apr 21 2009 crrodriguez@suse.de
++++++ xcb-util-0.3.5.diff ++++++
--- event/event.c.orig 2009-05-29 19:05:59.274261734 +0200
+++ event/event.c 2009-05-29 19:06:47.128402256 +0200
@@ -28,6 +28,7 @@
#include
#include
+#include
#include "xcb_event.h"
#include "../xcb-util-common.h"
++++++ xcb-util-0.3.4.tar.bz2 -> xcb-util-0.3.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/acinclude.m4 new/xcb-util-0.3.5/acinclude.m4
--- old/xcb-util-0.3.4/acinclude.m4 1970-01-01 01:00:00.000000000 +0100
+++ new/xcb-util-0.3.5/acinclude.m4 2009-05-29 08:35:36.000000000 +0200
@@ -0,0 +1,173 @@
+# ===========================================================================
+# http://www.nongnu.org/autoconf-archive/ax_compare_version.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+# AX_COMPARE_VERSION(VERSION_A, OP, VERSION_B, [ACTION-IF-TRUE], [ACTION-IF-FALSE])
+#
+# DESCRIPTION
+#
+# This macro compares two version strings. Due to the various number of
+# minor-version numbers that can exist, and the fact that string
+# comparisons are not compatible with numeric comparisons, this is not
+# necessarily trivial to do in a autoconf script. This macro makes doing
+# these comparisons easy.
+#
+# The six basic comparisons are available, as well as checking equality
+# limited to a certain number of minor-version levels.
+#
+# The operator OP determines what type of comparison to do, and can be one
+# of:
+#
+# eq - equal (test A == B)
+# ne - not equal (test A != B)
+# le - less than or equal (test A <= B)
+# ge - greater than or equal (test A >= B)
+# lt - less than (test A < B)
+# gt - greater than (test A > B)
+#
+# Additionally, the eq and ne operator can have a number after it to limit
+# the test to that number of minor versions.
+#
+# eq0 - equal up to the length of the shorter version
+# ne0 - not equal up to the length of the shorter version
+# eqN - equal up to N sub-version levels
+# neN - not equal up to N sub-version levels
+#
+# When the condition is true, shell commands ACTION-IF-TRUE are run,
+# otherwise shell commands ACTION-IF-FALSE are run. The environment
+# variable 'ax_compare_version' is always set to either 'true' or 'false'
+# as well.
+#
+# Examples:
+#
+# AX_COMPARE_VERSION([3.15.7],[lt],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[lt],[3.15.8])
+#
+# would both be true.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq],[3.15.8])
+# AX_COMPARE_VERSION([3.15],[gt],[3.15.8])
+#
+# would both be false.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq2],[3.15.8])
+#
+# would be true because it is only comparing two minor versions.
+#
+# AX_COMPARE_VERSION([3.15.7],[eq0],[3.15])
+#
+# would be true because it is only comparing the lesser number of minor
+# versions of the two values.
+#
+# Note: The characters that separate the version numbers do not matter. An
+# empty string is the same as version 0. OP is evaluated by autoconf, not
+# configure, so must be a string, not a variable.
+#
+# The author would like to acknowledge Guido Draheim whose advice about
+# the m4_case and m4_ifvaln functions make this macro only include the
+# portions necessary to perform the specific comparison specified by the
+# OP argument in the final configure script.
+#
+# LICENSE
+#
+# Copyright (c) 2008 Tim Toolan
+#
+# Copying and distribution of this file, with or without modification, are
+# permitted in any medium without royalty provided the copyright notice
+# and this notice are preserved.
+
+dnl #########################################################################
+AC_DEFUN([AX_COMPARE_VERSION], [
+
+ # Used to indicate true or false condition
+ ax_compare_version=false
+
+ # Convert the two version strings to be compared into a format that
+ # allows a simple string comparison. The end result is that a version
+ # string of the form 1.12.5-r617 will be converted to the form
+ # 0001001200050617. In other words, each number is zero padded to four
+ # digits, and non digits are removed.
+ AS_VAR_PUSHDEF([A],[ax_compare_version_A])
+ A=`echo "$1" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ AS_VAR_PUSHDEF([B],[ax_compare_version_B])
+ B=`echo "$3" | sed -e 's/\([[0-9]]*\)/Z\1Z/g' \
+ -e 's/Z\([[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/Z\([[0-9]][[0-9]][[0-9]]\)Z/Z0\1Z/g' \
+ -e 's/[[^0-9]]//g'`
+
+ dnl # In the case of le, ge, lt, and gt, the strings are sorted as necessary
+ dnl # then the first line is used to determine if the condition is true.
+ dnl # The sed right after the echo is to remove any indented white space.
+ m4_case(m4_tolower($2),
+ [lt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [gt],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/false/;s/x${B}/true/;1q"`
+ ],
+ [le],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],
+ [ge],[
+ ax_compare_version=`echo "x$A
+x$B" | sed 's/^ *//' | sort -r | sed "s/x${A}/true/;s/x${B}/false/;1q"`
+ ],[
+ dnl Split the operator from the subversion count if present.
+ m4_bmatch(m4_substr($2,2),
+ [0],[
+ # A count of zero means use the length of the shorter version.
+ # Determine the number of characters in A and B.
+ ax_compare_version_len_A=`echo "$A" | $AWK '{print(length)}'`
+ ax_compare_version_len_B=`echo "$B" | $AWK '{print(length)}'`
+
+ # Set A to no more than B's length and B to no more than A's length.
+ A=`echo "$A" | sed "s/\(.\{$ax_compare_version_len_B\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(.\{$ax_compare_version_len_A\}\).*/\1/"`
+ ],
+ [[0-9]+],[
+ # A count greater than zero means use only that many subversions
+ A=`echo "$A" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ B=`echo "$B" | sed "s/\(\([[0-9]]\{4\}\)\{m4_substr($2,2)\}\).*/\1/"`
+ ],
+ [.+],[
+ AC_WARNING(
+ [illegal OP numeric parameter: $2])
+ ],[])
+
+ # Pad zeros at end of numbers to make same length.
+ ax_compare_version_tmp_A="$A`echo $B | sed 's/./0/g'`"
+ B="$B`echo $A | sed 's/./0/g'`"
+ A="$ax_compare_version_tmp_A"
+
+ # Check for equality or inequality as necessary.
+ m4_case(m4_tolower(m4_substr($2,0,2)),
+ [eq],[
+ test "x$A" = "x$B" && ax_compare_version=true
+ ],
+ [ne],[
+ test "x$A" != "x$B" && ax_compare_version=true
+ ],[
+ AC_WARNING([illegal OP parameter: $2])
+ ])
+ ])
+
+ AS_VAR_POPDEF([A])dnl
+ AS_VAR_POPDEF([B])dnl
+
+ dnl # Execute ACTION-IF-TRUE / ACTION-IF-FALSE.
+ if test "$ax_compare_version" = "true" ; then
+ m4_ifvaln([$4],[$4],[:])dnl
+ m4_ifvaln([$5],[else $5])dnl
+ fi
+]) dnl AX_COMPARE_VERSION
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/aclocal.m4 new/xcb-util-0.3.5/aclocal.m4
--- old/xcb-util-0.3.4/aclocal.m4 2009-04-15 15:44:52.000000000 +0200
+++ new/xcb-util-0.3.5/aclocal.m4 2009-05-29 08:37:17.000000000 +0200
@@ -8998,3 +8998,4 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([acinclude.m4])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/atom/Makefile.in new/xcb-util-0.3.5/atom/Makefile.in
--- old/xcb-util-0.3.4/atom/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/atom/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -38,7 +38,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-atom.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -105,6 +106,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/atom/xcb_atom.h new/xcb-util-0.3.5/atom/xcb_atom.h
--- old/xcb-util-0.3.4/atom/xcb_atom.h 2009-04-12 21:55:07.000000000 +0200
+++ new/xcb-util-0.3.5/atom/xcb_atom.h 2009-05-29 08:36:54.000000000 +0200
@@ -3,6 +3,10 @@
#include
+#ifdef __cplusplus
+extern "C" {
+#endif
+
enum xcb_atom_fast_tag_t {
TAG_COOKIE,
TAG_VALUE
@@ -105,4 +109,8 @@
extern const xcb_atom_t WM_CLASS;
extern const xcb_atom_t WM_TRANSIENT_FOR;
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __XCB_ATOM_H__ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/atom/xcb_atom.h.m4 new/xcb-util-0.3.5/atom/xcb_atom.h.m4
--- old/xcb-util-0.3.4/atom/xcb_atom.h.m4 2008-09-18 21:32:29.000000000 +0200
+++ new/xcb-util-0.3.5/atom/xcb_atom.h.m4 2009-05-29 08:35:36.000000000 +0200
@@ -3,6 +3,10 @@
#include
+#ifdef __cplusplus
+extern "C" {
+#endif
+
enum xcb_atom_fast_tag_t {
TAG_COOKIE,
TAG_VALUE
@@ -39,4 +43,8 @@
define(`DO', `extern const xcb_atom_t $1;')dnl
include(atomlist.m4)`'dnl
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __XCB_ATOM_H__ */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/aux/Makefile.in new/xcb-util-0.3.5/aux/Makefile.in
--- old/xcb-util-0.3.4/aux/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/aux/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -38,7 +38,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-aux.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -102,6 +103,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/aux/xcb_aux.c new/xcb-util-0.3.5/aux/xcb_aux.c
--- old/xcb-util-0.3.4/aux/xcb_aux.c 2008-12-16 13:36:06.000000000 +0100
+++ new/xcb-util-0.3.5/aux/xcb_aux.c 2009-04-19 20:40:33.000000000 +0200
@@ -208,6 +208,17 @@
}
xcb_void_cookie_t
+xcb_aux_change_window_attributes_checked (xcb_connection_t *c,
+ xcb_window_t window,
+ uint32_t mask,
+ const xcb_params_cw_t *params)
+{
+ uint32_t value_list[16];
+ pack_list(mask, (const uint32_t *)params, value_list);
+ return xcb_change_window_attributes_checked( c, window, mask, value_list );
+}
+
+xcb_void_cookie_t
xcb_aux_change_window_attributes (xcb_connection_t *c,
xcb_window_t window,
uint32_t mask,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/aux/xcb_aux.h new/xcb-util-0.3.5/aux/xcb_aux.h
--- old/xcb-util-0.3.4/aux/xcb_aux.h 2008-10-19 16:42:11.000000000 +0200
+++ new/xcb-util-0.3.5/aux/xcb_aux.h 2009-04-19 20:40:33.000000000 +0200
@@ -102,6 +102,12 @@
uint32_t mask,
const xcb_params_cw_t *params);
+xcb_void_cookie_t
+xcb_aux_change_window_attributes_checked (xcb_connection_t *c,
+ xcb_window_t window,
+ uint32_t mask,
+ const xcb_params_cw_t *params);
+
typedef struct {
int32_t x;
int32_t y;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/config.guess new/xcb-util-0.3.5/config.guess
--- old/xcb-util-0.3.4/config.guess 2009-04-15 15:44:53.000000000 +0200
+++ new/xcb-util-0.3.5/config.guess 2009-05-29 08:37:19.000000000 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-01-23'
+timestamp='2009-04-27'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -324,6 +324,9 @@
case `/usr/bin/uname -p` in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
+ s390x:SunOS:*:*)
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -331,7 +334,20 @@
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -796,7 +812,7 @@
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd)
+ EM64T | authenticamd | genuineintel)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -935,6 +951,9 @@
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -985,9 +1004,6 @@
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
exit ;;
- coff-i386)
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
@@ -1102,8 +1118,11 @@
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i386.
- echo i386-pc-msdosdjgpp
+ # the processor, so we play safe by assuming i586.
+ # Note: whatever this is, it MUST be the same as what config.sub
+ # prints for the "djgpp" host, or else GDB configury will decide that
+ # this is a cross-build.
+ echo i586-pc-msdosdjgpp
exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
@@ -1141,6 +1160,16 @@
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1216,6 +1245,9 @@
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit ;;
+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
+ echo i586-pc-haiku
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@@ -1324,6 +1356,9 @@
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/config.sub new/xcb-util-0.3.5/config.sub
--- old/xcb-util-0.3.4/config.sub 2009-04-15 15:44:53.000000000 +0200
+++ new/xcb-util-0.3.5/config.sub 2009-05-29 08:37:19.000000000 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-01-16'
+timestamp='2009-04-17'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -122,6 +122,7 @@
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -249,13 +250,16 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore | mep \
+ | maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
- | mips64vr | mips64vrel \
+ | mips64octeon | mips64octeonel \
| mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
@@ -268,6 +272,7 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | moxie \
| mt \
| msp430 \
| nios | nios2 \
@@ -277,7 +282,7 @@
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| score \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -286,7 +291,7 @@
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- | z8k)
+ | z8k | z80)
basic_machine=$basic_machine-unknown
;;
m6811 | m68hc11 | m6812 | m68hc12)
@@ -329,14 +334,17 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | maxq-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
- | mips64vr-* | mips64vrel-* \
+ | mips64octeon-* | mips64octeonel-* \
| mips64orion-* | mips64orionel-* \
+ | mips64r5900-* | mips64r5900el-* \
+ | mips64vr-* | mips64vrel-* \
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
@@ -358,20 +366,20 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa*-* \
| ymp-* \
- | z8k-*)
+ | z8k-* | z80-*)
;;
# Recognize the basic CPU types without company name, with glob match.
xtensa*)
@@ -439,6 +447,10 @@
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -459,6 +471,10 @@
basic_machine=c90-cray
os=-unicos
;;
+ cegcc)
+ basic_machine=arm-unknown
+ os=-cegcc
+ ;;
convex-c1)
basic_machine=c1-convex
os=-bsd
@@ -526,6 +542,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ dicos)
+ basic_machine=i686-pc
+ os=-dicos
+ ;;
djgpp)
basic_machine=i586-pc
os=-msdosdjgpp
@@ -1128,6 +1148,10 @@
basic_machine=z8k-unknown
os=-sim
;;
+ z80-*-coff)
+ basic_machine=z80-unknown
+ os=-sim
+ ;;
none)
basic_machine=none-none
os=-none
@@ -1166,7 +1190,7 @@
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1238,8 +1262,9 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,7 +1273,7 @@
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
+ | -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1388,6 +1413,9 @@
-zvmoe)
os=-zvmoe
;;
+ -dicos*)
+ os=-dicos
+ ;;
-none)
;;
*)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/configure new/xcb-util-0.3.5/configure
--- old/xcb-util-0.3.4/configure 2009-04-15 15:44:53.000000000 +0200
+++ new/xcb-util-0.3.5/configure 2009-05-29 08:37:18.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for xcb-util 0.3.4.
+# Generated by GNU Autoconf 2.63 for xcb-util 0.3.5.
#
# Report bugs to .
#
@@ -745,8 +745,8 @@
# Identity of this package.
PACKAGE_NAME='xcb-util'
PACKAGE_TARNAME='xcb-util'
-PACKAGE_VERSION='0.3.4'
-PACKAGE_STRING='xcb-util 0.3.4'
+PACKAGE_VERSION='0.3.5'
+PACKAGE_STRING='xcb-util 0.3.5'
PACKAGE_BUGREPORT='xcb@lists.freedesktop.org'
ac_unique_file="Makefile.am"
@@ -856,6 +856,8 @@
CFLAGS
CC
GPERF
+GNUM4
+GM4
M4
am__untar
am__tar
@@ -1498,7 +1500,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 xcb-util 0.3.4 to adapt to many kinds of systems.
+\`configure' configures xcb-util 0.3.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1568,7 +1570,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xcb-util 0.3.4:";;
+ short | recursive ) echo "Configuration of xcb-util 0.3.5:";;
esac
cat <<\_ACEOF
@@ -1681,7 +1683,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xcb-util configure 0.3.4
+xcb-util configure 0.3.5
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1695,7 +1697,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xcb-util $as_me 0.3.4, which was
+It was created by xcb-util $as_me 0.3.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2413,7 +2415,7 @@
# Define the identity of the package.
PACKAGE='xcb-util'
- VERSION='0.3.4'
+ VERSION='0.3.5'
cat >>confdefs.h <<_ACEOF
@@ -2556,7 +2558,7 @@
-for ac_prog in m4
+for ac_prog in m4 gm4
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -2599,9 +2601,115 @@
done
test -n "$M4" || M4="no"
+if test $M4 != "no" ; then
+ { $as_echo "$as_me:$LINENO: checking if $M4 supports -I" >&5
+$as_echo_n "checking if $M4 supports -I... " >&6; }
+ if $M4 -I. /dev/null > /dev/null 2>&1 ; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ # Try finding the gnu version
+ for ac_prog in gm4
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_GM4+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$GM4"; then
+ ac_cv_prog_GM4="$GM4" # Let the user override the test.
+else
+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_prog_GM4="$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+GM4=$ac_cv_prog_GM4
+if test -n "$GM4"; then
+ { $as_echo "$as_me:$LINENO: result: $GM4" >&5
+$as_echo "$GM4" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$GM4" && break
+done
+test -n "$GM4" || GM4="no"
+
+ if test $GM4 = "no" ; then
+ for ac_prog in m4
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_GNUM4+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $GNUM4 in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GNUM4="$GNUM4" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /usr/gnu/bin
+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_GNUM4="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+GNUM4=$ac_cv_path_GNUM4
+if test -n "$GNUM4"; then
+ { $as_echo "$as_me:$LINENO: result: $GNUM4" >&5
+$as_echo "$GNUM4" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$GNUM4" && break
+done
+test -n "$GNUM4" || GNUM4="no"
+
+ M4="$GNUM4"
+ else
+ M4="$GM4"
+ fi
+ fi
+fi
if test $M4 = "no"; then
- { { $as_echo "$as_me:$LINENO: error: Can't find m4, please install it and try again" >&5
-$as_echo "$as_me: error: Can't find m4, please install it and try again" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: Can't find usable m4, please install it and try again" >&5
+$as_echo "$as_me: error: Can't find usable m4, please install it and try again" >&2;}
{ (exit 1); exit 1; }; }
fi
for ac_prog in gperf
@@ -4457,13 +4565,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:4460: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:4568: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:4463: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:4571: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:4466: output\"" >&5)
+ (eval echo "\"\$as_me:4574: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -5669,7 +5777,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5672 "configure"' > conftest.$ac_ext
+ echo '#line 5780 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7522,11 +7630,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7525: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7633: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7529: \$? = $ac_status" >&5
+ echo "$as_me:7637: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7861,11 +7969,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7864: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7972: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7868: \$? = $ac_status" >&5
+ echo "$as_me:7976: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7966,11 +8074,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7969: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8077: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7973: \$? = $ac_status" >&5
+ echo "$as_me:8081: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8021,11 +8129,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8024: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8132: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8028: \$? = $ac_status" >&5
+ echo "$as_me:8136: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10837,7 +10945,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10840 "configure"
+#line 10948 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10933,7 +11041,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10936 "configure"
+#line 11044 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11473,12 +11581,12 @@
pkg_cv_XCB_CFLAGS="$XCB_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "xcb >= 1.0") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.2\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xcb >= 1.2") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb >= 1.0" 2>/dev/null`
+ pkg_cv_XCB_CFLAGS=`$PKG_CONFIG --cflags "xcb >= 1.2" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11491,12 +11599,12 @@
pkg_cv_XCB_LIBS="$XCB_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "xcb >= 1.0") 2>&5
+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xcb >= 1.2\"") >&5
+ ($PKG_CONFIG --exists --print-errors "xcb >= 1.2") 2>&5
ac_status=$?
$as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb >= 1.0" 2>/dev/null`
+ pkg_cv_XCB_LIBS=`$PKG_CONFIG --libs "xcb >= 1.2" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -11515,14 +11623,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb >= 1.0"`
+ XCB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xcb >= 1.2"`
else
- XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb >= 1.0"`
+ XCB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcb >= 1.2"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XCB_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (xcb >= 1.0) were not met:
+ { { $as_echo "$as_me:$LINENO: error: Package requirements (xcb >= 1.2) were not met:
$XCB_PKG_ERRORS
@@ -11533,7 +11641,7 @@
and XCB_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
-$as_echo "$as_me: error: Package requirements (xcb >= 1.0) were not met:
+$as_echo "$as_me: error: Package requirements (xcb >= 1.2) were not met:
$XCB_PKG_ERRORS
@@ -11577,6 +11685,104 @@
:
fi
+######
+# Check version of xcb-proto that xcb was compiled against
+######
+xcbproto_required=1.5
+
+# Moved from AX_COMPARE_VERSION to maintain proper output
+for ac_prog in gawk mawk nawk awk
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_prog_AWK+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "$AWK"; then
+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+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_prog_AWK="$ac_prog"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+ { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ test -n "$AWK" && break
+done
+
+
+{ $as_echo "$as_me:$LINENO: checking whether libxcb was compiled against xcb-proto >= $xcbproto_required" >&5
+$as_echo_n "checking whether libxcb was compiled against xcb-proto >= $xcbproto_required... " >&6; }
+xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb`
+
+
+ # Used to indicate true or false condition
+ ax_compare_version=false
+
+ # Convert the two version strings to be compared into a format that
+ # allows a simple string comparison. The end result is that a version
+ # string of the form 1.12.5-r617 will be converted to the form
+ # 0001001200050617. In other words, each number is zero padded to four
+ # digits, and non digits are removed.
+
+ ax_compare_version_A=`echo "$xcbproto_version" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+ -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
+ -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
+ -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
+ -e 's/[^0-9]//g'`
+
+
+ ax_compare_version_B=`echo "$xcbproto_required" | sed -e 's/\([0-9]*\)/Z\1Z/g' \
+ -e 's/Z\([0-9]\)Z/Z0\1Z/g' \
+ -e 's/Z\([0-9][0-9]\)Z/Z0\1Z/g' \
+ -e 's/Z\([0-9][0-9][0-9]\)Z/Z0\1Z/g' \
+ -e 's/[^0-9]//g'`
+
+
+ ax_compare_version=`echo "x$ax_compare_version_A
+x$ax_compare_version_B" | sed 's/^ *//' | sort -r | sed "s/x${ax_compare_version_A}/true/;s/x${ax_compare_version_B}/false/;1q"`
+
+
+
+ if test "$ax_compare_version" = "true" ; then
+ xcbproto_ok="yes"
+ else xcbproto_ok="no"
+ fi
+
+{ $as_echo "$as_me:$LINENO: result: $xcbproto_ok" >&5
+$as_echo "$xcbproto_ok" >&6; }
+
+if test $xcbproto_ok = no; then
+ { { $as_echo "$as_me:$LINENO: error: libxcb was compiled against xcb-proto $xcbproto_version; it needs needs to be compiled against version $xcbproto_required or higher" >&5
+$as_echo "$as_me: error: libxcb was compiled against xcb-proto $xcbproto_version; it needs needs to be compiled against version $xcbproto_required or higher" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+
+
pkg_failed=no
{ $as_echo "$as_me:$LINENO: checking for XCB_SHM" >&5
$as_echo_n "checking for XCB_SHM... " >&6; }
@@ -12408,7 +12614,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xcb-util $as_me 0.3.4, which was
+This file was extended by xcb-util $as_me 0.3.5, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -12462,7 +12668,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xcb-util config.status 0.3.4
+xcb-util config.status 0.3.5
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/configure.ac new/xcb-util-0.3.5/configure.ac
--- old/xcb-util-0.3.4/configure.ac 2009-04-15 15:44:12.000000000 +0200
+++ new/xcb-util-0.3.5/configure.ac 2009-05-29 08:37:03.000000000 +0200
@@ -1,11 +1,27 @@
AC_PREREQ(2.57)
-AC_INIT([xcb-util],0.3.4,[xcb@lists.freedesktop.org])
+AC_INIT([xcb-util],0.3.5,[xcb@lists.freedesktop.org])
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AC_CHECK_PROGS(M4, m4, [no])
+AC_CHECK_PROGS(M4, [m4 gm4], [no])
+if test $M4 != "no" ; then
+ AC_MSG_CHECKING([if $M4 supports -I])
+ if $M4 -I. /dev/null > /dev/null 2>&1 ; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ # Try finding the gnu version
+ AC_CHECK_PROGS(GM4, gm4, [no])
+ if test $GM4 = "no" ; then
+ AC_PATH_PROGS(GNUM4, m4, [no], [/usr/gnu/bin])
+ M4="$GNUM4"
+ else
+ M4="$GM4"
+ fi
+ fi
+fi
if test $M4 = "no"; then
- AC_MSG_ERROR([Can't find m4, please install it and try again])
+ AC_MSG_ERROR([Can't find usable m4, please install it and try again])
fi
AC_CHECK_PROGS(GPERF, gperf, [no])
if test $GPERF = "no"; then
@@ -31,7 +47,26 @@
pkgconfigdir='${libdir}/pkgconfig'
AC_SUBST(pkgconfigdir)
-PKG_CHECK_MODULES(XCB, xcb >= 1.0)
+PKG_CHECK_MODULES(XCB, xcb >= 1.2)
+
+######
+# Check version of xcb-proto that xcb was compiled against
+######
+xcbproto_required=1.5
+
+# Moved from AX_COMPARE_VERSION to maintain proper output
+AC_PROG_AWK
+
+AC_MSG_CHECKING([whether libxcb was compiled against xcb-proto >= $xcbproto_required])
+xcbproto_version=`$PKG_CONFIG --variable=xcbproto_version xcb`
+AX_COMPARE_VERSION([$xcbproto_version],[ge],[$xcbproto_required], xcbproto_ok="yes", xcbproto_ok="no")
+AC_MSG_RESULT([$xcbproto_ok])
+
+if test $xcbproto_ok = no; then
+ AC_MSG_ERROR([libxcb was compiled against xcb-proto $xcbproto_version; it needs needs to be compiled against version $xcbproto_required or higher])
+fi
+
+
PKG_CHECK_MODULES(XCB_SHM, xcb-shm)
PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
PKG_CHECK_MODULES(XPROTO, xproto >= 7.0.8)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/event/event.c new/xcb-util-0.3.5/event/event.c
--- old/xcb-util-0.3.4/event/event.c 2009-04-15 15:44:12.000000000 +0200
+++ new/xcb-util-0.3.5/event/event.c 2009-05-29 08:35:36.000000000 +0200
@@ -35,6 +35,7 @@
void
xcb_event_handlers_init(xcb_connection_t *c, xcb_event_handlers_t *evenths)
{
+ memset(evenths, 0, sizeof(xcb_event_handlers_t));
evenths->c = c;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/event/Makefile.in new/xcb-util-0.3.5/event/Makefile.in
--- old/xcb-util-0.3.4/event/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/event/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -38,7 +38,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-event.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -105,6 +106,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/icccm/icccm.c new/xcb-util-0.3.5/icccm/icccm.c
--- old/xcb-util-0.3.4/icccm/icccm.c 2009-04-04 13:38:06.000000000 +0200
+++ new/xcb-util-0.3.5/icccm/icccm.c 2009-05-09 17:56:55.000000000 +0200
@@ -64,7 +64,7 @@
prop->_reply = reply;
prop->encoding = prop->_reply->type;
prop->format = prop->_reply->format;
- prop->name_len = xcb_get_property_value_length(prop->_reply) * prop->format >> 3;
+ prop->name_len = xcb_get_property_value_length(prop->_reply);
prop->name = xcb_get_property_value(prop->_reply);
return 1;
@@ -434,7 +434,7 @@
if(!reply)
return 0;
- int length = xcb_get_property_value_length(reply);
+ int length = xcb_get_property_value_length(reply) / (reply->format / 8);
if (!(reply->type == WM_SIZE_HINTS &&
(reply->format == 8 || reply->format == 16 ||
@@ -627,16 +627,16 @@
return 0;
int length = xcb_get_property_value_length(reply);
+ int num_elem = length / (reply->format / 8);
- if ((reply->type != WM_HINTS) ||
- (length < (XCB_NUM_WM_HINTS_ELEMENTS - 1)) ||
- (reply->format != 32))
+ if (reply->type != WM_HINTS
+ || reply->format != 32
+ || num_elem < XCB_NUM_WM_HINTS_ELEMENTS - 1)
return 0;
- memcpy(hints, (xcb_size_hints_t *) xcb_get_property_value(reply),
- length * reply->format >> 3);
+ memcpy(hints, (xcb_size_hints_t *) xcb_get_property_value(reply), length);
- if(length < XCB_NUM_WM_HINTS_ELEMENTS)
+ if(num_elem < XCB_NUM_WM_HINTS_ELEMENTS)
hints->window_group = XCB_NONE;
return 1;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/icccm/Makefile.in new/xcb-util-0.3.5/icccm/Makefile.in
--- old/xcb-util-0.3.4/icccm/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/icccm/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -38,7 +38,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-icccm.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -106,6 +107,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/image/Makefile.in new/xcb-util-0.3.5/image/Makefile.in
--- old/xcb-util-0.3.4/image/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/image/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -42,7 +42,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-image.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -132,6 +133,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/keysyms/Makefile.in new/xcb-util-0.3.5/keysyms/Makefile.in
--- old/xcb-util-0.3.4/keysyms/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/keysyms/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -38,7 +38,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-keysyms.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -105,6 +106,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/Makefile.in new/xcb-util-0.3.5/Makefile.in
--- old/xcb-util-0.3.4/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -37,7 +37,8 @@
$(top_srcdir)/configure config.guess config.sub depcomp \
install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -93,6 +94,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/property/Makefile.in new/xcb-util-0.3.5/property/Makefile.in
--- old/xcb-util-0.3.4/property/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/property/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -38,7 +38,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-property.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -106,6 +107,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/renderutil/Makefile.in new/xcb-util-0.3.5/renderutil/Makefile.in
--- old/xcb-util-0.3.4/renderutil/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/renderutil/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -38,7 +38,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-renderutil.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -104,6 +105,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xcb-util-0.3.4/reply/Makefile.in new/xcb-util-0.3.5/reply/Makefile.in
--- old/xcb-util-0.3.4/reply/Makefile.in 2009-04-15 15:44:54.000000000 +0200
+++ new/xcb-util-0.3.5/reply/Makefile.in 2009-05-29 08:37:19.000000000 +0200
@@ -40,7 +40,8 @@
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(srcdir)/xcb-reply.pc.in $(xcbinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -111,6 +112,8 @@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
+GM4 = @GM4@
+GNUM4 = @GNUM4@
GPERF = @GPERF@
GREP = @GREP@
INSTALL = @INSTALL@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org