Minor update to xcb-util-cursor-0.1.2
ok matthieu@
This commit is contained in:
dcoppa
parent
704330faff
commit
4b34d0f021
@ -1,3 +1,51 @@
|
||||
commit 8eb844d39a06f42019dede515c70e7a0b155357d
|
||||
Author: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Wed Mar 25 23:06:23 2015 +0100
|
||||
|
||||
set version to 0.1.2
|
||||
|
||||
commit cf26479ece9ab9e04616bc10ba674d88a284e5b0
|
||||
Author: Martin Gräßlin <mgraesslin@kde.org>
|
||||
Date: Tue Mar 17 18:41:07 2015 +0100
|
||||
|
||||
Perform safety check before trying to load glyph cursor
|
||||
|
||||
The passed in cursor name to xcb_cursor_load_cursor might not match
|
||||
one of the predefined font cursor values. Without the check the
|
||||
call to create glyph cursor will fail with a BadValue error, but
|
||||
the library returns the id allocated for the xcb_cursor_t. A user
|
||||
of the library gets a value which looks like a valid cursor, but
|
||||
when using it for e.g. a cursor value in xcb_create_window it raises
|
||||
a BadCursor error.
|
||||
|
||||
commit f03cc278c6cce0cf721adf9c3764d3c5fba63392
|
||||
Author: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
Date: Sat Apr 5 15:50:28 2014 -0700
|
||||
|
||||
darwin: Use OSByteOrder.h rather than CF.
|
||||
|
||||
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
|
||||
|
||||
commit a08bbf0e20995d29cbf890957c898059d4a9ece2
|
||||
Author: Niclas Zeising <zeising@daemonic.se>
|
||||
Date: Mon Aug 12 13:53:10 2013 +0200
|
||||
|
||||
Check submodules before running autoconf.
|
||||
|
||||
Exit early with an informative message if the submodules are missing,
|
||||
since they are needed. Without this autoconf throws a bunch of
|
||||
uninformative errors which does not point to the actual problem.
|
||||
This was taken from util-keysyms.
|
||||
|
||||
Signed-off-by: Niclas Zeising <zeising@daemonic.se>
|
||||
Reviewed-By: Arnaud Fontaine <arnau@debian.org>
|
||||
|
||||
commit d25806902ee6050ec3d52480d0bc8f4889942350
|
||||
Author: Marcus Crestani <crestani@informatik.uni-tuebingen.de>
|
||||
Date: Mon Dec 23 23:30:04 2013 +0100
|
||||
|
||||
Use CFSwapInt32LittleToHost from CoreFoundation.h on Mac OS X to implement le32toh.
|
||||
|
||||
commit f557760c56ba4eb44063936d8fa49473532e21c6
|
||||
Author: Michael Stapelberg <michael@stapelberg.de>
|
||||
Date: Tue Nov 12 21:47:50 2013 +0100
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
Installation Instructions
|
||||
*************************
|
||||
|
||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||
2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
|
||||
Inc.
|
||||
|
||||
This file is free documentation; the Free Software Foundation gives
|
||||
unlimited permission to copy, distribute and modify it.
|
||||
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. This file is offered as-is,
|
||||
without warranty of any kind.
|
||||
|
||||
Basic Installation
|
||||
==================
|
||||
@ -13,7 +15,11 @@ Basic Installation
|
||||
Briefly, the shell commands `./configure; make; make install' should
|
||||
configure, build, and install this package. The following
|
||||
more-detailed instructions are generic; see the `README' file for
|
||||
instructions specific to this package.
|
||||
instructions specific to this package. Some packages provide this
|
||||
`INSTALL' file but do not implement all of the features documented
|
||||
below. The lack of an optional feature in a given package is not
|
||||
necessarily a bug. More recommendations for GNU packages can be found
|
||||
in *note Makefile Conventions: (standards)Makefile Conventions.
|
||||
|
||||
The `configure' shell script attempts to guess correct values for
|
||||
various system-dependent variables used during compilation. It uses
|
||||
@ -42,7 +48,7 @@ may remove or edit it.
|
||||
you want to change it or regenerate `configure' using a newer version
|
||||
of `autoconf'.
|
||||
|
||||
The simplest way to compile this package is:
|
||||
The simplest way to compile this package is:
|
||||
|
||||
1. `cd' to the directory containing the package's source code and type
|
||||
`./configure' to configure the package for your system.
|
||||
@ -53,12 +59,22 @@ The simplest way to compile this package is:
|
||||
2. Type `make' to compile the package.
|
||||
|
||||
3. Optionally, type `make check' to run any self-tests that come with
|
||||
the package.
|
||||
the package, generally using the just-built uninstalled binaries.
|
||||
|
||||
4. Type `make install' to install the programs and any data files and
|
||||
documentation.
|
||||
documentation. When installing into a prefix owned by root, it is
|
||||
recommended that the package be configured and built as a regular
|
||||
user, and only the `make install' phase executed with root
|
||||
privileges.
|
||||
|
||||
5. You can remove the program binaries and object files from the
|
||||
5. Optionally, type `make installcheck' to repeat any self-tests, but
|
||||
this time using the binaries in their final installed location.
|
||||
This target does not install anything. Running this target as a
|
||||
regular user, particularly if the prior `make install' required
|
||||
root privileges, verifies that the installation completed
|
||||
correctly.
|
||||
|
||||
6. You can remove the program binaries and object files from the
|
||||
source code directory by typing `make clean'. To also remove the
|
||||
files that `configure' created (so you can compile the package for
|
||||
a different kind of computer), type `make distclean'. There is
|
||||
@ -67,8 +83,15 @@ The simplest way to compile this package is:
|
||||
all sorts of other programs in order to regenerate files that came
|
||||
with the distribution.
|
||||
|
||||
6. Often, you can also type `make uninstall' to remove the installed
|
||||
files again.
|
||||
7. Often, you can also type `make uninstall' to remove the installed
|
||||
files again. In practice, not all packages have tested that
|
||||
uninstallation works correctly, even though it is required by the
|
||||
GNU Coding Standards.
|
||||
|
||||
8. Some packages, particularly those that use Automake, provide `make
|
||||
distcheck', which can by used by developers to test that all other
|
||||
targets like `make install' and `make uninstall' work correctly.
|
||||
This target is generally not run by end users.
|
||||
|
||||
Compilers and Options
|
||||
=====================
|
||||
@ -93,7 +116,8 @@ same time, by placing the object files for each architecture in their
|
||||
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||
directory where you want the object files and executables to go and run
|
||||
the `configure' script. `configure' automatically checks for the
|
||||
source code in the directory that `configure' is in and in `..'.
|
||||
source code in the directory that `configure' is in and in `..'. This
|
||||
is known as a "VPATH" build.
|
||||
|
||||
With a non-GNU `make', it is safer to compile the package for one
|
||||
architecture at a time in the source code directory. After you have
|
||||
@ -120,7 +144,8 @@ Installation Names
|
||||
By default, `make install' installs the package's commands under
|
||||
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||
can specify an installation prefix other than `/usr/local' by giving
|
||||
`configure' the option `--prefix=PREFIX'.
|
||||
`configure' the option `--prefix=PREFIX', where PREFIX must be an
|
||||
absolute file name.
|
||||
|
||||
You can specify separate installation prefixes for
|
||||
architecture-specific files and architecture-independent files. If you
|
||||
@ -131,15 +156,46 @@ Documentation and other data files still use the regular prefix.
|
||||
In addition, if you use an unusual directory layout you can give
|
||||
options like `--bindir=DIR' to specify different values for particular
|
||||
kinds of files. Run `configure --help' for a list of the directories
|
||||
you can set and what kinds of files go in them.
|
||||
you can set and what kinds of files go in them. In general, the
|
||||
default for these options is expressed in terms of `${prefix}', so that
|
||||
specifying just `--prefix' will affect all of the other directory
|
||||
specifications that were not explicitly provided.
|
||||
|
||||
The most portable way to affect installation locations is to pass the
|
||||
correct locations to `configure'; however, many packages provide one or
|
||||
both of the following shortcuts of passing variable assignments to the
|
||||
`make install' command line to change installation locations without
|
||||
having to reconfigure or recompile.
|
||||
|
||||
The first method involves providing an override variable for each
|
||||
affected directory. For example, `make install
|
||||
prefix=/alternate/directory' will choose an alternate location for all
|
||||
directory configuration variables that were expressed in terms of
|
||||
`${prefix}'. Any directories that were specified during `configure',
|
||||
but not in terms of `${prefix}', must each be overridden at install
|
||||
time for the entire installation to be relocated. The approach of
|
||||
makefile variable overrides for each directory variable is required by
|
||||
the GNU Coding Standards, and ideally causes no recompilation.
|
||||
However, some platforms have known limitations with the semantics of
|
||||
shared libraries that end up requiring recompilation when using this
|
||||
method, particularly noticeable in packages that use GNU Libtool.
|
||||
|
||||
The second method involves providing the `DESTDIR' variable. For
|
||||
example, `make install DESTDIR=/alternate/directory' will prepend
|
||||
`/alternate/directory' before all installation names. The approach of
|
||||
`DESTDIR' overrides is not required by the GNU Coding Standards, and
|
||||
does not work on platforms that have drive letters. On the other hand,
|
||||
it does better at avoiding recompilation issues, and works well even
|
||||
when some directory options were not specified in terms of `${prefix}'
|
||||
at `configure' time.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
If the package supports it, you can cause programs to be installed
|
||||
with an extra prefix or suffix on their names by giving `configure' the
|
||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
||||
|
||||
Optional Features
|
||||
=================
|
||||
|
||||
Some packages pay attention to `--enable-FEATURE' options to
|
||||
`configure', where FEATURE indicates an optional part of the package.
|
||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
||||
@ -152,6 +208,13 @@ find the X include and library files automatically, but if it doesn't,
|
||||
you can use the `configure' options `--x-includes=DIR' and
|
||||
`--x-libraries=DIR' to specify their locations.
|
||||
|
||||
Some packages offer the ability to configure how verbose the
|
||||
execution of `make' will be. For these packages, running `./configure
|
||||
--enable-silent-rules' sets the default to minimal output, which can be
|
||||
overridden with `make V=1'; while running `./configure
|
||||
--disable-silent-rules' sets the default to verbose, which can be
|
||||
overridden with `make V=0'.
|
||||
|
||||
Particular systems
|
||||
==================
|
||||
|
||||
@ -159,10 +222,15 @@ Particular systems
|
||||
CC is not installed, it is recommended to use the following options in
|
||||
order to use an ANSI C compiler:
|
||||
|
||||
./configure CC="cc -Ae"
|
||||
./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
|
||||
|
||||
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||
|
||||
HP-UX `make' updates targets which have the same time stamps as
|
||||
their prerequisites, which makes it generally unusable when shipped
|
||||
generated files such as `configure' are involved. Use GNU `make'
|
||||
instead.
|
||||
|
||||
On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
|
||||
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
|
||||
a workaround. If GNU CC is not installed, it is therefore recommended
|
||||
@ -174,6 +242,16 @@ and if that doesn't work, try
|
||||
|
||||
./configure CC="cc -nodtk"
|
||||
|
||||
On Solaris, don't put `/usr/ucb' early in your `PATH'. This
|
||||
directory contains several dysfunctional programs; working variants of
|
||||
these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
|
||||
in your `PATH', put it _after_ `/usr/bin'.
|
||||
|
||||
On Haiku, software installed for all users goes in `/boot/common',
|
||||
not `/usr/local'. It is recommended to use the following options:
|
||||
|
||||
./configure --prefix=/boot/common
|
||||
|
||||
Specifying the System Type
|
||||
==========================
|
||||
|
||||
@ -189,7 +267,8 @@ type, such as `sun4', or a canonical name which has the form:
|
||||
|
||||
where SYSTEM can have one of these forms:
|
||||
|
||||
OS KERNEL-OS
|
||||
OS
|
||||
KERNEL-OS
|
||||
|
||||
See the file `config.sub' for the possible values of each field. If
|
||||
`config.sub' isn't included in this package, then this package doesn't
|
||||
@ -277,7 +356,7 @@ operates.
|
||||
`configure' can determine that directory automatically.
|
||||
|
||||
`--prefix=DIR'
|
||||
Use DIR as the installation prefix. *Note Installation Names::
|
||||
Use DIR as the installation prefix. *note Installation Names::
|
||||
for more details, including other options available for fine-tuning
|
||||
the installation locations.
|
||||
|
||||
|
||||
@ -170,6 +170,7 @@ CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DOT = @DOT@
|
||||
DOXYGEN = @DOXYGEN@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
@ -185,6 +186,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GPERF = @GPERF@
|
||||
GREP = @GREP@
|
||||
HAVE_DOT = @HAVE_DOT@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
Release 0.1.2 (2015-03-35)
|
||||
===========================
|
||||
|
||||
- Use CFSwapInt32LittleToHost from CoreFoundation.h on Mac OS X to implement
|
||||
le32toh.
|
||||
- Check submodules before running autoconf.
|
||||
- darwin: Use OSByteOrder.h rather than CF.
|
||||
- Perform safety check before trying to load glyph cursorHEADmaster
|
||||
|
||||
Release 0.1.1 (2013-11-12)
|
||||
===========================
|
||||
|
||||
|
||||
61
lib/xcb-util-cursor/aclocal.m4
vendored
61
lib/xcb-util-cursor/aclocal.m4
vendored
@ -1287,7 +1287,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
||||
# See the "minimum version" comment for each macro you use to see what
|
||||
# version you require.
|
||||
m4_defun([XORG_MACROS_VERSION],[
|
||||
m4_define([vers_have], [1.17.1])
|
||||
m4_define([vers_have], [1.19.0])
|
||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||
@ -1337,6 +1337,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
||||
TRADITIONALCPPFLAGS="-traditional"
|
||||
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
@ -1345,6 +1346,7 @@ else
|
||||
fi
|
||||
rm -f conftest.$ac_ext
|
||||
AC_SUBST(RAWCPPFLAGS)
|
||||
AC_SUBST(TRADITIONALCPPFLAGS)
|
||||
]) # XORG_PROG_RAWCPP
|
||||
|
||||
# XORG_MANPAGE_SECTIONS()
|
||||
@ -1869,9 +1871,10 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
]) # XORG_WITH_ASCIIDOC
|
||||
|
||||
# XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
|
||||
# --------------------------------
|
||||
# -------------------------------------------
|
||||
# Minimum version: 1.5.0
|
||||
# Minimum version for optional DEFAULT argument: 1.11.0
|
||||
# Minimum version for optional DOT checking: 1.18.0
|
||||
#
|
||||
# Documentation tools are not always available on all platforms and sometimes
|
||||
# not at the appropriate level. This macro enables a module to test for the
|
||||
@ -1891,6 +1894,7 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_DOXYGEN],[
|
||||
AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
|
||||
AC_ARG_VAR([DOT], [Path to the dot graphics utility])
|
||||
m4_define([_defopt], m4_default([$2], [auto]))
|
||||
AC_ARG_WITH(doxygen,
|
||||
AS_HELP_STRING([--with-doxygen],
|
||||
@ -1934,6 +1938,20 @@ m4_ifval([$1],
|
||||
AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed])
|
||||
fi])
|
||||
fi])
|
||||
|
||||
dnl Check for DOT if we have doxygen. The caller decides if it is mandatory
|
||||
dnl HAVE_DOT is a variable that can be used in your doxygen.in config file:
|
||||
dnl HAVE_DOT = @HAVE_DOT@
|
||||
HAVE_DOT=no
|
||||
if test "x$have_doxygen" = "xyes"; then
|
||||
AC_PATH_PROG([DOT], [dot])
|
||||
if test "x$DOT" != "x"; then
|
||||
HAVE_DOT=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_SUBST([HAVE_DOT])
|
||||
AM_CONDITIONAL([HAVE_DOT], [test "$HAVE_DOT" = "yes"])
|
||||
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
|
||||
]) # XORG_WITH_DOXYGEN
|
||||
|
||||
@ -2116,6 +2134,29 @@ fi])
|
||||
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
|
||||
]) # XORG_WITH_FOP
|
||||
|
||||
# XORG_WITH_M4([MIN-VERSION])
|
||||
# ---------------------------
|
||||
# Minimum version: 1.19.0
|
||||
#
|
||||
# This macro attempts to locate an m4 macro processor which supports
|
||||
# -I option and is only useful for modules relying on M4 in order to
|
||||
# expand macros in source code files.
|
||||
#
|
||||
# Interface to module:
|
||||
# M4: returns the path of the m4 program found
|
||||
# returns the path set by the user in the environment
|
||||
#
|
||||
AC_DEFUN([XORG_WITH_M4], [
|
||||
AC_CACHE_CHECK([for m4 that supports -I option], [ac_cv_path_M4],
|
||||
[AC_PATH_PROGS_FEATURE_CHECK([M4], [m4 gm4],
|
||||
[[$ac_path_M4 -I. /dev/null > /dev/null 2>&1 && \
|
||||
ac_cv_path_M4=$ac_path_M4 ac_path_M4_found=:]],
|
||||
[AC_MSG_ERROR([could not find m4 that supports -I option])],
|
||||
[$PATH:/usr/gnu/bin])])
|
||||
|
||||
AC_SUBST([M4], [$ac_cv_path_M4])
|
||||
]) # XORG_WITH_M4
|
||||
|
||||
# XORG_WITH_PS2PDF([DEFAULT])
|
||||
# ----------------
|
||||
# Minimum version: 1.6.0
|
||||
@ -2570,7 +2611,8 @@ AC_ARG_ENABLE(malloc0returnsnull,
|
||||
|
||||
AC_MSG_CHECKING([whether malloc(0) returns NULL])
|
||||
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
||||
AC_RUN_IFELSE([AC_LANG_PROGRAM([
|
||||
AC_CACHE_VAL([xorg_cv_malloc0_returns_null],
|
||||
[AC_RUN_IFELSE([AC_LANG_PROGRAM([
|
||||
#include <stdlib.h>
|
||||
],[
|
||||
char *m0, *r0, *c0, *p;
|
||||
@ -2580,9 +2622,9 @@ if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
||||
c0 = calloc(0,10);
|
||||
exit((m0 == 0 || r0 == 0 || c0 == 0) ? 0 : 1);
|
||||
])],
|
||||
[MALLOC_ZERO_RETURNS_NULL=yes],
|
||||
[MALLOC_ZERO_RETURNS_NULL=no],
|
||||
[MALLOC_ZERO_RETURNS_NULL=yes])
|
||||
[xorg_cv_malloc0_returns_null=yes],
|
||||
[xorg_cv_malloc0_returns_null=no])])
|
||||
MALLOC_ZERO_RETURNS_NULL=$xorg_cv_malloc0_returns_null
|
||||
fi
|
||||
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
|
||||
|
||||
@ -2871,7 +2913,7 @@ AC_LANG_CASE(
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-prototypes])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wnested-externs])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wbad-function-cast])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wold-style-definition], [-fd])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wdeclaration-after-statement])
|
||||
]
|
||||
)
|
||||
@ -2880,16 +2922,17 @@ AC_LANG_CASE(
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wunused])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wuninitialized])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wshadow])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-noreturn])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wmissing-format-attribute])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
|
||||
XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
|
||||
|
||||
# These are currently disabled because they are noisy. They will be enabled
|
||||
# in the future once the codebase is sufficiently modernized to silence
|
||||
# them. For now, I don't want them to drown out the other warnings.
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
||||
|
||||
# Turn some warnings into errors, so we don't accidently get successful builds
|
||||
# when there are problems that should be fixed.
|
||||
|
||||
@ -6,6 +6,21 @@ test -z "$srcdir" && srcdir=.
|
||||
ORIGDIR=`pwd`
|
||||
cd $srcdir
|
||||
|
||||
# If this is a git checkout, verify that the submodules are initialized,
|
||||
# otherwise autotools will just fail with an unhelpful error message.
|
||||
if [ -d ".git" ] && [ -r ".gitmodules" ]
|
||||
then
|
||||
# If git is not in PATH, this will not return 0, thus not keeping us
|
||||
# from building. Since the message is worthless when git is not
|
||||
# installed, this is what we want.
|
||||
if git submodule status 2>/dev/null | grep -q '^-'
|
||||
then
|
||||
echo "You have uninitialized git submodules." >&2
|
||||
echo "Please run: git submodule update --init" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
autoreconf -v --install || exit 1
|
||||
cd $ORIGDIR || exit $?
|
||||
|
||||
|
||||
378
lib/xcb-util-cursor/configure
vendored
378
lib/xcb-util-cursor/configure
vendored
@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for xcb-util-cursor 0.1.1.
|
||||
# Generated by GNU Autoconf 2.69 for xcb-util-cursor 0.1.2.
|
||||
#
|
||||
# Report bugs to <xcb@lists.freedesktop.org>.
|
||||
#
|
||||
@ -590,8 +590,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='xcb-util-cursor'
|
||||
PACKAGE_TARNAME='xcb-util-cursor'
|
||||
PACKAGE_VERSION='0.1.1'
|
||||
PACKAGE_STRING='xcb-util-cursor 0.1.1'
|
||||
PACKAGE_VERSION='0.1.2'
|
||||
PACKAGE_STRING='xcb-util-cursor 0.1.2'
|
||||
PACKAGE_BUGREPORT='xcb@lists.freedesktop.org'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@ -645,6 +645,10 @@ XCB_RENDER_CFLAGS
|
||||
GPERF
|
||||
HAVE_DOXYGEN_FALSE
|
||||
HAVE_DOXYGEN_TRUE
|
||||
HAVE_DOT_FALSE
|
||||
HAVE_DOT_TRUE
|
||||
HAVE_DOT
|
||||
DOT
|
||||
DOXYGEN
|
||||
ENABLE_DEVEL_DOCS_FALSE
|
||||
ENABLE_DEVEL_DOCS_TRUE
|
||||
@ -823,6 +827,7 @@ PKG_CONFIG_LIBDIR
|
||||
XCB_CFLAGS
|
||||
XCB_LIBS
|
||||
DOXYGEN
|
||||
DOT
|
||||
XCB_RENDER_CFLAGS
|
||||
XCB_RENDER_LIBS
|
||||
XCB_RENDERUTIL_CFLAGS
|
||||
@ -1369,7 +1374,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures xcb-util-cursor 0.1.1 to adapt to many kinds of systems.
|
||||
\`configure' configures xcb-util-cursor 0.1.2 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@ -1439,7 +1444,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xcb-util-cursor 0.1.1:";;
|
||||
short | recursive ) echo "Configuration of xcb-util-cursor 0.1.2:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@ -1498,6 +1503,7 @@ Some influential environment variables:
|
||||
XCB_CFLAGS C compiler flags for XCB, overriding pkg-config
|
||||
XCB_LIBS linker flags for XCB, overriding pkg-config
|
||||
DOXYGEN Path to doxygen command
|
||||
DOT Path to the dot graphics utility
|
||||
XCB_RENDER_CFLAGS
|
||||
C compiler flags for XCB_RENDER, overriding pkg-config
|
||||
XCB_RENDER_LIBS
|
||||
@ -1577,7 +1583,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xcb-util-cursor configure 0.1.1
|
||||
xcb-util-cursor configure 0.1.2
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@ -2046,7 +2052,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by xcb-util-cursor $as_me 0.1.1, which was
|
||||
It was created by xcb-util-cursor $as_me 0.1.2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@ -4188,7 +4194,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xcb-util-cursor'
|
||||
VERSION='0.1.1'
|
||||
VERSION='0.1.2'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@ -13288,6 +13294,55 @@ $as_echo "$supported" >&6; }
|
||||
fi
|
||||
fi
|
||||
|
||||
if test $found = "no" ; then
|
||||
if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
|
||||
fi
|
||||
|
||||
if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
|
||||
fi
|
||||
|
||||
CFLAGS="$CFLAGS -fd"
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5
|
||||
$as_echo_n "checking if $CC supports -fd... " >&6; }
|
||||
cacheid=xorg_cv_cc_flag__fd
|
||||
if eval \${$cacheid+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int i;
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval $cacheid=yes
|
||||
else
|
||||
eval $cacheid=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
|
||||
CFLAGS="$xorg_testset_save_CFLAGS"
|
||||
|
||||
eval supported=\$$cacheid
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
|
||||
$as_echo "$supported" >&6; }
|
||||
if test "$supported" = "yes" ; then
|
||||
BASE_CFLAGS="$BASE_CFLAGS -fd"
|
||||
found="yes"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
@ -13778,124 +13833,6 @@ $as_echo "$supported" >&6; }
|
||||
|
||||
|
||||
|
||||
xorg_testset_save_CFLAGS="$CFLAGS"
|
||||
|
||||
if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
|
||||
$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
|
||||
if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int i;
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
xorg_cv_cc_flag_unknown_warning_option=yes
|
||||
else
|
||||
xorg_cv_cc_flag_unknown_warning_option=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
|
||||
$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
|
||||
xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
|
||||
CFLAGS="$xorg_testset_save_CFLAGS"
|
||||
fi
|
||||
|
||||
if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
|
||||
if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
|
||||
fi
|
||||
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
|
||||
$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
|
||||
if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int i;
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
xorg_cv_cc_flag_unused_command_line_argument=yes
|
||||
else
|
||||
xorg_cv_cc_flag_unused_command_line_argument=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
|
||||
$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
|
||||
xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
|
||||
CFLAGS="$xorg_testset_save_CFLAGS"
|
||||
fi
|
||||
|
||||
found="no"
|
||||
|
||||
if test $found = "no" ; then
|
||||
if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
|
||||
fi
|
||||
|
||||
if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
|
||||
fi
|
||||
|
||||
CFLAGS="$CFLAGS -Wcast-qual"
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wcast-qual" >&5
|
||||
$as_echo_n "checking if $CC supports -Wcast-qual... " >&6; }
|
||||
cacheid=xorg_cv_cc_flag__Wcast_qual
|
||||
if eval \${$cacheid+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int i;
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval $cacheid=yes
|
||||
else
|
||||
eval $cacheid=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
|
||||
CFLAGS="$xorg_testset_save_CFLAGS"
|
||||
|
||||
eval supported=\$$cacheid
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
|
||||
$as_echo "$supported" >&6; }
|
||||
if test "$supported" = "yes" ; then
|
||||
BASE_CFLAGS="$BASE_CFLAGS -Wcast-qual"
|
||||
found="yes"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
xorg_testset_save_CFLAGS="$CFLAGS"
|
||||
|
||||
if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
|
||||
@ -14119,13 +14056,132 @@ $as_echo "$supported" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls])
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
xorg_testset_save_CFLAGS="$CFLAGS"
|
||||
|
||||
if test "x$xorg_testset_cc_unknown_warning_option" = "x" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unknown-warning-option" >&5
|
||||
$as_echo_n "checking if $CC supports -Werror=unknown-warning-option... " >&6; }
|
||||
if ${xorg_cv_cc_flag_unknown_warning_option+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int i;
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
xorg_cv_cc_flag_unknown_warning_option=yes
|
||||
else
|
||||
xorg_cv_cc_flag_unknown_warning_option=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unknown_warning_option" >&5
|
||||
$as_echo "$xorg_cv_cc_flag_unknown_warning_option" >&6; }
|
||||
xorg_testset_cc_unknown_warning_option=$xorg_cv_cc_flag_unknown_warning_option
|
||||
CFLAGS="$xorg_testset_save_CFLAGS"
|
||||
fi
|
||||
|
||||
if test "x$xorg_testset_cc_unused_command_line_argument" = "x" ; then
|
||||
if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
|
||||
fi
|
||||
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=unused-command-line-argument" >&5
|
||||
$as_echo_n "checking if $CC supports -Werror=unused-command-line-argument... " >&6; }
|
||||
if ${xorg_cv_cc_flag_unused_command_line_argument+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int i;
|
||||
_ACEOF
|
||||
if ac_fn_c_try_compile "$LINENO"; then :
|
||||
xorg_cv_cc_flag_unused_command_line_argument=yes
|
||||
else
|
||||
xorg_cv_cc_flag_unused_command_line_argument=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xorg_cv_cc_flag_unused_command_line_argument" >&5
|
||||
$as_echo "$xorg_cv_cc_flag_unused_command_line_argument" >&6; }
|
||||
xorg_testset_cc_unused_command_line_argument=$xorg_cv_cc_flag_unused_command_line_argument
|
||||
CFLAGS="$xorg_testset_save_CFLAGS"
|
||||
fi
|
||||
|
||||
found="no"
|
||||
|
||||
if test $found = "no" ; then
|
||||
if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unknown-warning-option"
|
||||
fi
|
||||
|
||||
if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then
|
||||
CFLAGS="$CFLAGS -Werror=unused-command-line-argument"
|
||||
fi
|
||||
|
||||
CFLAGS="$CFLAGS -Wlogical-op"
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5
|
||||
$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; }
|
||||
cacheid=xorg_cv_cc_flag__Wlogical_op
|
||||
if eval \${$cacheid+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
int i;
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
_ACEOF
|
||||
if ac_fn_c_try_link "$LINENO"; then :
|
||||
eval $cacheid=yes
|
||||
else
|
||||
eval $cacheid=no
|
||||
fi
|
||||
rm -f core conftest.err conftest.$ac_objext \
|
||||
conftest$ac_exeext conftest.$ac_ext
|
||||
fi
|
||||
|
||||
|
||||
CFLAGS="$xorg_testset_save_CFLAGS"
|
||||
|
||||
eval supported=\$$cacheid
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5
|
||||
$as_echo "$supported" >&6; }
|
||||
if test "$supported" = "yes" ; then
|
||||
BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op"
|
||||
found="yes"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# These are currently disabled because they are noisy. They will be enabled
|
||||
# in the future once the codebase is sufficiently modernized to silence
|
||||
# them. For now, I don't want them to drown out the other warnings.
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align])
|
||||
# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual])
|
||||
|
||||
# Turn some warnings into errors, so we don't accidently get successful builds
|
||||
# when there are problems that should be fixed.
|
||||
@ -17995,6 +18051,7 @@ $as_echo "$build_devel_docs" >&6; }
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-doxygen was given.
|
||||
if test "${with_doxygen+set}" = set; then :
|
||||
withval=$with_doxygen; use_doxygen=$withval
|
||||
@ -18107,6 +18164,63 @@ else
|
||||
as_fn_error $? "--with-doxygen expects 'yes' or 'no'" "$LINENO" 5
|
||||
fi
|
||||
|
||||
|
||||
HAVE_DOT=no
|
||||
if test "x$have_doxygen" = "xyes"; then
|
||||
# Extract the first word of "dot", so it can be a program name with args.
|
||||
set dummy dot; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_DOT+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $DOT in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_DOT="$DOT" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_DOT="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
DOT=$ac_cv_path_DOT
|
||||
if test -n "$DOT"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOT" >&5
|
||||
$as_echo "$DOT" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
if test "x$DOT" != "x"; then
|
||||
HAVE_DOT=yes
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
if test "$HAVE_DOT" = "yes"; then
|
||||
HAVE_DOT_TRUE=
|
||||
HAVE_DOT_FALSE='#'
|
||||
else
|
||||
HAVE_DOT_TRUE='#'
|
||||
HAVE_DOT_FALSE=
|
||||
fi
|
||||
|
||||
if test "$have_doxygen" = yes; then
|
||||
HAVE_DOXYGEN_TRUE=
|
||||
HAVE_DOXYGEN_FALSE='#'
|
||||
@ -18122,7 +18236,7 @@ fi
|
||||
GPERF=${GPERF-"${am_missing_run}gperf"}
|
||||
|
||||
|
||||
for ac_header in endian.h sys/endian.h sys/byteorder.h
|
||||
for ac_header in endian.h sys/endian.h sys/byteorder.h libkern/OSByteOrder.h
|
||||
do :
|
||||
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
|
||||
@ -18600,6 +18714,10 @@ if test -z "${ENABLE_DEVEL_DOCS_TRUE}" && test -z "${ENABLE_DEVEL_DOCS_FALSE}";
|
||||
as_fn_error $? "conditional \"ENABLE_DEVEL_DOCS\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_DOT_TRUE}" && test -z "${HAVE_DOT_FALSE}"; then
|
||||
as_fn_error $? "conditional \"HAVE_DOT\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
fi
|
||||
if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then
|
||||
as_fn_error $? "conditional \"HAVE_DOXYGEN\" was never defined.
|
||||
Usually this means the macro was only invoked conditionally." "$LINENO" 5
|
||||
@ -19001,7 +19119,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by xcb-util-cursor $as_me 0.1.1, which was
|
||||
This file was extended by xcb-util-cursor $as_me 0.1.2, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@ -19058,7 +19176,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
xcb-util-cursor config.status 0.1.1
|
||||
xcb-util-cursor config.status 0.1.2
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
dnl XCB_UTIL_M4_WITH_INCLUDE_PATH requires Autoconf >= 2.62
|
||||
AC_PREREQ(2.62)
|
||||
AC_INIT([xcb-util-cursor],0.1.1,[xcb@lists.freedesktop.org])
|
||||
AC_INIT([xcb-util-cursor],0.1.2,[xcb@lists.freedesktop.org])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
@ -19,7 +19,7 @@ XCB_UTIL_COMMON([1.4], [1.6])
|
||||
|
||||
AM_MISSING_PROG([GPERF], [gperf])
|
||||
|
||||
AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h], [break])
|
||||
AC_CHECK_HEADERS([endian.h sys/endian.h sys/byteorder.h libkern/OSByteOrder.h], [break])
|
||||
AC_CHECK_FUNCS([le32toh])
|
||||
|
||||
PKG_CHECK_MODULES(XCB_RENDER, xcb-render)
|
||||
|
||||
@ -20,7 +20,7 @@ EXTRA_DIST = xcb-cursor.pc.in cursor.h shape_to_id.gperf
|
||||
GPERFFLAGS = --includes --struct-type --language=ANSI-C --switch=1
|
||||
CLEANFILES = shape_to_id.c
|
||||
|
||||
# shape_to_id.c: ${srcdir}/shape_to_id.gperf
|
||||
# shape_to_id.c: shape_to_id.gperf
|
||||
# $(AM_V_GEN)if $(GPERF) $(GPERFFLAGS) shape_to_id.gperf >$@t; then \
|
||||
mv $@t $@; \
|
||||
elif $(GPERF) --version >/dev/null 2>&1; then \
|
||||
|
||||
@ -186,6 +186,7 @@ CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DOT = @DOT@
|
||||
DOXYGEN = @DOXYGEN@
|
||||
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
|
||||
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
|
||||
@ -201,6 +202,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||
GPERF = @GPERF@
|
||||
GREP = @GREP@
|
||||
HAVE_DOT = @HAVE_DOT@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_CMD = @INSTALL_CMD@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
@ -733,7 +735,7 @@ uninstall-am: uninstall-libLTLIBRARIES uninstall-pkgconfigDATA \
|
||||
uninstall-xcbincludeHEADERS
|
||||
|
||||
|
||||
# shape_to_id.c: ${srcdir}/shape_to_id.gperf
|
||||
# shape_to_id.c: shape_to_id.gperf
|
||||
# $(AM_V_GEN)if $(GPERF) $(GPERFFLAGS) shape_to_id.gperf >$@t; then \
|
||||
# mv $@t $@; \
|
||||
# elif $(GPERF) --version >/dev/null 2>&1; then \
|
||||
|
||||
@ -207,6 +207,8 @@ xcb_cursor_t xcb_cursor_load_cursor(xcb_cursor_context_t *c, const char *name) {
|
||||
if (fd == -1 || core_char > -1) {
|
||||
if (core_char == -1)
|
||||
core_char = cursor_shape_to_id(name);
|
||||
if (core_char == -1)
|
||||
return XCB_NONE;
|
||||
|
||||
cid = xcb_generate_id(c->conn);
|
||||
xcb_create_glyph_cursor(c->conn, cid, c->cursor_font, c->cursor_font, core_char, core_char + 1, 0, 0, 0, 65535, 65535, 65535);
|
||||
|
||||
@ -51,6 +51,9 @@
|
||||
# ifndef HAVE_LE32TOH
|
||||
# define le32toh(x) LE_32(x)
|
||||
# endif
|
||||
#elif defined(HAVE_LIBKERN_OSBYTEORDER_H)
|
||||
#include <libkern/OSByteOrder.h>
|
||||
#define le32toh(x) OSSwapLittleToHostInt32(x)
|
||||
#endif
|
||||
|
||||
#include <xcb/xcb.h>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user