Update to libXres 1.0.5. No functionnal change.
This commit is contained in:
matthieu
parent
b8b5099e37
commit
8d0a4ee38e
@ -1,3 +1,180 @@
|
|||||||
|
commit 1cb91aaf819ae3c9385c130e4fa0146057c4c89b
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Thu Oct 28 16:21:39 2010 -0700
|
||||||
|
|
||||||
|
libXres 1.0.5
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit 564236eb299eb9224f4f09c7bda5bebc987c8af9
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Thu Oct 28 16:19:46 2010 -0700
|
||||||
|
|
||||||
|
Sun's copyrights now belong to Oracle
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit f00517c478c6e34afd7d1e1477554156d36baf0e
|
||||||
|
Author: Jesse Adkins <jesserayadkins@gmail.com>
|
||||||
|
Date: Tue Sep 28 13:30:02 2010 -0700
|
||||||
|
|
||||||
|
Purge cvs tags.
|
||||||
|
|
||||||
|
Signed-off-by: Jesse Adkins <jesserayadkins@gmail.com>
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit c8bbca66bc1cf75ca01c66901605549dc780def6
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Tue Aug 17 08:39:22 2010 -0400
|
||||||
|
|
||||||
|
man: store shadow man pages in git rather than generating them
|
||||||
|
|
||||||
|
Simplify the build process and the makefile.
|
||||||
|
|
||||||
|
Local fix in CVS for bug 5628 is not required
|
||||||
|
as the problem has been fixed in
|
||||||
|
util-macros d9062e4077ebfd0985baf8418f3d0f111b9ddbba
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit b4975daf8c85eda619da1cb6f1584876786feaaa
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Thu Jul 8 14:55:32 2010 -0700
|
||||||
|
|
||||||
|
config: upgrade to util-macros 1.8 for additional man page support
|
||||||
|
|
||||||
|
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
|
||||||
|
The value of MAN_SUBST is the same for all X.Org packages.
|
||||||
|
|
||||||
|
Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
|
||||||
|
Use platform appropriate version of sed.
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit d2a60612f4a9f50830d3c62780fe74507a8c82ad
|
||||||
|
Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
|
||||||
|
Date: Thu Jul 1 07:03:29 2010 -0300
|
||||||
|
|
||||||
|
Purge macros NEED_EVENTS and NEED_REPLIES
|
||||||
|
|
||||||
|
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
|
||||||
|
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
|
||||||
|
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit f0c0c4e6d50c65b7da6f72404796c25f860a3198
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Mon Mar 29 16:50:33 2010 -0400
|
||||||
|
|
||||||
|
config: update AC_PREREQ statement to 2.60
|
||||||
|
|
||||||
|
Unrelated to the previous patches, the new value simply reflects
|
||||||
|
the reality that the minimum level for autoconf to configure
|
||||||
|
all x.org modules is 2.60 dated June 2006.
|
||||||
|
|
||||||
|
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit eca8fc252af729453a2db8218fcfe3a686ba3df5
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Mon Mar 29 14:53:48 2010 -0400
|
||||||
|
|
||||||
|
config: remove the pkgconfig pc.in file from EXTRA_DIST
|
||||||
|
|
||||||
|
Automake always includes it in the tarball.
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit ceaddfbd0f55c4863bed9c42fcce1fad0348ad19
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Tue Feb 16 10:37:21 2010 -0500
|
||||||
|
|
||||||
|
config: move CWARNFLAGS from configure.ac to Makefile.am
|
||||||
|
|
||||||
|
Compiler warning flags should be explicitly set in the makefile
|
||||||
|
rather than being merged with other packages compiler flags.
|
||||||
|
|
||||||
|
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|
||||||
|
commit 17eeac2a9218f5d22c71d18eee9ec1fe64bdbf5a
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||||
|
Date: Thu Jan 14 21:12:39 2010 -0800
|
||||||
|
|
||||||
|
Update Sun license notices to current X.Org standard form
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||||
|
|
||||||
|
commit 79251c2f41643ba06d0fd706ea4116f7924ddefa
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Fri Nov 27 20:56:03 2009 -0500
|
||||||
|
|
||||||
|
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
|
||||||
|
|
||||||
|
Now that the INSTALL file is generated.
|
||||||
|
Allows running make maintainer-clean.
|
||||||
|
|
||||||
|
commit 1f393e74c3dd55c3422804cac98716f1e7e35d85
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Wed Oct 28 15:08:51 2009 -0400
|
||||||
|
|
||||||
|
configure.ac: AM_MAINTAINER_MODE missing #24238
|
||||||
|
|
||||||
|
This turns off maintainer mode build rules in tarballs.
|
||||||
|
Works in conjunction with autogen.sh --enable-maintainer-mode
|
||||||
|
For all X.Org components.
|
||||||
|
|
||||||
|
commit c4f650e235c4cb286377792b836a551e9b63a0e5
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Wed Oct 28 14:09:10 2009 -0400
|
||||||
|
|
||||||
|
INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
|
||||||
|
|
||||||
|
Add missing INSTALL file. Use standard GNU file on building tarball
|
||||||
|
README may have been updated
|
||||||
|
Remove AUTHORS file as it is empty and no content available yet.
|
||||||
|
Remove NEWS file as it is empty and no content available yet.
|
||||||
|
|
||||||
|
commit a8ab75d941ebf3fe83832c990dd7e5f75dc0971b
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Mon Oct 26 22:08:42 2009 -0400
|
||||||
|
|
||||||
|
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
|
||||||
|
|
||||||
|
ChangeLog filename is known to Automake and requires no further
|
||||||
|
coding in the makefile.
|
||||||
|
|
||||||
|
commit 24890a580d43d2224f6f7074c1e3cb2072536d81
|
||||||
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
Date: Thu Oct 22 12:34:19 2009 -0400
|
||||||
|
|
||||||
|
.gitignore: use common defaults with custom section # 24239
|
||||||
|
|
||||||
|
Using common defaults will reduce errors and maintenance.
|
||||||
|
Only the very small or inexistent custom section need periodic maintenance
|
||||||
|
when the structure of the component changes. Do not edit defaults.
|
||||||
|
|
||||||
|
commit c34ef112fa1b20ee65a6b287759e899bca2c5823
|
||||||
|
Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||||
|
Date: Wed Oct 21 12:47:23 2009 -0700
|
||||||
|
|
||||||
|
This is not a GNU project, so declare it foreign.
|
||||||
|
|
||||||
|
On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote:
|
||||||
|
> On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote:
|
||||||
|
> > I noticed an INSTALL file in xlsclients and libXvMC today, and it
|
||||||
|
> > was quite annoying to work around since 'autoreconf -fvi' replaces
|
||||||
|
> > it and git wants to commit it. Should these files even be in git?
|
||||||
|
> > Can I nuke them for the betterment of humanity and since they get
|
||||||
|
> > created by autoreconf anyways?
|
||||||
|
>
|
||||||
|
> See https://bugs.freedesktop.org/show_bug.cgi?id=24206
|
||||||
|
|
||||||
|
As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with
|
||||||
|
AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation
|
||||||
|
of the INSTALL file. It is also part of the 24206 solution.
|
||||||
|
|
||||||
|
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
|
||||||
|
|
||||||
commit 08032a51fccda19ad4722015f4cc0b1a587592f7
|
commit 08032a51fccda19ad4722015f4cc0b1a587592f7
|
||||||
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
Author: Alan Coopersmith <alan.coopersmith@sun.com>
|
||||||
Date: Fri Oct 9 07:54:44 2009 -0700
|
Date: Fri Oct 9 07:54:44 2009 -0700
|
||||||
|
|||||||
@ -1,5 +1,8 @@
|
|||||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
|
Installation Instructions
|
||||||
Foundation, Inc.
|
*************************
|
||||||
|
|
||||||
|
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
|
||||||
|
2006, 2007, 2008 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is free documentation; the Free Software Foundation gives
|
This file is free documentation; the Free Software Foundation gives
|
||||||
unlimited permission to copy, distribute and modify it.
|
unlimited permission to copy, distribute and modify it.
|
||||||
@ -7,7 +10,10 @@ unlimited permission to copy, distribute and modify it.
|
|||||||
Basic Installation
|
Basic Installation
|
||||||
==================
|
==================
|
||||||
|
|
||||||
These are generic installation instructions.
|
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.
|
||||||
|
|
||||||
The `configure' shell script attempts to guess correct values for
|
The `configure' shell script attempts to guess correct values for
|
||||||
various system-dependent variables used during compilation. It uses
|
various system-dependent variables used during compilation. It uses
|
||||||
@ -20,9 +26,9 @@ debugging `configure').
|
|||||||
|
|
||||||
It can also use an optional file (typically called `config.cache'
|
It can also use an optional file (typically called `config.cache'
|
||||||
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
||||||
the results of its tests to speed up reconfiguring. (Caching is
|
the results of its tests to speed up reconfiguring. Caching is
|
||||||
disabled by default to prevent problems with accidental use of stale
|
disabled by default to prevent problems with accidental use of stale
|
||||||
cache files.)
|
cache files.
|
||||||
|
|
||||||
If you need to do unusual things to compile the package, please try
|
If you need to do unusual things to compile the package, please try
|
||||||
to figure out how `configure' could check whether to do them, and mail
|
to figure out how `configure' could check whether to do them, and mail
|
||||||
@ -32,20 +38,17 @@ some point `config.cache' contains results you don't want to keep, you
|
|||||||
may remove or edit it.
|
may remove or edit it.
|
||||||
|
|
||||||
The file `configure.ac' (or `configure.in') is used to create
|
The file `configure.ac' (or `configure.in') is used to create
|
||||||
`configure' by a program called `autoconf'. You only need
|
`configure' by a program called `autoconf'. You need `configure.ac' if
|
||||||
`configure.ac' if you want to change it or regenerate `configure' using
|
you want to change it or regenerate `configure' using a newer version
|
||||||
a newer version of `autoconf'.
|
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
|
1. `cd' to the directory containing the package's source code and type
|
||||||
`./configure' to configure the package for your system. If you're
|
`./configure' to configure the package for your system.
|
||||||
using `csh' on an old version of System V, you might need to type
|
|
||||||
`sh ./configure' instead to prevent `csh' from trying to execute
|
|
||||||
`configure' itself.
|
|
||||||
|
|
||||||
Running `configure' takes awhile. While running, it prints some
|
Running `configure' might take a while. While running, it prints
|
||||||
messages telling which features it is checking for.
|
some messages telling which features it is checking for.
|
||||||
|
|
||||||
2. Type `make' to compile the package.
|
2. Type `make' to compile the package.
|
||||||
|
|
||||||
@ -64,6 +67,9 @@ The simplest way to compile this package is:
|
|||||||
all sorts of other programs in order to regenerate files that came
|
all sorts of other programs in order to regenerate files that came
|
||||||
with the distribution.
|
with the distribution.
|
||||||
|
|
||||||
|
6. Often, you can also type `make uninstall' to remove the installed
|
||||||
|
files again.
|
||||||
|
|
||||||
Compilers and Options
|
Compilers and Options
|
||||||
=====================
|
=====================
|
||||||
|
|
||||||
@ -75,7 +81,7 @@ for details on some of the pertinent environment variables.
|
|||||||
by setting variables in the command line or in the environment. Here
|
by setting variables in the command line or in the environment. Here
|
||||||
is an example:
|
is an example:
|
||||||
|
|
||||||
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
|
./configure CC=c99 CFLAGS=-g LIBS=-lposix
|
||||||
|
|
||||||
*Note Defining Variables::, for more details.
|
*Note Defining Variables::, for more details.
|
||||||
|
|
||||||
@ -84,34 +90,46 @@ Compiling For Multiple Architectures
|
|||||||
|
|
||||||
You can compile the package for more than one kind of computer at the
|
You can compile the package for more than one kind of computer at the
|
||||||
same time, by placing the object files for each architecture in their
|
same time, by placing the object files for each architecture in their
|
||||||
own directory. To do this, you must use a version of `make' that
|
own directory. To do this, you can use GNU `make'. `cd' to the
|
||||||
supports the `VPATH' variable, such as GNU `make'. `cd' to the
|
|
||||||
directory where you want the object files and executables to go and run
|
directory where you want the object files and executables to go and run
|
||||||
the `configure' script. `configure' automatically checks for the
|
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 `..'.
|
||||||
|
|
||||||
If you have to use a `make' that does not support the `VPATH'
|
With a non-GNU `make', it is safer to compile the package for one
|
||||||
variable, you have to compile the package for one architecture at a
|
architecture at a time in the source code directory. After you have
|
||||||
time in the source code directory. After you have installed the
|
installed the package for one architecture, use `make distclean' before
|
||||||
package for one architecture, use `make distclean' before reconfiguring
|
reconfiguring for another architecture.
|
||||||
for another architecture.
|
|
||||||
|
On MacOS X 10.5 and later systems, you can create libraries and
|
||||||
|
executables that work on multiple system types--known as "fat" or
|
||||||
|
"universal" binaries--by specifying multiple `-arch' options to the
|
||||||
|
compiler but only a single `-arch' option to the preprocessor. Like
|
||||||
|
this:
|
||||||
|
|
||||||
|
./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||||
|
CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
|
||||||
|
CPP="gcc -E" CXXCPP="g++ -E"
|
||||||
|
|
||||||
|
This is not guaranteed to produce working output in all cases, you
|
||||||
|
may have to build one architecture at a time and combine the results
|
||||||
|
using the `lipo' tool if you have problems.
|
||||||
|
|
||||||
Installation Names
|
Installation Names
|
||||||
==================
|
==================
|
||||||
|
|
||||||
By default, `make install' will install the package's files in
|
By default, `make install' installs the package's commands under
|
||||||
`/usr/local/bin', `/usr/local/man', etc. You can specify an
|
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
||||||
installation prefix other than `/usr/local' by giving `configure' the
|
can specify an installation prefix other than `/usr/local' by giving
|
||||||
option `--prefix=PATH'.
|
`configure' the option `--prefix=PREFIX'.
|
||||||
|
|
||||||
You can specify separate installation prefixes for
|
You can specify separate installation prefixes for
|
||||||
architecture-specific files and architecture-independent files. If you
|
architecture-specific files and architecture-independent files. If you
|
||||||
give `configure' the option `--exec-prefix=PATH', the package will use
|
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
||||||
PATH as the prefix for installing programs and libraries.
|
PREFIX as the prefix for installing programs and libraries.
|
||||||
Documentation and other data files will still use the regular prefix.
|
Documentation and other data files still use the regular prefix.
|
||||||
|
|
||||||
In addition, if you use an unusual directory layout you can give
|
In addition, if you use an unusual directory layout you can give
|
||||||
options like `--bindir=PATH' to specify different values for particular
|
options like `--bindir=DIR' to specify different values for particular
|
||||||
kinds of files. Run `configure --help' for a list of the directories
|
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.
|
||||||
|
|
||||||
@ -134,6 +152,28 @@ find the X include and library files automatically, but if it doesn't,
|
|||||||
you can use the `configure' options `--x-includes=DIR' and
|
you can use the `configure' options `--x-includes=DIR' and
|
||||||
`--x-libraries=DIR' to specify their locations.
|
`--x-libraries=DIR' to specify their locations.
|
||||||
|
|
||||||
|
Particular systems
|
||||||
|
==================
|
||||||
|
|
||||||
|
On HP-UX, the default C compiler is not ANSI C compatible. If GNU
|
||||||
|
CC is not installed, it is recommended to use the following options in
|
||||||
|
order to use an ANSI C compiler:
|
||||||
|
|
||||||
|
./configure CC="cc -Ae"
|
||||||
|
|
||||||
|
and if that doesn't work, install pre-built binaries of GCC for HP-UX.
|
||||||
|
|
||||||
|
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
|
||||||
|
to try
|
||||||
|
|
||||||
|
./configure CC="cc"
|
||||||
|
|
||||||
|
and if that doesn't work, try
|
||||||
|
|
||||||
|
./configure CC="cc -nodtk"
|
||||||
|
|
||||||
Specifying the System Type
|
Specifying the System Type
|
||||||
==========================
|
==========================
|
||||||
|
|
||||||
@ -156,7 +196,7 @@ where SYSTEM can have one of these forms:
|
|||||||
need to know the machine type.
|
need to know the machine type.
|
||||||
|
|
||||||
If you are _building_ compiler tools for cross-compiling, you should
|
If you are _building_ compiler tools for cross-compiling, you should
|
||||||
use the `--target=TYPE' option to select the type of system they will
|
use the option `--target=TYPE' to select the type of system they will
|
||||||
produce code for.
|
produce code for.
|
||||||
|
|
||||||
If you want to _use_ a cross compiler, that generates code for a
|
If you want to _use_ a cross compiler, that generates code for a
|
||||||
@ -186,9 +226,14 @@ them in the `configure' command line, using `VAR=value'. For example:
|
|||||||
|
|
||||||
./configure CC=/usr/local2/bin/gcc
|
./configure CC=/usr/local2/bin/gcc
|
||||||
|
|
||||||
will cause the specified gcc to be used as the C compiler (unless it is
|
causes the specified `gcc' to be used as the C compiler (unless it is
|
||||||
overridden in the site shell script).
|
overridden in the site shell script).
|
||||||
|
|
||||||
|
Unfortunately, this technique does not work for `CONFIG_SHELL' due to
|
||||||
|
an Autoconf bug. Until the bug is fixed you can use this workaround:
|
||||||
|
|
||||||
|
CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
|
||||||
|
|
||||||
`configure' Invocation
|
`configure' Invocation
|
||||||
======================
|
======================
|
||||||
|
|
||||||
@ -197,7 +242,14 @@ operates.
|
|||||||
|
|
||||||
`--help'
|
`--help'
|
||||||
`-h'
|
`-h'
|
||||||
Print a summary of the options to `configure', and exit.
|
Print a summary of all of the options to `configure', and exit.
|
||||||
|
|
||||||
|
`--help=short'
|
||||||
|
`--help=recursive'
|
||||||
|
Print a summary of the options unique to this package's
|
||||||
|
`configure', and exit. The `short' variant lists options used
|
||||||
|
only in the top level, while the `recursive' variant lists options
|
||||||
|
also present in any nested packages.
|
||||||
|
|
||||||
`--version'
|
`--version'
|
||||||
`-V'
|
`-V'
|
||||||
@ -224,6 +276,16 @@ operates.
|
|||||||
Look for the package's source code in directory DIR. Usually
|
Look for the package's source code in directory DIR. Usually
|
||||||
`configure' can determine that directory automatically.
|
`configure' can determine that directory automatically.
|
||||||
|
|
||||||
|
`--prefix=DIR'
|
||||||
|
Use DIR as the installation prefix. *Note Installation Names::
|
||||||
|
for more details, including other options available for fine-tuning
|
||||||
|
the installation locations.
|
||||||
|
|
||||||
|
`--no-create'
|
||||||
|
`-n'
|
||||||
|
Run the configure checks, but stop before creating any output
|
||||||
|
files.
|
||||||
|
|
||||||
`configure' also accepts some other, not widely useful, options. Run
|
`configure' also accepts some other, not widely useful, options. Run
|
||||||
`configure --help' for more details.
|
`configure --help' for more details.
|
||||||
|
|
||||||
|
|||||||
@ -27,12 +27,14 @@ SUBDIRS = src man
|
|||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = xres.pc
|
pkgconfig_DATA = xres.pc
|
||||||
|
|
||||||
EXTRA_DIST = xres.pc.in ChangeLog
|
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||||
MAINTAINERCLEANFILES = ChangeLog
|
|
||||||
|
|
||||||
.PHONY: ChangeLog
|
.PHONY: ChangeLog INSTALL
|
||||||
|
|
||||||
|
INSTALL:
|
||||||
|
$(INSTALL_CMD)
|
||||||
|
|
||||||
ChangeLog:
|
ChangeLog:
|
||||||
$(CHANGELOG_CMD)
|
$(CHANGELOG_CMD)
|
||||||
|
|
||||||
dist-hook: ChangeLog
|
dist-hook: ChangeLog INSTALL
|
||||||
|
|||||||
@ -103,12 +103,14 @@ am__remove_distdir = \
|
|||||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||||
GZIP_ENV = --best
|
GZIP_ENV = --best
|
||||||
distuninstallcheck_listfiles = find . -type f -print
|
distuninstallcheck_listfiles = find . -type f -print
|
||||||
|
distcleancheck_listfiles = find . -type f -print
|
||||||
ACLOCAL = @ACLOCAL@
|
ACLOCAL = @ACLOCAL@
|
||||||
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
|
||||||
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
||||||
AMDEP_FALSE = @AMDEP_FALSE@
|
AMDEP_FALSE = @AMDEP_FALSE@
|
||||||
AMDEP_TRUE = @AMDEP_TRUE@
|
AMDEP_TRUE = @AMDEP_TRUE@
|
||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
APP_MAN_DIR = @APP_MAN_DIR@
|
APP_MAN_DIR = @APP_MAN_DIR@
|
||||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
@ -144,6 +146,7 @@ FFLAGS = @FFLAGS@
|
|||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
GREP = @GREP@
|
GREP = @GREP@
|
||||||
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
@ -156,8 +159,12 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
|
|||||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||||
LN_S = @LN_S@
|
LN_S = @LN_S@
|
||||||
LTLIBOBJS = @LTLIBOBJS@
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
|
MAINT = @MAINT@
|
||||||
|
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||||
|
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
||||||
|
MAN_SUBSTS = @MAN_SUBSTS@
|
||||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
NMEDIT = @NMEDIT@
|
NMEDIT = @NMEDIT@
|
||||||
@ -177,6 +184,7 @@ SHELL = @SHELL@
|
|||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
||||||
|
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||||
XRES_CFLAGS = @XRES_CFLAGS@
|
XRES_CFLAGS = @XRES_CFLAGS@
|
||||||
XRES_LIBS = @XRES_LIBS@
|
XRES_LIBS = @XRES_LIBS@
|
||||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||||
@ -200,7 +208,6 @@ build_os = @build_os@
|
|||||||
build_vendor = @build_vendor@
|
build_vendor = @build_vendor@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
datarootdir = @datarootdir@
|
datarootdir = @datarootdir@
|
||||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
|
||||||
docdir = @docdir@
|
docdir = @docdir@
|
||||||
dvidir = @dvidir@
|
dvidir = @dvidir@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
@ -232,15 +239,14 @@ AUTOMAKE_OPTIONS = foreign
|
|||||||
SUBDIRS = src man
|
SUBDIRS = src man
|
||||||
pkgconfigdir = $(libdir)/pkgconfig
|
pkgconfigdir = $(libdir)/pkgconfig
|
||||||
pkgconfig_DATA = xres.pc
|
pkgconfig_DATA = xres.pc
|
||||||
EXTRA_DIST = xres.pc.in ChangeLog
|
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||||
MAINTAINERCLEANFILES = ChangeLog
|
|
||||||
all: config.h
|
all: config.h
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
am--refresh:
|
am--refresh:
|
||||||
@:
|
@:
|
||||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||||
@for dep in $?; do \
|
@for dep in $?; do \
|
||||||
case '$(am__configure_deps)' in \
|
case '$(am__configure_deps)' in \
|
||||||
*$$dep*) \
|
*$$dep*) \
|
||||||
@ -267,9 +273,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||||
$(SHELL) ./config.status --recheck
|
$(SHELL) ./config.status --recheck
|
||||||
|
|
||||||
$(top_srcdir)/configure: $(am__configure_deps)
|
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
cd $(srcdir) && $(AUTOCONF)
|
cd $(srcdir) && $(AUTOCONF)
|
||||||
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||||
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
|
||||||
|
|
||||||
config.h: stamp-h1
|
config.h: stamp-h1
|
||||||
@ -281,7 +287,7 @@ config.h: stamp-h1
|
|||||||
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
|
stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
|
||||||
@rm -f stamp-h1
|
@rm -f stamp-h1
|
||||||
cd $(top_builddir) && $(SHELL) ./config.status config.h
|
cd $(top_builddir) && $(SHELL) ./config.status config.h
|
||||||
$(srcdir)/config.h.in: $(am__configure_deps)
|
$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
cd $(top_srcdir) && $(AUTOHEADER)
|
cd $(top_srcdir) && $(AUTOHEADER)
|
||||||
rm -f stamp-h1
|
rm -f stamp-h1
|
||||||
touch $@
|
touch $@
|
||||||
@ -698,12 +704,15 @@ uninstall-info: uninstall-info-recursive
|
|||||||
uninstall-pkgconfigDATA
|
uninstall-pkgconfigDATA
|
||||||
|
|
||||||
|
|
||||||
.PHONY: ChangeLog
|
.PHONY: ChangeLog INSTALL
|
||||||
|
|
||||||
|
INSTALL:
|
||||||
|
$(INSTALL_CMD)
|
||||||
|
|
||||||
ChangeLog:
|
ChangeLog:
|
||||||
$(CHANGELOG_CMD)
|
$(CHANGELOG_CMD)
|
||||||
|
|
||||||
dist-hook: ChangeLog
|
dist-hook: ChangeLog INSTALL
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
.NOEXPORT:
|
.NOEXPORT:
|
||||||
|
|||||||
864
lib/libXRes/aclocal.m4
vendored
864
lib/libXRes/aclocal.m4
vendored
File diff suppressed because it is too large
Load Diff
490
lib/libXRes/configure
vendored
490
lib/libXRes/configure
vendored
@ -1,6 +1,6 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Guess values for system-dependent variables and create Makefiles.
|
# Guess values for system-dependent variables and create Makefiles.
|
||||||
# Generated by GNU Autoconf 2.62 for libXres 1.0.4.
|
# Generated by GNU Autoconf 2.62 for libXres 1.0.5.
|
||||||
#
|
#
|
||||||
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
|
||||||
#
|
#
|
||||||
@ -750,8 +750,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
|
|||||||
# Identity of this package.
|
# Identity of this package.
|
||||||
PACKAGE_NAME='libXres'
|
PACKAGE_NAME='libXres'
|
||||||
PACKAGE_TARNAME='libXres'
|
PACKAGE_TARNAME='libXres'
|
||||||
PACKAGE_VERSION='1.0.4'
|
PACKAGE_VERSION='1.0.5'
|
||||||
PACKAGE_STRING='libXres 1.0.4'
|
PACKAGE_STRING='libXres 1.0.5'
|
||||||
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
|
||||||
|
|
||||||
# Factoring default headers for most tests.
|
# Factoring default headers for most tests.
|
||||||
@ -848,6 +848,9 @@ am__leading_dot
|
|||||||
AMTAR
|
AMTAR
|
||||||
am__tar
|
am__tar
|
||||||
am__untar
|
am__untar
|
||||||
|
MAINTAINER_MODE_TRUE
|
||||||
|
MAINTAINER_MODE_FALSE
|
||||||
|
MAINT
|
||||||
CC
|
CC
|
||||||
CFLAGS
|
CFLAGS
|
||||||
LDFLAGS
|
LDFLAGS
|
||||||
@ -895,7 +898,8 @@ ac_ct_F77
|
|||||||
LIBTOOL
|
LIBTOOL
|
||||||
CWARNFLAGS
|
CWARNFLAGS
|
||||||
CHANGELOG_CMD
|
CHANGELOG_CMD
|
||||||
distcleancheck_listfiles
|
PKG_CONFIG
|
||||||
|
INSTALL_CMD
|
||||||
APP_MAN_SUFFIX
|
APP_MAN_SUFFIX
|
||||||
LIB_MAN_SUFFIX
|
LIB_MAN_SUFFIX
|
||||||
FILE_MAN_SUFFIX
|
FILE_MAN_SUFFIX
|
||||||
@ -908,7 +912,9 @@ FILE_MAN_DIR
|
|||||||
MISC_MAN_DIR
|
MISC_MAN_DIR
|
||||||
DRIVER_MAN_DIR
|
DRIVER_MAN_DIR
|
||||||
ADMIN_MAN_DIR
|
ADMIN_MAN_DIR
|
||||||
PKG_CONFIG
|
XORG_MAN_PAGE
|
||||||
|
MAN_SUBSTS
|
||||||
|
AM_DEFAULT_VERBOSITY
|
||||||
XRES_CFLAGS
|
XRES_CFLAGS
|
||||||
XRES_LIBS
|
XRES_LIBS
|
||||||
MALLOC_ZERO_CFLAGS
|
MALLOC_ZERO_CFLAGS
|
||||||
@ -919,6 +925,7 @@ LTLIBOBJS'
|
|||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
ac_user_opts='
|
ac_user_opts='
|
||||||
enable_option_checking
|
enable_option_checking
|
||||||
|
enable_maintainer_mode
|
||||||
enable_dependency_tracking
|
enable_dependency_tracking
|
||||||
enable_shared
|
enable_shared
|
||||||
enable_static
|
enable_static
|
||||||
@ -928,7 +935,6 @@ enable_libtool_lock
|
|||||||
with_pic
|
with_pic
|
||||||
with_tags
|
with_tags
|
||||||
enable_strict_compilation
|
enable_strict_compilation
|
||||||
with_release_version
|
|
||||||
enable_malloc0returnsnull
|
enable_malloc0returnsnull
|
||||||
'
|
'
|
||||||
ac_precious_vars='build_alias
|
ac_precious_vars='build_alias
|
||||||
@ -1501,7 +1507,7 @@ if test "$ac_init_help" = "long"; then
|
|||||||
# Omit some internal or obsolete options to make the list less imposing.
|
# 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.
|
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||||
cat <<_ACEOF
|
cat <<_ACEOF
|
||||||
\`configure' configures libXres 1.0.4 to adapt to many kinds of systems.
|
\`configure' configures libXres 1.0.5 to adapt to many kinds of systems.
|
||||||
|
|
||||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||||
|
|
||||||
@ -1571,7 +1577,7 @@ fi
|
|||||||
|
|
||||||
if test -n "$ac_init_help"; then
|
if test -n "$ac_init_help"; then
|
||||||
case $ac_init_help in
|
case $ac_init_help in
|
||||||
short | recursive ) echo "Configuration of libXres 1.0.4:";;
|
short | recursive ) echo "Configuration of libXres 1.0.5:";;
|
||||||
esac
|
esac
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
|
|
||||||
@ -1579,6 +1585,8 @@ Optional Features:
|
|||||||
--disable-option-checking ignore unrecognized --enable/--with options
|
--disable-option-checking ignore unrecognized --enable/--with options
|
||||||
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
|
||||||
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
|
||||||
|
--enable-maintainer-mode enable make rules and dependencies not useful
|
||||||
|
(and sometimes confusing) to the casual installer
|
||||||
--disable-dependency-tracking speeds up one-time build
|
--disable-dependency-tracking speeds up one-time build
|
||||||
--enable-dependency-tracking do not reject slow dependency extractors
|
--enable-dependency-tracking do not reject slow dependency extractors
|
||||||
--enable-shared[=PKGS] build shared libraries [default=yes]
|
--enable-shared[=PKGS] build shared libraries [default=yes]
|
||||||
@ -1599,8 +1607,6 @@ Optional Packages:
|
|||||||
--with-pic try to use only PIC/non-PIC objects [default=use
|
--with-pic try to use only PIC/non-PIC objects [default=use
|
||||||
both]
|
both]
|
||||||
--with-tags[=TAGS] include additional configurations [automatic]
|
--with-tags[=TAGS] include additional configurations [automatic]
|
||||||
--with-release-version=STRING
|
|
||||||
Use release version string in package name
|
|
||||||
|
|
||||||
Some influential environment variables:
|
Some influential environment variables:
|
||||||
CC C compiler command
|
CC C compiler command
|
||||||
@ -1686,7 +1692,7 @@ fi
|
|||||||
test -n "$ac_init_help" && exit $ac_status
|
test -n "$ac_init_help" && exit $ac_status
|
||||||
if $ac_init_version; then
|
if $ac_init_version; then
|
||||||
cat <<\_ACEOF
|
cat <<\_ACEOF
|
||||||
libXres configure 1.0.4
|
libXres configure 1.0.5
|
||||||
generated by GNU Autoconf 2.62
|
generated by GNU Autoconf 2.62
|
||||||
|
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
|
||||||
@ -1700,7 +1706,7 @@ cat >config.log <<_ACEOF
|
|||||||
This file contains any messages produced by compilers while
|
This file contains any messages produced by compilers while
|
||||||
running configure, to aid debugging if configure makes a mistake.
|
running configure, to aid debugging if configure makes a mistake.
|
||||||
|
|
||||||
It was created by libXres $as_me 1.0.4, which was
|
It was created by libXres $as_me 1.0.5, which was
|
||||||
generated by GNU Autoconf 2.62. Invocation command line was
|
generated by GNU Autoconf 2.62. Invocation command line was
|
||||||
|
|
||||||
$ $0 $@
|
$ $0 $@
|
||||||
@ -2349,7 +2355,7 @@ fi
|
|||||||
|
|
||||||
# Define the identity of the package.
|
# Define the identity of the package.
|
||||||
PACKAGE='libXres'
|
PACKAGE='libXres'
|
||||||
VERSION='1.0.4'
|
VERSION='1.0.5'
|
||||||
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
@ -2495,8 +2501,32 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
|
||||||
|
$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
|
||||||
|
# Check whether --enable-maintainer-mode was given.
|
||||||
|
if test "${enable_maintainer_mode+set}" = set; then
|
||||||
|
enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
|
||||||
|
else
|
||||||
|
USE_MAINTAINER_MODE=no
|
||||||
|
fi
|
||||||
|
|
||||||
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
|
{ $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
|
||||||
|
$as_echo "$USE_MAINTAINER_MODE" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
if test $USE_MAINTAINER_MODE = yes; then
|
||||||
|
MAINTAINER_MODE_TRUE=
|
||||||
|
MAINTAINER_MODE_FALSE='#'
|
||||||
|
else
|
||||||
|
MAINTAINER_MODE_TRUE='#'
|
||||||
|
MAINTAINER_MODE_FALSE=
|
||||||
|
fi
|
||||||
|
|
||||||
|
MAINT=$MAINTAINER_MODE_TRUE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -4398,7 +4428,7 @@ ia64-*-hpux*)
|
|||||||
;;
|
;;
|
||||||
*-*-irix6*)
|
*-*-irix6*)
|
||||||
# Find out which ABI we are using.
|
# Find out which ABI we are using.
|
||||||
echo '#line 4401 "configure"' > conftest.$ac_ext
|
echo '#line 4431 "configure"' > conftest.$ac_ext
|
||||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||||
(eval $ac_compile) 2>&5
|
(eval $ac_compile) 2>&5
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
@ -7506,11 +7536,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:7509: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:7539: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
(eval "$lt_compile" 2>conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
echo "$as_me:7513: \$? = $ac_status" >&5
|
echo "$as_me:7543: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
# So say no if there are warnings other than the usual output.
|
# So say no if there are warnings other than the usual output.
|
||||||
@ -7796,11 +7826,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:7799: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:7829: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
(eval "$lt_compile" 2>conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
echo "$as_me:7803: \$? = $ac_status" >&5
|
echo "$as_me:7833: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
# So say no if there are warnings other than the usual output.
|
# So say no if there are warnings other than the usual output.
|
||||||
@ -7900,11 +7930,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:7903: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:7933: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>out/conftest.err)
|
(eval "$lt_compile" 2>out/conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat out/conftest.err >&5
|
cat out/conftest.err >&5
|
||||||
echo "$as_me:7907: \$? = $ac_status" >&5
|
echo "$as_me:7937: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||||
then
|
then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
@ -10300,7 +10330,7 @@ else
|
|||||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||||
lt_status=$lt_dlunknown
|
lt_status=$lt_dlunknown
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 10303 "configure"
|
#line 10333 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#if HAVE_DLFCN_H
|
#if HAVE_DLFCN_H
|
||||||
@ -10400,7 +10430,7 @@ else
|
|||||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||||
lt_status=$lt_dlunknown
|
lt_status=$lt_dlunknown
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 10403 "configure"
|
#line 10433 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
#if HAVE_DLFCN_H
|
#if HAVE_DLFCN_H
|
||||||
@ -12809,11 +12839,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:12812: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:12842: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
(eval "$lt_compile" 2>conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
echo "$as_me:12816: \$? = $ac_status" >&5
|
echo "$as_me:12846: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
# So say no if there are warnings other than the usual output.
|
# So say no if there are warnings other than the usual output.
|
||||||
@ -12913,11 +12943,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:12916: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:12946: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>out/conftest.err)
|
(eval "$lt_compile" 2>out/conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat out/conftest.err >&5
|
cat out/conftest.err >&5
|
||||||
echo "$as_me:12920: \$? = $ac_status" >&5
|
echo "$as_me:12950: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||||
then
|
then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
@ -14496,11 +14526,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:14499: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:14529: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
(eval "$lt_compile" 2>conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
echo "$as_me:14503: \$? = $ac_status" >&5
|
echo "$as_me:14533: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
# So say no if there are warnings other than the usual output.
|
# So say no if there are warnings other than the usual output.
|
||||||
@ -14600,11 +14630,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:14603: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:14633: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>out/conftest.err)
|
(eval "$lt_compile" 2>out/conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat out/conftest.err >&5
|
cat out/conftest.err >&5
|
||||||
echo "$as_me:14607: \$? = $ac_status" >&5
|
echo "$as_me:14637: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||||
then
|
then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
@ -16815,11 +16845,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:16818: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:16848: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
(eval "$lt_compile" 2>conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
echo "$as_me:16822: \$? = $ac_status" >&5
|
echo "$as_me:16852: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
# So say no if there are warnings other than the usual output.
|
# So say no if there are warnings other than the usual output.
|
||||||
@ -17105,11 +17135,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:17108: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:17138: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>conftest.err)
|
(eval "$lt_compile" 2>conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat conftest.err >&5
|
cat conftest.err >&5
|
||||||
echo "$as_me:17112: \$? = $ac_status" >&5
|
echo "$as_me:17142: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
# So say no if there are warnings other than the usual output.
|
# So say no if there are warnings other than the usual output.
|
||||||
@ -17209,11 +17239,11 @@ else
|
|||||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||||
-e 's:$: $lt_compiler_flag:'`
|
-e 's:$: $lt_compiler_flag:'`
|
||||||
(eval echo "\"\$as_me:17212: $lt_compile\"" >&5)
|
(eval echo "\"\$as_me:17242: $lt_compile\"" >&5)
|
||||||
(eval "$lt_compile" 2>out/conftest.err)
|
(eval "$lt_compile" 2>out/conftest.err)
|
||||||
ac_status=$?
|
ac_status=$?
|
||||||
cat out/conftest.err >&5
|
cat out/conftest.err >&5
|
||||||
echo "$as_me:17216: \$? = $ac_status" >&5
|
echo "$as_me:17246: \$? = $ac_status" >&5
|
||||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||||
then
|
then
|
||||||
# The compiler can only warn and ignore the option if not recognized
|
# The compiler can only warn and ignore the option if not recognized
|
||||||
@ -20099,11 +20129,203 @@ esac
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
||||||
|
if test -n "$ac_tool_prefix"; then
|
||||||
|
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
||||||
|
set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+set}" = set; then
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
case $PKG_CONFIG in
|
||||||
|
[\\/]* | ?:[\\/]*)
|
||||||
|
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
|
for as_dir in $PATH
|
||||||
|
do
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
test -z "$as_dir" && as_dir=.
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||||
|
ac_cv_path_PKG_CONFIG="$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
|
||||||
|
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
||||||
|
if test -n "$PKG_CONFIG"; then
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
||||||
|
$as_echo "$PKG_CONFIG" >&6; }
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
fi
|
||||||
|
if test -z "$ac_cv_path_PKG_CONFIG"; then
|
||||||
|
ac_pt_PKG_CONFIG=$PKG_CONFIG
|
||||||
|
# Extract the first word of "pkg-config", so it can be a program name with args.
|
||||||
|
set dummy pkg-config; 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_ac_pt_PKG_CONFIG+set}" = set; then
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
case $ac_pt_PKG_CONFIG in
|
||||||
|
[\\/]* | ?:[\\/]*)
|
||||||
|
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
|
for as_dir in $PATH
|
||||||
|
do
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
test -z "$as_dir" && as_dir=.
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||||||
|
ac_cv_path_ac_pt_PKG_CONFIG="$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
|
||||||
|
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
||||||
|
if test -n "$ac_pt_PKG_CONFIG"; then
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
|
||||||
|
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
||||||
|
$as_echo "no" >&6; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$ac_pt_PKG_CONFIG" = x; then
|
||||||
|
PKG_CONFIG=""
|
||||||
|
else
|
||||||
|
case $cross_compiling:$ac_tool_warned in
|
||||||
|
yes:)
|
||||||
|
{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||||||
|
whose name does not start with the host triplet. If you think this
|
||||||
|
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||||||
|
$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||||||
|
whose name does not start with the host triplet. If you think this
|
||||||
|
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||||||
|
ac_tool_warned=yes ;;
|
||||||
|
esac
|
||||||
|
PKG_CONFIG=$ac_pt_PKG_CONFIG
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
if test -n "$PKG_CONFIG"; then
|
||||||
|
_pkg_min_version=0.9.0
|
||||||
|
{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
|
||||||
|
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
|
||||||
|
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
|
||||||
|
PKG_CONFIG=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
|
||||||
|
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
|
||||||
|
if test "${ac_cv_path_SED+set}" = set; then
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
||||||
|
for ac_i in 1 2 3 4 5 6 7; do
|
||||||
|
ac_script="$ac_script$as_nl$ac_script"
|
||||||
|
done
|
||||||
|
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
|
||||||
|
$as_unset ac_script || ac_script=
|
||||||
|
if test -z "$SED"; then
|
||||||
|
ac_path_SED_found=false
|
||||||
|
# Loop through the user's path and test for each of PROGNAME-LIST
|
||||||
|
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_prog in sed gsed; do
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
|
||||||
|
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
|
||||||
|
# Check for GNU ac_path_SED and select it if it is found.
|
||||||
|
# Check for GNU $ac_path_SED
|
||||||
|
case `"$ac_path_SED" --version 2>&1` in
|
||||||
|
*GNU*)
|
||||||
|
ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
|
||||||
|
*)
|
||||||
|
ac_count=0
|
||||||
|
$as_echo_n 0123456789 >"conftest.in"
|
||||||
|
while :
|
||||||
|
do
|
||||||
|
cat "conftest.in" "conftest.in" >"conftest.tmp"
|
||||||
|
mv "conftest.tmp" "conftest.in"
|
||||||
|
cp "conftest.in" "conftest.nl"
|
||||||
|
$as_echo '' >> "conftest.nl"
|
||||||
|
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
|
||||||
|
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
|
||||||
|
ac_count=`expr $ac_count + 1`
|
||||||
|
if test $ac_count -gt ${ac_path_SED_max-0}; then
|
||||||
|
# Best one so far, save it but keep looking for a better one
|
||||||
|
ac_cv_path_SED="$ac_path_SED"
|
||||||
|
ac_path_SED_max=$ac_count
|
||||||
|
fi
|
||||||
|
# 10*(2^10) chars as input seems more than enough
|
||||||
|
test $ac_count -gt 10 && break
|
||||||
|
done
|
||||||
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
$ac_path_SED_found && break 3
|
||||||
|
done
|
||||||
|
done
|
||||||
|
done
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
if test -z "$ac_cv_path_SED"; then
|
||||||
|
{ { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
|
||||||
|
$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
ac_cv_path_SED=$SED
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
|
||||||
|
$as_echo "$ac_cv_path_SED" >&6; }
|
||||||
|
SED="$ac_cv_path_SED"
|
||||||
|
rm -f conftest.sed
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if test "x$GCC" = xyes ; then
|
if test "x$GCC" = xyes ; then
|
||||||
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
|
||||||
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
-Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
|
||||||
-Wbad-function-cast"
|
-Wbad-function-cast -Wformat=2"
|
||||||
case `$CC -dumpversion` in
|
case `$CC -dumpversion` in
|
||||||
3.4.* | 4.*)
|
3.4.* | 4.*)
|
||||||
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement"
|
||||||
@ -20176,8 +20398,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -20320,20 +20541,6 @@ CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --with-release-version was given.
|
|
||||||
if test "${with_release_version+set}" = set; then
|
|
||||||
withval=$with_release_version; RELEASE_VERSION="$withval"
|
|
||||||
else
|
|
||||||
RELEASE_VERSION=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$RELEASE_VERSION" != "x"; then
|
|
||||||
PACKAGE="$PACKAGE-$RELEASE_VERSION"
|
|
||||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
|
||||||
{ $as_echo "$as_me:$LINENO: Building with package name set to $PACKAGE" >&5
|
|
||||||
$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat >>confdefs.h <<_ACEOF
|
cat >>confdefs.h <<_ACEOF
|
||||||
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
|
#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
|
||||||
_ACEOF
|
_ACEOF
|
||||||
@ -20358,11 +20565,20 @@ _ACEOF
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > .changelog.tmp && \
|
CHANGELOG_CMD="(GIT_DIR=\$(top_srcdir)/.git git log > \$(top_srcdir)/.changelog.tmp && \
|
||||||
mv .changelog.tmp ChangeLog) || (rm -f .changelog.tmp; touch ChangeLog; \
|
mv \$(top_srcdir)/.changelog.tmp \$(top_srcdir)/ChangeLog) \
|
||||||
|
|| (rm -f \$(top_srcdir)/.changelog.tmp; touch \$(top_srcdir)/ChangeLog; \
|
||||||
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
echo 'git directory not found: installing possibly empty changelog.' >&2)"
|
||||||
|
|
||||||
distcleancheck_listfiles='find . -type f ! -name ChangeLog -print'
|
|
||||||
|
|
||||||
|
|
||||||
|
macros_datadir=`$PKG_CONFIG --print-errors --variable=pkgdatadir xorg-macros`
|
||||||
|
INSTALL_CMD="(cp -f "$macros_datadir/INSTALL" \$(top_srcdir)/.INSTALL.tmp && \
|
||||||
|
mv \$(top_srcdir)/.INSTALL.tmp \$(top_srcdir)/INSTALL) \
|
||||||
|
|| (rm -f \$(top_srcdir)/.INSTALL.tmp; touch \$(top_srcdir)/INSTALL; \
|
||||||
|
echo 'util-macros \"pkgdatadir\" from xorg-macros.pc not found: installing possibly empty INSTALL.' >&2)"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -20436,6 +20652,26 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
XORG_MAN_PAGE="X Version 11"
|
||||||
|
|
||||||
|
MAN_SUBSTS="\
|
||||||
|
-e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
|
||||||
|
-e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
|
||||||
|
-e 's|__xservername__|Xorg|g' \
|
||||||
|
-e 's|__xconfigfile__|xorg.conf|g' \
|
||||||
|
-e 's|__projectroot__|\$(prefix)|g' \
|
||||||
|
-e 's|__apploaddir__|\$(appdefaultdir)|g' \
|
||||||
|
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
|
||||||
|
-e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
AM_DEFAULT_VERBOSITY=1
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# get modules
|
# get modules
|
||||||
@ -20444,126 +20680,6 @@ fi
|
|||||||
# find the required protocol version
|
# find the required protocol version
|
||||||
RES_VERSION=`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
|
RES_VERSION=`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
|
||||||
|
|
||||||
|
|
||||||
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
|
|
||||||
if test -n "$ac_tool_prefix"; then
|
|
||||||
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
|
|
||||||
set dummy ${ac_tool_prefix}pkg-config; 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_PKG_CONFIG+set}" = set; then
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
case $PKG_CONFIG in
|
|
||||||
[\\/]* | ?:[\\/]*)
|
|
||||||
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
||||||
ac_cv_path_PKG_CONFIG="$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
|
|
||||||
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
|
|
||||||
if test -n "$PKG_CONFIG"; then
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
|
|
||||||
$as_echo "$PKG_CONFIG" >&6; }
|
|
||||||
else
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -z "$ac_cv_path_PKG_CONFIG"; then
|
|
||||||
ac_pt_PKG_CONFIG=$PKG_CONFIG
|
|
||||||
# Extract the first word of "pkg-config", so it can be a program name with args.
|
|
||||||
set dummy pkg-config; 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_ac_pt_PKG_CONFIG+set}" = set; then
|
|
||||||
$as_echo_n "(cached) " >&6
|
|
||||||
else
|
|
||||||
case $ac_pt_PKG_CONFIG in
|
|
||||||
[\\/]* | ?:[\\/]*)
|
|
||||||
ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
for as_dir in $PATH
|
|
||||||
do
|
|
||||||
IFS=$as_save_IFS
|
|
||||||
test -z "$as_dir" && as_dir=.
|
|
||||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
|
||||||
ac_cv_path_ac_pt_PKG_CONFIG="$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
|
|
||||||
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
|
|
||||||
if test -n "$ac_pt_PKG_CONFIG"; then
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
|
|
||||||
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
|
|
||||||
else
|
|
||||||
{ $as_echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
$as_echo "no" >&6; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$ac_pt_PKG_CONFIG" = x; then
|
|
||||||
PKG_CONFIG=""
|
|
||||||
else
|
|
||||||
case $cross_compiling:$ac_tool_warned in
|
|
||||||
yes:)
|
|
||||||
{ $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
|
||||||
whose name does not start with the host triplet. If you think this
|
|
||||||
configuration is useful to you, please write to autoconf@gnu.org." >&5
|
|
||||||
$as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
|
||||||
whose name does not start with the host triplet. If you think this
|
|
||||||
configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
|
||||||
ac_tool_warned=yes ;;
|
|
||||||
esac
|
|
||||||
PKG_CONFIG=$ac_pt_PKG_CONFIG
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
if test -n "$PKG_CONFIG"; then
|
|
||||||
_pkg_min_version=0.9.0
|
|
||||||
{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
|
|
||||||
$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
|
|
||||||
if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; }
|
|
||||||
PKG_CONFIG=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
pkg_failed=no
|
pkg_failed=no
|
||||||
{ $as_echo "$as_me:$LINENO: checking for XRES" >&5
|
{ $as_echo "$as_me:$LINENO: checking for XRES" >&5
|
||||||
$as_echo_n "checking for XRES... " >&6; }
|
$as_echo_n "checking for XRES... " >&6; }
|
||||||
@ -20674,9 +20790,6 @@ else
|
|||||||
$as_echo "yes" >&6; }
|
$as_echo "yes" >&6; }
|
||||||
:
|
:
|
||||||
fi
|
fi
|
||||||
XRES_CFLAGS="$CWARNFLAGS $XRES_CFLAGS"
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-malloc0returnsnull was given.
|
# Check whether --enable-malloc0returnsnull was given.
|
||||||
@ -20691,11 +20804,7 @@ fi
|
|||||||
$as_echo_n "checking whether malloc(0) returns NULL... " >&6; }
|
$as_echo_n "checking whether malloc(0) returns NULL... " >&6; }
|
||||||
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
||||||
if test "$cross_compiling" = yes; then
|
if test "$cross_compiling" = yes; then
|
||||||
{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
|
MALLOC_ZERO_RETURNS_NULL=yes
|
||||||
See \`config.log' for more details." >&5
|
|
||||||
$as_echo "$as_me: error: cannot run test program while cross compiling
|
|
||||||
See \`config.log' for more details." >&2;}
|
|
||||||
{ (exit 1); exit 1; }; }
|
|
||||||
else
|
else
|
||||||
cat >conftest.$ac_ext <<_ACEOF
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
|
||||||
@ -20865,6 +20974,13 @@ LIBOBJS=$ac_libobjs
|
|||||||
LTLIBOBJS=$ac_ltlibobjs
|
LTLIBOBJS=$ac_ltlibobjs
|
||||||
|
|
||||||
|
|
||||||
|
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
|
||||||
|
{ { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
|
||||||
|
Usually this means the macro was only invoked conditionally." >&5
|
||||||
|
$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
|
||||||
|
Usually this means the macro was only invoked conditionally." >&2;}
|
||||||
|
{ (exit 1); exit 1; }; }
|
||||||
|
fi
|
||||||
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
|
||||||
{ { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
|
{ { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
|
||||||
Usually this means the macro was only invoked conditionally." >&5
|
Usually this means the macro was only invoked conditionally." >&5
|
||||||
@ -21208,7 +21324,7 @@ exec 6>&1
|
|||||||
# report actual input values of CONFIG_FILES etc. instead of their
|
# report actual input values of CONFIG_FILES etc. instead of their
|
||||||
# values after options handling.
|
# values after options handling.
|
||||||
ac_log="
|
ac_log="
|
||||||
This file was extended by libXres $as_me 1.0.4, which was
|
This file was extended by libXres $as_me 1.0.5, which was
|
||||||
generated by GNU Autoconf 2.62. Invocation command line was
|
generated by GNU Autoconf 2.62. Invocation command line was
|
||||||
|
|
||||||
CONFIG_FILES = $CONFIG_FILES
|
CONFIG_FILES = $CONFIG_FILES
|
||||||
@ -21261,7 +21377,7 @@ Report bugs to <bug-autoconf@gnu.org>."
|
|||||||
_ACEOF
|
_ACEOF
|
||||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||||
ac_cs_version="\\
|
ac_cs_version="\\
|
||||||
libXres config.status 1.0.4
|
libXres config.status 1.0.5
|
||||||
configured by $0, generated by GNU Autoconf 2.62,
|
configured by $0, generated by GNU Autoconf 2.62,
|
||||||
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
dnl
|
dnl
|
||||||
dnl $Id: configure.ac,v 1.2 2009/10/31 17:40:00 matthieu Exp $
|
dnl $Id: configure.ac,v 1.3 2010/10/31 10:24:17 matthieu Exp $
|
||||||
dnl
|
dnl
|
||||||
dnl Copyright © 2003 Keith Packard, Noah Levitt
|
dnl Copyright © 2003 Keith Packard, Noah Levitt
|
||||||
dnl
|
dnl
|
||||||
@ -23,7 +23,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
|
|||||||
dnl
|
dnl
|
||||||
dnl Process this file with autoconf to create configure.
|
dnl Process this file with autoconf to create configure.
|
||||||
|
|
||||||
AC_PREREQ([2.57])
|
AC_PREREQ([2.60])
|
||||||
|
|
||||||
dnl
|
dnl
|
||||||
dnl Version should match the current XRes version. XResQueryVersion
|
dnl Version should match the current XRes version. XResQueryVersion
|
||||||
@ -32,14 +32,16 @@ dnl try to keep these the same. Note that the library has an extra
|
|||||||
dnl digit in the version number to track changes which don't affect the
|
dnl digit in the version number to track changes which don't affect the
|
||||||
dnl protocol, so XRes version l.n.m corresponds to protocol version l.n
|
dnl protocol, so XRes version l.n.m corresponds to protocol version l.n
|
||||||
dnl
|
dnl
|
||||||
AC_INIT(libXres, 1.0.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXres)
|
AC_INIT([libXres], [1.0.5],
|
||||||
|
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXres])
|
||||||
AC_CONFIG_AUX_DIR(.)
|
AC_CONFIG_AUX_DIR(.)
|
||||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||||
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
|
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||||
m4_ifndef([XORG_MACROS_VERSION],
|
m4_ifndef([XORG_MACROS_VERSION],
|
||||||
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
|
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
|
||||||
XORG_MACROS_VERSION(1.3)
|
XORG_MACROS_VERSION(1.8)
|
||||||
|
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
@ -55,9 +57,6 @@ XORG_DEFAULT_OPTIONS
|
|||||||
# find the required protocol version
|
# find the required protocol version
|
||||||
RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
|
RES_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
|
||||||
PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
|
PKG_CHECK_MODULES(XRES, x11 xext xextproto [resourceproto >= $RES_VERSION])
|
||||||
XRES_CFLAGS="$CWARNFLAGS $XRES_CFLAGS"
|
|
||||||
AC_SUBST(XRES_CFLAGS)
|
|
||||||
AC_SUBST(XRES_LIBS)
|
|
||||||
|
|
||||||
XORG_CHECK_MALLOC_ZERO
|
XORG_CHECK_MALLOC_ZERO
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2002 XFree86 Inc
|
Copyright (c) 2002 XFree86 Inc
|
||||||
*/
|
*/
|
||||||
/* $XdotOrg: xc/include/extensions/XRes.h,v 1.4 2003/12/18 05:48:06 dawes Exp $ */
|
|
||||||
/* $XFree86: xc/include/extensions/XRes.h,v 1.3 2002/03/10 22:05:51 mvojkovi Exp $ */
|
|
||||||
|
|
||||||
#ifndef _XRES_H
|
#ifndef _XRES_H
|
||||||
#define _XRES_H
|
#define _XRES_H
|
||||||
|
|||||||
@ -1,62 +1,31 @@
|
|||||||
#
|
#
|
||||||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
# documentation for any purpose is hereby granted without fee, provided that
|
# copy of this software and associated documentation files (the "Software"),
|
||||||
# the above copyright notice appear in all copies and that both that
|
# to deal in the Software without restriction, including without limitation
|
||||||
# copyright notice and this permission notice appear in supporting
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
# documentation.
|
# and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
# Software is furnished to do so, subject to the following conditions:
|
||||||
#
|
#
|
||||||
# The above copyright notice and this permission notice shall be included
|
# The above copyright notice and this permission notice (including the next
|
||||||
# in all copies or substantial portions of the Software.
|
# paragraph) shall be included in all copies or substantial portions of the
|
||||||
|
# Software.
|
||||||
#
|
#
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
# OTHER DEALINGS IN THE SOFTWARE.
|
# DEALINGS IN THE SOFTWARE.
|
||||||
#
|
|
||||||
# Except as contained in this notice, the name of the copyright holders shall
|
|
||||||
# not be used in advertising or otherwise to promote the sale, use or
|
|
||||||
# other dealings in this Software without prior written authorization
|
|
||||||
# from the copyright holders.
|
|
||||||
#
|
#
|
||||||
|
|
||||||
libmandir = $(LIB_MAN_DIR)
|
libmandir = $(LIB_MAN_DIR)
|
||||||
|
|
||||||
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
|
libman_PRE = \
|
||||||
|
XRes.man \
|
||||||
libman_PRE = XRes.man
|
$(XRes_shadows:=.man)
|
||||||
|
|
||||||
EXTRA_DIST = $(libman_PRE)
|
|
||||||
|
|
||||||
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
|
|
||||||
|
|
||||||
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
|
|
||||||
$(XRes_shadowmen)
|
|
||||||
|
|
||||||
SED = sed
|
|
||||||
|
|
||||||
# Strings to replace in man pages
|
|
||||||
XORGRELSTRING = @PACKAGE_STRING@
|
|
||||||
XORGMANNAME = X Version 11
|
|
||||||
|
|
||||||
MAN_SUBSTS = \
|
|
||||||
-e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
|
|
||||||
-e 's/__xservername__/Xorg/g' \
|
|
||||||
-e 's/__xconfigfile__/xorg.conf/g' \
|
|
||||||
-e 's/__miscmansuffix__/$(MISC_MAN_SUFFIX)/g' \
|
|
||||||
-e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \
|
|
||||||
-e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
|
|
||||||
|
|
||||||
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
|
|
||||||
|
|
||||||
.man.$(LIB_MAN_SUFFIX):
|
|
||||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
|
||||||
|
|
||||||
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
|
|
||||||
|
|
||||||
XRes_shadows = \
|
XRes_shadows = \
|
||||||
XResQueryExtension \
|
XResQueryExtension \
|
||||||
@ -65,8 +34,13 @@ XRes_shadows = \
|
|||||||
XResQueryClientResources \
|
XResQueryClientResources \
|
||||||
XResQueryClientPixmapBytes
|
XResQueryClientPixmapBytes
|
||||||
|
|
||||||
XRes_shadowmen = $(XRes_shadows:=.@LIB_MAN_SUFFIX@)
|
EXTRA_DIST = $(libman_PRE)
|
||||||
|
CLEANFILES = $(libman_DATA)
|
||||||
|
|
||||||
$(XRes_shadowmen):
|
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
|
||||||
$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $@
|
|
||||||
|
|
||||||
|
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
|
||||||
|
|
||||||
|
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||||
|
.man.$(LIB_MAN_SUFFIX):
|
||||||
|
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||||
|
|||||||
@ -15,29 +15,26 @@
|
|||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
|
# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
|
||||||
#
|
#
|
||||||
# Permission to use, copy, modify, distribute, and sell this software and its
|
# Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
# documentation for any purpose is hereby granted without fee, provided that
|
# copy of this software and associated documentation files (the "Software"),
|
||||||
# the above copyright notice appear in all copies and that both that
|
# to deal in the Software without restriction, including without limitation
|
||||||
# copyright notice and this permission notice appear in supporting
|
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||||
# documentation.
|
# and/or sell copies of the Software, and to permit persons to whom the
|
||||||
|
# Software is furnished to do so, subject to the following conditions:
|
||||||
#
|
#
|
||||||
# The above copyright notice and this permission notice shall be included
|
# The above copyright notice and this permission notice (including the next
|
||||||
# in all copies or substantial portions of the Software.
|
# paragraph) shall be included in all copies or substantial portions of the
|
||||||
|
# Software.
|
||||||
#
|
#
|
||||||
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||||
# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||||
# OTHER DEALINGS IN THE SOFTWARE.
|
# DEALINGS IN THE SOFTWARE.
|
||||||
#
|
|
||||||
# Except as contained in this notice, the name of the copyright holders shall
|
|
||||||
# not be used in advertising or otherwise to promote the sale, use or
|
|
||||||
# other dealings in this Software without prior written authorization
|
|
||||||
# from the copyright holders.
|
|
||||||
#
|
#
|
||||||
|
|
||||||
srcdir = @srcdir@
|
srcdir = @srcdir@
|
||||||
@ -89,6 +86,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
|||||||
AMDEP_FALSE = @AMDEP_FALSE@
|
AMDEP_FALSE = @AMDEP_FALSE@
|
||||||
AMDEP_TRUE = @AMDEP_TRUE@
|
AMDEP_TRUE = @AMDEP_TRUE@
|
||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
APP_MAN_DIR = @APP_MAN_DIR@
|
APP_MAN_DIR = @APP_MAN_DIR@
|
||||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
@ -124,6 +122,7 @@ FFLAGS = @FFLAGS@
|
|||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
GREP = @GREP@
|
GREP = @GREP@
|
||||||
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
@ -136,8 +135,12 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
|
|||||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||||
LN_S = @LN_S@
|
LN_S = @LN_S@
|
||||||
LTLIBOBJS = @LTLIBOBJS@
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
|
MAINT = @MAINT@
|
||||||
|
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||||
|
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
||||||
|
MAN_SUBSTS = @MAN_SUBSTS@
|
||||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
NMEDIT = @NMEDIT@
|
NMEDIT = @NMEDIT@
|
||||||
@ -151,12 +154,13 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
|
|||||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
RANLIB = @RANLIB@
|
RANLIB = @RANLIB@
|
||||||
SED = sed
|
SED = @SED@
|
||||||
SET_MAKE = @SET_MAKE@
|
SET_MAKE = @SET_MAKE@
|
||||||
SHELL = @SHELL@
|
SHELL = @SHELL@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
||||||
|
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||||
XRES_CFLAGS = @XRES_CFLAGS@
|
XRES_CFLAGS = @XRES_CFLAGS@
|
||||||
XRES_LIBS = @XRES_LIBS@
|
XRES_LIBS = @XRES_LIBS@
|
||||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||||
@ -180,7 +184,6 @@ build_os = @build_os@
|
|||||||
build_vendor = @build_vendor@
|
build_vendor = @build_vendor@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
datarootdir = @datarootdir@
|
datarootdir = @datarootdir@
|
||||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
|
||||||
docdir = @docdir@
|
docdir = @docdir@
|
||||||
dvidir = @dvidir@
|
dvidir = @dvidir@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
@ -209,28 +212,10 @@ sharedstatedir = @sharedstatedir@
|
|||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
target_alias = @target_alias@
|
target_alias = @target_alias@
|
||||||
libmandir = $(LIB_MAN_DIR)
|
libmandir = $(LIB_MAN_DIR)
|
||||||
LIB_MAN_DIR_SUFFIX = $(LIB_MAN_DIR:@mandir@/man%=%)
|
libman_PRE = \
|
||||||
libman_PRE = XRes.man
|
XRes.man \
|
||||||
EXTRA_DIST = $(libman_PRE)
|
$(XRes_shadows:=.man)
|
||||||
CLEANFILES = $(libman_DATA) $(BUILT_SOURCES)
|
|
||||||
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
|
|
||||||
$(XRes_shadowmen)
|
|
||||||
|
|
||||||
|
|
||||||
# Strings to replace in man pages
|
|
||||||
XORGRELSTRING = @PACKAGE_STRING@
|
|
||||||
XORGMANNAME = X Version 11
|
|
||||||
MAN_SUBSTS = \
|
|
||||||
-e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
|
|
||||||
-e 's/__xservername__/Xorg/g' \
|
|
||||||
-e 's/__xconfigfile__/xorg.conf/g' \
|
|
||||||
-e 's/__miscmansuffix__/$(MISC_MAN_SUFFIX)/g' \
|
|
||||||
-e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \
|
|
||||||
-e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
|
|
||||||
|
|
||||||
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
|
|
||||||
|
|
||||||
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
|
|
||||||
XRes_shadows = \
|
XRes_shadows = \
|
||||||
XResQueryExtension \
|
XResQueryExtension \
|
||||||
XResQueryVersion \
|
XResQueryVersion \
|
||||||
@ -238,12 +223,15 @@ XRes_shadows = \
|
|||||||
XResQueryClientResources \
|
XResQueryClientResources \
|
||||||
XResQueryClientPixmapBytes
|
XResQueryClientPixmapBytes
|
||||||
|
|
||||||
XRes_shadowmen = $(XRes_shadows:=.@LIB_MAN_SUFFIX@)
|
EXTRA_DIST = $(libman_PRE)
|
||||||
|
CLEANFILES = $(libman_DATA)
|
||||||
|
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
|
||||||
|
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
|
||||||
all: all-am
|
all: all-am
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .$(LIB_MAN_SUFFIX) .man
|
.SUFFIXES: .$(LIB_MAN_SUFFIX) .man
|
||||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||||
@for dep in $?; do \
|
@for dep in $?; do \
|
||||||
case '$(am__configure_deps)' in \
|
case '$(am__configure_deps)' in \
|
||||||
*$$dep*) \
|
*$$dep*) \
|
||||||
@ -252,9 +240,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|||||||
exit 1;; \
|
exit 1;; \
|
||||||
esac; \
|
esac; \
|
||||||
done; \
|
done; \
|
||||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \
|
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign man/Makefile'; \
|
||||||
cd $(top_srcdir) && \
|
cd $(top_srcdir) && \
|
||||||
$(AUTOMAKE) --gnu man/Makefile
|
$(AUTOMAKE) --foreign man/Makefile
|
||||||
.PRECIOUS: Makefile
|
.PRECIOUS: Makefile
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
@case '$?' in \
|
@case '$?' in \
|
||||||
@ -268,9 +256,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
|
||||||
$(top_srcdir)/configure: $(am__configure_deps)
|
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
|
||||||
mostlyclean-libtool:
|
mostlyclean-libtool:
|
||||||
@ -422,11 +410,9 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA
|
|||||||
uninstall uninstall-am uninstall-info-am uninstall-libmanDATA
|
uninstall uninstall-am uninstall-info-am uninstall-libmanDATA
|
||||||
|
|
||||||
|
|
||||||
|
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||||
.man.$(LIB_MAN_SUFFIX):
|
.man.$(LIB_MAN_SUFFIX):
|
||||||
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||||
|
|
||||||
$(XRes_shadowmen):
|
|
||||||
$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/XRes.$(LIB_MAN_SUFFIX) > $@
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
.NOEXPORT:
|
.NOEXPORT:
|
||||||
|
|||||||
1
lib/libXRes/man/XResQueryClientPixmapBytes.man
Normal file
1
lib/libXRes/man/XResQueryClientPixmapBytes.man
Normal file
@ -0,0 +1 @@
|
|||||||
|
.so man__libmansuffix__/XRes.__libmansuffix__
|
||||||
1
lib/libXRes/man/XResQueryClientResources.man
Normal file
1
lib/libXRes/man/XResQueryClientResources.man
Normal file
@ -0,0 +1 @@
|
|||||||
|
.so man__libmansuffix__/XRes.__libmansuffix__
|
||||||
1
lib/libXRes/man/XResQueryClients.man
Normal file
1
lib/libXRes/man/XResQueryClients.man
Normal file
@ -0,0 +1 @@
|
|||||||
|
.so man__libmansuffix__/XRes.__libmansuffix__
|
||||||
1
lib/libXRes/man/XResQueryExtension.man
Normal file
1
lib/libXRes/man/XResQueryExtension.man
Normal file
@ -0,0 +1 @@
|
|||||||
|
.so man__libmansuffix__/XRes.__libmansuffix__
|
||||||
1
lib/libXRes/man/XResQueryVersion.man
Normal file
1
lib/libXRes/man/XResQueryVersion.man
Normal file
@ -0,0 +1 @@
|
|||||||
|
.so man__libmansuffix__/XRes.__libmansuffix__
|
||||||
@ -5,7 +5,10 @@ libXRes_la_SOURCES = \
|
|||||||
|
|
||||||
libXRes_la_LIBADD = @XRES_LIBS@
|
libXRes_la_LIBADD = @XRES_LIBS@
|
||||||
|
|
||||||
AM_CFLAGS = $(CWARNFLAGS) @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
|
AM_CFLAGS = \
|
||||||
|
$(CWARNFLAGS) \
|
||||||
|
$(XRES_CFLAGS) \
|
||||||
|
$(MALLOC_ZERO_CFLAGS)
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/include
|
INCLUDES = -I$(top_srcdir)/include
|
||||||
|
|
||||||
|
|||||||
@ -84,6 +84,7 @@ ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
|
|||||||
AMDEP_FALSE = @AMDEP_FALSE@
|
AMDEP_FALSE = @AMDEP_FALSE@
|
||||||
AMDEP_TRUE = @AMDEP_TRUE@
|
AMDEP_TRUE = @AMDEP_TRUE@
|
||||||
AMTAR = @AMTAR@
|
AMTAR = @AMTAR@
|
||||||
|
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
|
||||||
APP_MAN_DIR = @APP_MAN_DIR@
|
APP_MAN_DIR = @APP_MAN_DIR@
|
||||||
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
|
||||||
AR = @AR@
|
AR = @AR@
|
||||||
@ -119,6 +120,7 @@ FFLAGS = @FFLAGS@
|
|||||||
FILE_MAN_DIR = @FILE_MAN_DIR@
|
FILE_MAN_DIR = @FILE_MAN_DIR@
|
||||||
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
|
||||||
GREP = @GREP@
|
GREP = @GREP@
|
||||||
|
INSTALL_CMD = @INSTALL_CMD@
|
||||||
INSTALL_DATA = @INSTALL_DATA@
|
INSTALL_DATA = @INSTALL_DATA@
|
||||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||||
@ -131,8 +133,12 @@ LIB_MAN_DIR = @LIB_MAN_DIR@
|
|||||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||||
LN_S = @LN_S@
|
LN_S = @LN_S@
|
||||||
LTLIBOBJS = @LTLIBOBJS@
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
|
MAINT = @MAINT@
|
||||||
|
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||||
|
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
|
||||||
|
MAN_SUBSTS = @MAN_SUBSTS@
|
||||||
MISC_MAN_DIR = @MISC_MAN_DIR@
|
MISC_MAN_DIR = @MISC_MAN_DIR@
|
||||||
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
|
||||||
NMEDIT = @NMEDIT@
|
NMEDIT = @NMEDIT@
|
||||||
@ -152,6 +158,7 @@ SHELL = @SHELL@
|
|||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
|
||||||
|
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||||
XRES_CFLAGS = @XRES_CFLAGS@
|
XRES_CFLAGS = @XRES_CFLAGS@
|
||||||
XRES_LIBS = @XRES_LIBS@
|
XRES_LIBS = @XRES_LIBS@
|
||||||
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
|
||||||
@ -175,7 +182,6 @@ build_os = @build_os@
|
|||||||
build_vendor = @build_vendor@
|
build_vendor = @build_vendor@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
datarootdir = @datarootdir@
|
datarootdir = @datarootdir@
|
||||||
distcleancheck_listfiles = @distcleancheck_listfiles@
|
|
||||||
docdir = @docdir@
|
docdir = @docdir@
|
||||||
dvidir = @dvidir@
|
dvidir = @dvidir@
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
@ -208,7 +214,11 @@ libXRes_la_SOURCES = \
|
|||||||
XRes.c
|
XRes.c
|
||||||
|
|
||||||
libXRes_la_LIBADD = @XRES_LIBS@
|
libXRes_la_LIBADD = @XRES_LIBS@
|
||||||
AM_CFLAGS = $(CWARNFLAGS) @XRES_CFLAGS@ @MALLOC_ZERO_CFLAGS@
|
AM_CFLAGS = \
|
||||||
|
$(CWARNFLAGS) \
|
||||||
|
$(XRES_CFLAGS) \
|
||||||
|
$(MALLOC_ZERO_CFLAGS)
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/include
|
INCLUDES = -I$(top_srcdir)/include
|
||||||
libXRes_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
libXRes_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||||||
libXResincludedir = $(includedir)/X11/extensions
|
libXResincludedir = $(includedir)/X11/extensions
|
||||||
@ -217,7 +227,7 @@ all: all-am
|
|||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .c .lo .o .obj
|
.SUFFIXES: .c .lo .o .obj
|
||||||
$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
|
||||||
@for dep in $?; do \
|
@for dep in $?; do \
|
||||||
case '$(am__configure_deps)' in \
|
case '$(am__configure_deps)' in \
|
||||||
*$$dep*) \
|
*$$dep*) \
|
||||||
@ -226,9 +236,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
|
|||||||
exit 1;; \
|
exit 1;; \
|
||||||
esac; \
|
esac; \
|
||||||
done; \
|
done; \
|
||||||
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
|
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
|
||||||
cd $(top_srcdir) && \
|
cd $(top_srcdir) && \
|
||||||
$(AUTOMAKE) --gnu src/Makefile
|
$(AUTOMAKE) --foreign src/Makefile
|
||||||
.PRECIOUS: Makefile
|
.PRECIOUS: Makefile
|
||||||
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
||||||
@case '$?' in \
|
@case '$?' in \
|
||||||
@ -242,9 +252,9 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|||||||
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
||||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
|
|
||||||
$(top_srcdir)/configure: $(am__configure_deps)
|
$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
|
||||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
$(ACLOCAL_M4): $(am__aclocal_m4_deps)
|
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
|
||||||
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
|
||||||
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
install-libLTLIBRARIES: $(lib_LTLIBRARIES)
|
||||||
@$(NORMAL_INSTALL)
|
@$(NORMAL_INSTALL)
|
||||||
|
|||||||
@ -1,10 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
Copyright (c) 2002 XFree86 Inc
|
Copyright (c) 2002 XFree86 Inc
|
||||||
*/
|
*/
|
||||||
/* $XFree86: xc/lib/XRes/XRes.c,v 1.3 2002/03/10 22:06:53 mvojkovi Exp $ */
|
|
||||||
|
|
||||||
#define NEED_EVENTS
|
|
||||||
#define NEED_REPLIES
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user