Update to xmore 1.0.2.
This commit is contained in:
matthieu
parent
ed108ba924
commit
dc70d574a1
@ -1,8 +1,61 @@
|
|||||||
commit e7545d949090a3b7b75e3dd562cc367b152dcbb6
|
commit 999895eddb00cb535802409a46795c363b8d2422
|
||||||
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
Date: Wed Apr 21 21:59:37 2010 +0200
|
Date: Fri Jul 23 15:51:09 2010 -0700
|
||||||
|
|
||||||
BSD Makefile
|
xmore 1.0.2
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit 4772e37779221c32cd9aedf253c5d0097551b63e
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Fri Jul 23 14:14:06 2010 -0700
|
||||||
|
|
||||||
|
Remove several unnecessary macros from configure.ac
|
||||||
|
|
||||||
|
PKG_CHECK_MODULES automatically calls AC_SUBST on the CFLAGS & LIBS
|
||||||
|
variables it sets
|
||||||
|
|
||||||
|
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
|
||||||
|
AC_PROG_C_C99. This sets gcc with -std=gnu99.
|
||||||
|
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
|
||||||
|
|
||||||
|
AM_PROG_CC_C_O is not needed since we are not compiling multiple targets
|
||||||
|
with differing CFLAGS.
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit d5ee44e818b58ad7b2eba005a024cc60720787d8
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Fri Jul 23 14:08:38 2010 -0700
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
(Copied from commits to other modules by Gaetan Nadon <memsize@videotron.ca>)
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
|
commit 0c2c7bb1951b258b61ec0cd9990adfad32814a52
|
||||||
|
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
Date: Fri Jul 23 14:04:11 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
|
||||||
|
The existing statement can now be removed from the configuration file.
|
||||||
|
|
||||||
|
Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
|
||||||
|
Enables silent rule and use platform appropriate version of sed.
|
||||||
|
|
||||||
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||||
|
|
||||||
commit 4a4187b8ce272e96b760e1e59da980644e99aa0b
|
commit 4a4187b8ce272e96b760e1e59da980644e99aa0b
|
||||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||||
|
|||||||
@ -289,239 +289,3 @@ operates.
|
|||||||
`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.
|
||||||
|
|
||||||
Installation Instructions
|
|
||||||
*************************
|
|
||||||
|
|
||||||
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
|
|
||||||
Software Foundation, Inc.
|
|
||||||
|
|
||||||
This file is free documentation; the Free Software Foundation gives
|
|
||||||
unlimited permission to copy, distribute and modify it.
|
|
||||||
|
|
||||||
Basic Installation
|
|
||||||
==================
|
|
||||||
|
|
||||||
These are generic installation instructions.
|
|
||||||
|
|
||||||
The `configure' shell script attempts to guess correct values for
|
|
||||||
various system-dependent variables used during compilation. It uses
|
|
||||||
those values to create a `Makefile' in each directory of the package.
|
|
||||||
It may also create one or more `.h' files containing system-dependent
|
|
||||||
definitions. Finally, it creates a shell script `config.status' that
|
|
||||||
you can run in the future to recreate the current configuration, and a
|
|
||||||
file `config.log' containing compiler output (useful mainly for
|
|
||||||
debugging `configure').
|
|
||||||
|
|
||||||
It can also use an optional file (typically called `config.cache'
|
|
||||||
and enabled with `--cache-file=config.cache' or simply `-C') that saves
|
|
||||||
the results of its tests to speed up reconfiguring. (Caching is
|
|
||||||
disabled by default to prevent problems with accidental use of stale
|
|
||||||
cache files.)
|
|
||||||
|
|
||||||
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
|
|
||||||
diffs or instructions to the address given in the `README' so they can
|
|
||||||
be considered for the next release. If you are using the cache, and at
|
|
||||||
some point `config.cache' contains results you don't want to keep, you
|
|
||||||
may remove or edit it.
|
|
||||||
|
|
||||||
The file `configure.ac' (or `configure.in') is used to create
|
|
||||||
`configure' by a program called `autoconf'. You only need
|
|
||||||
`configure.ac' if you want to change it or regenerate `configure' using
|
|
||||||
a newer version of `autoconf'.
|
|
||||||
|
|
||||||
The simplest way to compile this package is:
|
|
||||||
|
|
||||||
1. `cd' to the directory containing the package's source code and type
|
|
||||||
`./configure' to configure the package for your system. If you're
|
|
||||||
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
|
|
||||||
messages telling which features it is checking for.
|
|
||||||
|
|
||||||
2. Type `make' to compile the package.
|
|
||||||
|
|
||||||
3. Optionally, type `make check' to run any self-tests that come with
|
|
||||||
the package.
|
|
||||||
|
|
||||||
4. Type `make install' to install the programs and any data files and
|
|
||||||
documentation.
|
|
||||||
|
|
||||||
5. You can remove the program binaries and object files from the
|
|
||||||
source code directory by typing `make clean'. To also remove the
|
|
||||||
files that `configure' created (so you can compile the package for
|
|
||||||
a different kind of computer), type `make distclean'. There is
|
|
||||||
also a `make maintainer-clean' target, but that is intended mainly
|
|
||||||
for the package's developers. If you use it, you may have to get
|
|
||||||
all sorts of other programs in order to regenerate files that came
|
|
||||||
with the distribution.
|
|
||||||
|
|
||||||
Compilers and Options
|
|
||||||
=====================
|
|
||||||
|
|
||||||
Some systems require unusual options for compilation or linking that the
|
|
||||||
`configure' script does not know about. Run `./configure --help' for
|
|
||||||
details on some of the pertinent environment variables.
|
|
||||||
|
|
||||||
You can give `configure' initial values for configuration parameters
|
|
||||||
by setting variables in the command line or in the environment. Here
|
|
||||||
is an example:
|
|
||||||
|
|
||||||
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
|
|
||||||
|
|
||||||
*Note Defining Variables::, for more details.
|
|
||||||
|
|
||||||
Compiling For Multiple Architectures
|
|
||||||
====================================
|
|
||||||
|
|
||||||
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
|
|
||||||
own directory. To do this, you must use a version of `make' that
|
|
||||||
supports the `VPATH' variable, such as GNU `make'. `cd' to the
|
|
||||||
directory where you want the object files and executables to go and run
|
|
||||||
the `configure' script. `configure' automatically checks for the
|
|
||||||
source code in the directory that `configure' is in and in `..'.
|
|
||||||
|
|
||||||
If you have to use a `make' that does not support the `VPATH'
|
|
||||||
variable, you have to compile the package for one architecture at a
|
|
||||||
time in the source code directory. After you have installed the
|
|
||||||
package for one architecture, use `make distclean' before reconfiguring
|
|
||||||
for another architecture.
|
|
||||||
|
|
||||||
Installation Names
|
|
||||||
==================
|
|
||||||
|
|
||||||
By default, `make install' installs the package's commands under
|
|
||||||
`/usr/local/bin', include files under `/usr/local/include', etc. You
|
|
||||||
can specify an installation prefix other than `/usr/local' by giving
|
|
||||||
`configure' the option `--prefix=PREFIX'.
|
|
||||||
|
|
||||||
You can specify separate installation prefixes for
|
|
||||||
architecture-specific files and architecture-independent files. If you
|
|
||||||
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
|
|
||||||
PREFIX as the prefix for installing programs and libraries.
|
|
||||||
Documentation and other data files still use the regular prefix.
|
|
||||||
|
|
||||||
In addition, if you use an unusual directory layout you can give
|
|
||||||
options like `--bindir=DIR' to specify different values for particular
|
|
||||||
kinds of files. Run `configure --help' for a list of the directories
|
|
||||||
you can set and what kinds of files go in them.
|
|
||||||
|
|
||||||
If the package supports it, you can cause programs to be installed
|
|
||||||
with an extra prefix or suffix on their names by giving `configure' the
|
|
||||||
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
|
|
||||||
|
|
||||||
Optional Features
|
|
||||||
=================
|
|
||||||
|
|
||||||
Some packages pay attention to `--enable-FEATURE' options to
|
|
||||||
`configure', where FEATURE indicates an optional part of the package.
|
|
||||||
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
|
|
||||||
is something like `gnu-as' or `x' (for the X Window System). The
|
|
||||||
`README' should mention any `--enable-' and `--with-' options that the
|
|
||||||
package recognizes.
|
|
||||||
|
|
||||||
For packages that use the X Window System, `configure' can usually
|
|
||||||
find the X include and library files automatically, but if it doesn't,
|
|
||||||
you can use the `configure' options `--x-includes=DIR' and
|
|
||||||
`--x-libraries=DIR' to specify their locations.
|
|
||||||
|
|
||||||
Specifying the System Type
|
|
||||||
==========================
|
|
||||||
|
|
||||||
There may be some features `configure' cannot figure out automatically,
|
|
||||||
but needs to determine by the type of machine the package will run on.
|
|
||||||
Usually, assuming the package is built to be run on the _same_
|
|
||||||
architectures, `configure' can figure that out, but if it prints a
|
|
||||||
message saying it cannot guess the machine type, give it the
|
|
||||||
`--build=TYPE' option. TYPE can either be a short name for the system
|
|
||||||
type, such as `sun4', or a canonical name which has the form:
|
|
||||||
|
|
||||||
CPU-COMPANY-SYSTEM
|
|
||||||
|
|
||||||
where SYSTEM can have one of these forms:
|
|
||||||
|
|
||||||
OS KERNEL-OS
|
|
||||||
|
|
||||||
See the file `config.sub' for the possible values of each field. If
|
|
||||||
`config.sub' isn't included in this package, then this package doesn't
|
|
||||||
need to know the machine type.
|
|
||||||
|
|
||||||
If you are _building_ compiler tools for cross-compiling, you should
|
|
||||||
use the option `--target=TYPE' to select the type of system they will
|
|
||||||
produce code for.
|
|
||||||
|
|
||||||
If you want to _use_ a cross compiler, that generates code for a
|
|
||||||
platform different from the build platform, you should specify the
|
|
||||||
"host" platform (i.e., that on which the generated programs will
|
|
||||||
eventually be run) with `--host=TYPE'.
|
|
||||||
|
|
||||||
Sharing Defaults
|
|
||||||
================
|
|
||||||
|
|
||||||
If you want to set default values for `configure' scripts to share, you
|
|
||||||
can create a site shell script called `config.site' that gives default
|
|
||||||
values for variables like `CC', `cache_file', and `prefix'.
|
|
||||||
`configure' looks for `PREFIX/share/config.site' if it exists, then
|
|
||||||
`PREFIX/etc/config.site' if it exists. Or, you can set the
|
|
||||||
`CONFIG_SITE' environment variable to the location of the site script.
|
|
||||||
A warning: not all `configure' scripts look for a site script.
|
|
||||||
|
|
||||||
Defining Variables
|
|
||||||
==================
|
|
||||||
|
|
||||||
Variables not defined in a site shell script can be set in the
|
|
||||||
environment passed to `configure'. However, some packages may run
|
|
||||||
configure again during the build, and the customized values of these
|
|
||||||
variables may be lost. In order to avoid this problem, you should set
|
|
||||||
them in the `configure' command line, using `VAR=value'. For example:
|
|
||||||
|
|
||||||
./configure CC=/usr/local2/bin/gcc
|
|
||||||
|
|
||||||
causes the specified `gcc' to be used as the C compiler (unless it is
|
|
||||||
overridden in the site shell script). Here is a another example:
|
|
||||||
|
|
||||||
/bin/bash ./configure CONFIG_SHELL=/bin/bash
|
|
||||||
|
|
||||||
Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
|
|
||||||
configuration-related scripts to be executed by `/bin/bash'.
|
|
||||||
|
|
||||||
`configure' Invocation
|
|
||||||
======================
|
|
||||||
|
|
||||||
`configure' recognizes the following options to control how it operates.
|
|
||||||
|
|
||||||
`--help'
|
|
||||||
`-h'
|
|
||||||
Print a summary of the options to `configure', and exit.
|
|
||||||
|
|
||||||
`--version'
|
|
||||||
`-V'
|
|
||||||
Print the version of Autoconf used to generate the `configure'
|
|
||||||
script, and exit.
|
|
||||||
|
|
||||||
`--cache-file=FILE'
|
|
||||||
Enable the cache: use and save the results of the tests in FILE,
|
|
||||||
traditionally `config.cache'. FILE defaults to `/dev/null' to
|
|
||||||
disable caching.
|
|
||||||
|
|
||||||
`--config-cache'
|
|
||||||
`-C'
|
|
||||||
Alias for `--cache-file=config.cache'.
|
|
||||||
|
|
||||||
`--quiet'
|
|
||||||
`--silent'
|
|
||||||
`-q'
|
|
||||||
Do not print messages saying which checks are being made. To
|
|
||||||
suppress all normal output, redirect it to `/dev/null' (any error
|
|
||||||
messages will still be shown).
|
|
||||||
|
|
||||||
`--srcdir=DIR'
|
|
||||||
Look for the package's source code in directory DIR. Usually
|
|
||||||
`configure' can determine that directory automatically.
|
|
||||||
|
|
||||||
`configure' also accepts some other, not widely useful, options. Run
|
|
||||||
`configure --help' for more details.
|
|
||||||
|
|
||||||
|
|||||||
@ -49,29 +49,11 @@ EXTRA_DIST += $(appman_PRE)
|
|||||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||||
CLEANFILES = $(appman_DATA)
|
CLEANFILES = $(appman_DATA)
|
||||||
|
|
||||||
SED = sed
|
|
||||||
|
|
||||||
# Strings to replace in man pages
|
|
||||||
XORGRELSTRING = @PACKAGE_STRING@
|
|
||||||
XORGMANNAME = X Version 11
|
|
||||||
|
|
||||||
MAN_SUBSTS = \
|
|
||||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
|
||||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
|
||||||
-e 's|__xservername__|Xorg|g' \
|
|
||||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
|
||||||
-e 's|__projectroot__|$(prefix)|g' \
|
|
||||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
|
||||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
|
||||||
|
|
||||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||||
|
|
||||||
|
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||||
.man.$(APP_MAN_SUFFIX):
|
.man.$(APP_MAN_SUFFIX):
|
||||||
sed $(MAN_SUBSTS) < $< > $@
|
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||||
|
|
||||||
|
|
||||||
.PHONY: ChangeLog INSTALL
|
.PHONY: ChangeLog INSTALL
|
||||||
|
|||||||
@ -163,6 +163,7 @@ MAINT = @MAINT@
|
|||||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||||
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
|
||||||
MAKEINFO = @MAKEINFO@
|
MAKEINFO = @MAKEINFO@
|
||||||
|
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@
|
||||||
OBJEXT = @OBJEXT@
|
OBJEXT = @OBJEXT@
|
||||||
@ -174,12 +175,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
|||||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||||
PKG_CONFIG = @PKG_CONFIG@
|
PKG_CONFIG = @PKG_CONFIG@
|
||||||
|
SED = @SED@
|
||||||
SET_MAKE = @SET_MAKE@
|
SET_MAKE = @SET_MAKE@
|
||||||
SHELL = @SHELL@
|
SHELL = @SHELL@
|
||||||
STRIP = @STRIP@
|
STRIP = @STRIP@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
XMORE_CFLAGS = @XMORE_CFLAGS@
|
XMORE_CFLAGS = @XMORE_CFLAGS@
|
||||||
XMORE_LIBS = @XMORE_LIBS@
|
XMORE_LIBS = @XMORE_LIBS@
|
||||||
|
XORG_MAN_PAGE = @XORG_MAN_PAGE@
|
||||||
ac_ct_CC = @ac_ct_CC@
|
ac_ct_CC = @ac_ct_CC@
|
||||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||||
@ -244,24 +247,6 @@ appmandir = $(APP_MAN_DIR)
|
|||||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||||
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
MAINTAINERCLEANFILES = ChangeLog INSTALL
|
||||||
CLEANFILES = $(appman_DATA)
|
CLEANFILES = $(appman_DATA)
|
||||||
SED = sed
|
|
||||||
|
|
||||||
# Strings to replace in man pages
|
|
||||||
XORGRELSTRING = @PACKAGE_STRING@
|
|
||||||
XORGMANNAME = X Version 11
|
|
||||||
MAN_SUBSTS = \
|
|
||||||
-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
|
||||||
-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
|
|
||||||
-e 's|__xservername__|Xorg|g' \
|
|
||||||
-e 's|__xconfigfile__|xorg.conf|g' \
|
|
||||||
-e 's|__projectroot__|$(prefix)|g' \
|
|
||||||
-e 's|__apploaddir__|$(appdefaultdir)|' \
|
|
||||||
-e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
|
|
||||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
|
||||||
|
|
||||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||||
all: config.h
|
all: config.h
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||||
@ -683,8 +668,9 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
|||||||
uninstall-info-am
|
uninstall-info-am
|
||||||
|
|
||||||
|
|
||||||
|
# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
|
||||||
.man.$(APP_MAN_SUFFIX):
|
.man.$(APP_MAN_SUFFIX):
|
||||||
sed $(MAN_SUBSTS) < $< > $@
|
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
|
||||||
|
|
||||||
.PHONY: ChangeLog INSTALL
|
.PHONY: ChangeLog INSTALL
|
||||||
|
|
||||||
|
|||||||
234
app/xmore/aclocal.m4
vendored
234
app/xmore/aclocal.m4
vendored
@ -740,34 +740,6 @@ AC_MSG_RESULT([$_am_result])
|
|||||||
rm -f confinc confmf
|
rm -f confinc confmf
|
||||||
])
|
])
|
||||||
|
|
||||||
# Copyright (C) 1999, 2000, 2001, 2003, 2005 Free Software Foundation, Inc.
|
|
||||||
#
|
|
||||||
# This file is free software; the Free Software Foundation
|
|
||||||
# gives unlimited permission to copy and/or distribute it,
|
|
||||||
# with or without modifications, as long as this notice is preserved.
|
|
||||||
|
|
||||||
# serial 3
|
|
||||||
|
|
||||||
# AM_PROG_CC_C_O
|
|
||||||
# --------------
|
|
||||||
# Like AC_PROG_CC_C_O, but changed for automake.
|
|
||||||
AC_DEFUN([AM_PROG_CC_C_O],
|
|
||||||
[AC_REQUIRE([AC_PROG_CC_C_O])dnl
|
|
||||||
AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
|
|
||||||
# FIXME: we rely on the cache variable name because
|
|
||||||
# there is no other way.
|
|
||||||
set dummy $CC
|
|
||||||
ac_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
|
|
||||||
if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" != yes"; then
|
|
||||||
# Losing compiler, so override with the script.
|
|
||||||
# FIXME: It is wrong to rewrite CC.
|
|
||||||
# But if we don't then we get into trouble of one sort or another.
|
|
||||||
# A longer-term fix would be to have automake use am__CC in this case,
|
|
||||||
# and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
|
|
||||||
CC="$am_aux_dir/compile $CC"
|
|
||||||
fi
|
|
||||||
])
|
|
||||||
|
|
||||||
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
|
||||||
|
|
||||||
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
|
# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
|
||||||
@ -1062,7 +1034,7 @@ dnl DEALINGS IN THE SOFTWARE.
|
|||||||
# See the "minimum version" comment for each macro you use to see what
|
# See the "minimum version" comment for each macro you use to see what
|
||||||
# version you require.
|
# version you require.
|
||||||
m4_defun([XORG_MACROS_VERSION],[
|
m4_defun([XORG_MACROS_VERSION],[
|
||||||
m4_define([vers_have], [1.6.1])
|
m4_define([vers_have], [1.8.0])
|
||||||
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
|
||||||
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
|
||||||
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
m4_if(m4_cmp(maj_have, maj_needed), 0,,
|
||||||
@ -1130,9 +1102,12 @@ AC_SUBST(RAWCPPFLAGS)
|
|||||||
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
|
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
|
||||||
# Not sure if there's any better way than just hardcoding by OS name.
|
# Not sure if there's any better way than just hardcoding by OS name.
|
||||||
# Override default settings by setting environment variables
|
# Override default settings by setting environment variables
|
||||||
|
# Added MAN_SUBSTS in version 1.8
|
||||||
|
# Added AC_PROG_SED in version 1.8
|
||||||
|
|
||||||
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
AC_REQUIRE([AC_PROG_SED])
|
||||||
|
|
||||||
if test x$APP_MAN_SUFFIX = x ; then
|
if test x$APP_MAN_SUFFIX = x ; then
|
||||||
APP_MAN_SUFFIX=1
|
APP_MAN_SUFFIX=1
|
||||||
@ -1201,8 +1176,52 @@ AC_SUBST([FILE_MAN_DIR])
|
|||||||
AC_SUBST([MISC_MAN_DIR])
|
AC_SUBST([MISC_MAN_DIR])
|
||||||
AC_SUBST([DRIVER_MAN_DIR])
|
AC_SUBST([DRIVER_MAN_DIR])
|
||||||
AC_SUBST([ADMIN_MAN_DIR])
|
AC_SUBST([ADMIN_MAN_DIR])
|
||||||
|
|
||||||
|
XORG_MAN_PAGE="X Version 11"
|
||||||
|
AC_SUBST([XORG_MAN_PAGE])
|
||||||
|
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|__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'"
|
||||||
|
AC_SUBST([MAN_SUBSTS])
|
||||||
|
|
||||||
]) # XORG_MANPAGE_SECTIONS
|
]) # XORG_MANPAGE_SECTIONS
|
||||||
|
|
||||||
|
# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION])
|
||||||
|
# ------------------------
|
||||||
|
# Minimum version: 1.7.0
|
||||||
|
#
|
||||||
|
# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent
|
||||||
|
# provided by xorg-sgml-doctools, if installed.
|
||||||
|
AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[
|
||||||
|
AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])])
|
||||||
|
XORG_SGML_PATH=
|
||||||
|
PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
|
||||||
|
[XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`],
|
||||||
|
[m4_ifval([$1],[:],
|
||||||
|
[if test x"$cross_compiling" != x"yes" ; then
|
||||||
|
AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent],
|
||||||
|
[XORG_SGML_PATH=$prefix/share/sgml])
|
||||||
|
fi])
|
||||||
|
])
|
||||||
|
|
||||||
|
if test "x$XORG_SGML_PATH" != "x" ; then
|
||||||
|
AC_MSG_RESULT([$XORG_SGML_PATH])
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(XORG_SGML_PATH)
|
||||||
|
]) # XORG_CHECK_SGML_DOCTOOLS
|
||||||
|
|
||||||
# XORG_CHECK_LINUXDOC
|
# XORG_CHECK_LINUXDOC
|
||||||
# -------------------
|
# -------------------
|
||||||
# Minimum version: 1.0.0
|
# Minimum version: 1.0.0
|
||||||
@ -1212,23 +1231,14 @@ AC_SUBST([ADMIN_MAN_DIR])
|
|||||||
# Whether or not the necessary tools and files are found can be checked
|
# Whether or not the necessary tools and files are found can be checked
|
||||||
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
||||||
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||||
if test x$XORG_SGML_PATH = x ; then
|
AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
|
||||||
XORG_SGML_PATH=$prefix/share/sgml
|
AC_REQUIRE([XORG_WITH_PS2PDF])
|
||||||
fi
|
|
||||||
HAVE_DEFS_ENT=
|
|
||||||
|
|
||||||
if test x"$cross_compiling" = x"yes" ; then
|
|
||||||
HAVE_DEFS_ENT=no
|
|
||||||
else
|
|
||||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
||||||
AC_PATH_PROG(PS2PDF, ps2pdf)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build documentation])
|
AC_MSG_CHECKING([whether to build documentation])
|
||||||
|
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
|
if test x$XORG_SGML_PATH != x && test x$LINUXDOC != x ; then
|
||||||
BUILDDOC=yes
|
BUILDDOC=yes
|
||||||
else
|
else
|
||||||
BUILDDOC=no
|
BUILDDOC=no
|
||||||
@ -1240,7 +1250,7 @@ AC_MSG_RESULT([$BUILDDOC])
|
|||||||
|
|
||||||
AC_MSG_CHECKING([whether to build pdf documentation])
|
AC_MSG_CHECKING([whether to build pdf documentation])
|
||||||
|
|
||||||
if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
|
if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then
|
||||||
BUILDPDFDOC=yes
|
BUILDPDFDOC=yes
|
||||||
else
|
else
|
||||||
BUILDPDFDOC=no
|
BUILDPDFDOC=no
|
||||||
@ -1250,7 +1260,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
|
|||||||
|
|
||||||
AC_MSG_RESULT([$BUILDPDFDOC])
|
AC_MSG_RESULT([$BUILDPDFDOC])
|
||||||
|
|
||||||
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
|
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f"
|
||||||
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
|
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
|
||||||
MAKE_PDF="$PS2PDF"
|
MAKE_PDF="$PS2PDF"
|
||||||
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
|
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
|
||||||
@ -1270,24 +1280,20 @@ AC_SUBST(MAKE_HTML)
|
|||||||
# indicates whether the necessary tools and files are found and, if set,
|
# indicates whether the necessary tools and files are found and, if set,
|
||||||
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
||||||
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
||||||
if test x$XORG_SGML_PATH = x ; then
|
AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
|
||||||
XORG_SGML_PATH=$prefix/share/sgml
|
|
||||||
fi
|
|
||||||
HAVE_DEFS_ENT=
|
|
||||||
BUILDTXTDOC=no
|
BUILDTXTDOC=no
|
||||||
BUILDPDFDOC=no
|
BUILDPDFDOC=no
|
||||||
BUILDPSDOC=no
|
BUILDPSDOC=no
|
||||||
BUILDHTMLDOC=no
|
BUILDHTMLDOC=no
|
||||||
|
|
||||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
|
||||||
|
|
||||||
AC_PATH_PROG(DOCBOOKPS, docbook2ps)
|
AC_PATH_PROG(DOCBOOKPS, docbook2ps)
|
||||||
AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
|
AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
|
||||||
AC_PATH_PROG(DOCBOOKHTML, docbook2html)
|
AC_PATH_PROG(DOCBOOKHTML, docbook2html)
|
||||||
AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
|
AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build text documentation])
|
AC_MSG_CHECKING([whether to build text documentation])
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
|
if test x$XORG_SGML_PATH != x && test x$DOCBOOKTXT != x &&
|
||||||
test x$BUILD_TXTDOC != xno; then
|
test x$BUILD_TXTDOC != xno; then
|
||||||
BUILDTXTDOC=yes
|
BUILDTXTDOC=yes
|
||||||
fi
|
fi
|
||||||
@ -1295,7 +1301,7 @@ AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
|
|||||||
AC_MSG_RESULT([$BUILDTXTDOC])
|
AC_MSG_RESULT([$BUILDTXTDOC])
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build PDF documentation])
|
AC_MSG_CHECKING([whether to build PDF documentation])
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
|
if test x$XORG_SGML_PATH != x && test x$DOCBOOKPDF != x &&
|
||||||
test x$BUILD_PDFDOC != xno; then
|
test x$BUILD_PDFDOC != xno; then
|
||||||
BUILDPDFDOC=yes
|
BUILDPDFDOC=yes
|
||||||
fi
|
fi
|
||||||
@ -1303,7 +1309,7 @@ AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
|
|||||||
AC_MSG_RESULT([$BUILDPDFDOC])
|
AC_MSG_RESULT([$BUILDPDFDOC])
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build PostScript documentation])
|
AC_MSG_CHECKING([whether to build PostScript documentation])
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
|
if test x$XORG_SGML_PATH != x && test x$DOCBOOKPS != x &&
|
||||||
test x$BUILD_PSDOC != xno; then
|
test x$BUILD_PSDOC != xno; then
|
||||||
BUILDPSDOC=yes
|
BUILDPSDOC=yes
|
||||||
fi
|
fi
|
||||||
@ -1311,7 +1317,7 @@ AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
|
|||||||
AC_MSG_RESULT([$BUILDPSDOC])
|
AC_MSG_RESULT([$BUILDPSDOC])
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to build HTML documentation])
|
AC_MSG_CHECKING([whether to build HTML documentation])
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
|
if test x$XORG_SGML_PATH != x && test x$DOCBOOKHTML != x &&
|
||||||
test x$BUILD_HTMLDOC != xno; then
|
test x$BUILD_HTMLDOC != xno; then
|
||||||
BUILDHTMLDOC=yes
|
BUILDHTMLDOC=yes
|
||||||
fi
|
fi
|
||||||
@ -1866,38 +1872,69 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
|||||||
# ----------------
|
# ----------------
|
||||||
# Minimum version: 1.1.0
|
# Minimum version: 1.1.0
|
||||||
#
|
#
|
||||||
# Sets up flags for source checkers such as lint and sparse if --with-lint
|
# This macro enables the use of a tool that flags some suspicious and
|
||||||
# is specified. (Use --with-lint=sparse for sparse.)
|
# non-portable constructs (likely to be bugs) in C language source code.
|
||||||
# Sets $LINT to name of source checker passed with --with-lint (default: lint)
|
# It will attempt to locate the tool and use appropriate options.
|
||||||
# Sets $LINT_FLAGS to flags to pass to source checker
|
# There are various lint type tools on different platforms.
|
||||||
# Sets LINT automake conditional if enabled (default: disabled)
|
#
|
||||||
|
# Interface to module:
|
||||||
|
# LINT: returns the path to the tool found on the platform
|
||||||
|
# or the value set to LINT on the configure cmd line
|
||||||
|
# also an Automake conditional
|
||||||
|
# LINT_FLAGS: an Automake variable with appropriate flags
|
||||||
|
#
|
||||||
|
# --with-lint: 'yes' user instructs the module to use lint
|
||||||
|
# 'no' user instructs the module not to use lint (default)
|
||||||
|
#
|
||||||
|
# If the user sets the value of LINT, AC_PATH_PROG skips testing the path.
|
||||||
|
# If the user sets the value of LINT_FLAGS, they are used verbatim.
|
||||||
#
|
#
|
||||||
AC_DEFUN([XORG_WITH_LINT],[
|
AC_DEFUN([XORG_WITH_LINT],[
|
||||||
|
|
||||||
# Allow checking code with lint, sparse, etc.
|
AC_ARG_VAR([LINT], [Path to a lint-style command])
|
||||||
|
AC_ARG_VAR([LINT_FLAGS], [Flags for the lint-style command])
|
||||||
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
|
AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
|
||||||
[Use a lint-style source code checker (default: disabled)])],
|
[Use a lint-style source code checker (default: disabled)])],
|
||||||
[use_lint=$withval], [use_lint=no])
|
[use_lint=$withval], [use_lint=no])
|
||||||
if test "x$use_lint" = "xyes" ; then
|
|
||||||
LINT="lint"
|
# Obtain platform specific info like program name and options
|
||||||
|
# The lint program on FreeBSD and NetBSD is different from the one on Solaris
|
||||||
|
case $host_os in
|
||||||
|
*linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*)
|
||||||
|
lint_name=splint
|
||||||
|
lint_options="-badflag"
|
||||||
|
;;
|
||||||
|
*freebsd* | *netbsd*)
|
||||||
|
lint_name=lint
|
||||||
|
lint_options="-u -b"
|
||||||
|
;;
|
||||||
|
*solaris*)
|
||||||
|
lint_name=lint
|
||||||
|
lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Test for the presence of the program (either guessed by the code or spelled out by the user)
|
||||||
|
if test "x$use_lint" = x"yes" ; then
|
||||||
|
AC_PATH_PROG([LINT], [$lint_name])
|
||||||
|
if test "x$LINT" = "x"; then
|
||||||
|
AC_MSG_ERROR([--with-lint=yes specified but lint-style tool not found in PATH])
|
||||||
|
fi
|
||||||
|
elif test "x$use_lint" = x"no" ; then
|
||||||
|
if test "x$LINT" != "x"; then
|
||||||
|
AC_MSG_WARN([ignoring LINT environment variable since --with-lint=no was specified])
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
LINT="$use_lint"
|
AC_MSG_ERROR([--with-lint expects 'yes' or 'no'. Use LINT variable to specify path.])
|
||||||
fi
|
|
||||||
if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
|
|
||||||
case $LINT in
|
|
||||||
lint|*/lint)
|
|
||||||
case $host_os in
|
|
||||||
solaris*)
|
|
||||||
LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(LINT)
|
# User supplied flags override default flags
|
||||||
AC_SUBST(LINT_FLAGS)
|
if test "x$LINT_FLAGS" != "x"; then
|
||||||
AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
lint_options=$LINT_FLAGS
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST([LINT_FLAGS],[$lint_options])
|
||||||
|
AM_CONDITIONAL(LINT, [test "x$LINT" != x])
|
||||||
|
|
||||||
]) # XORG_WITH_LINT
|
]) # XORG_WITH_LINT
|
||||||
|
|
||||||
@ -1907,28 +1944,29 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
|||||||
#
|
#
|
||||||
# Sets up flags for building lint libraries for checking programs that call
|
# Sets up flags for building lint libraries for checking programs that call
|
||||||
# functions in the library.
|
# functions in the library.
|
||||||
# Disabled by default, enable with --enable-lint-library
|
|
||||||
# Sets:
|
|
||||||
# @LINTLIB@ - name of lint library file to make
|
|
||||||
# MAKE_LINT_LIB - automake conditional
|
|
||||||
#
|
#
|
||||||
|
# Interface to module:
|
||||||
|
# LINTLIB - Automake variable with the name of lint library file to make
|
||||||
|
# MAKE_LINT_LIB - Automake conditional
|
||||||
|
#
|
||||||
|
# --enable-lint-library: - 'yes' user instructs the module to created a lint library
|
||||||
|
# - 'no' user instructs the module not to create a lint library (default)
|
||||||
|
|
||||||
AC_DEFUN([XORG_LINT_LIBRARY],[
|
AC_DEFUN([XORG_LINT_LIBRARY],[
|
||||||
AC_REQUIRE([XORG_WITH_LINT])
|
AC_REQUIRE([XORG_WITH_LINT])
|
||||||
# Build lint "library" for more indepth checks of programs calling this library
|
|
||||||
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
|
AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
|
||||||
[Create lint library (default: disabled)])],
|
[Create lint library (default: disabled)])],
|
||||||
[make_lint_lib=$enableval], [make_lint_lib=no])
|
[make_lint_lib=$enableval], [make_lint_lib=no])
|
||||||
if test "x$make_lint_lib" != "xno" ; then
|
|
||||||
if test "x$LINT" = "xno" ; then
|
if test "x$make_lint_lib" = x"yes" ; then
|
||||||
|
LINTLIB=llib-l$1.ln
|
||||||
|
if test "x$LINT" = "x"; then
|
||||||
AC_MSG_ERROR([Cannot make lint library without --with-lint])
|
AC_MSG_ERROR([Cannot make lint library without --with-lint])
|
||||||
fi
|
fi
|
||||||
if test "x$make_lint_lib" = "xyes" ; then
|
elif test "x$make_lint_lib" != x"no" ; then
|
||||||
LINTLIB=llib-l$1.ln
|
AC_MSG_ERROR([--enable-lint-library expects 'yes' or 'no'.])
|
||||||
else
|
|
||||||
LINTLIB=$make_lint_lib
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(LINTLIB)
|
AC_SUBST(LINTLIB)
|
||||||
AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||||
|
|
||||||
@ -1941,7 +1979,7 @@ AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
|||||||
# Defines CWARNFLAGS to enable C compiler warnings.
|
# Defines CWARNFLAGS to enable C compiler warnings.
|
||||||
#
|
#
|
||||||
AC_DEFUN([XORG_CWARNFLAGS], [
|
AC_DEFUN([XORG_CWARNFLAGS], [
|
||||||
AC_REQUIRE([AC_PROG_CC])
|
AC_REQUIRE([AC_PROG_CC_C99])
|
||||||
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 \
|
||||||
@ -1966,7 +2004,7 @@ AC_SUBST(CWARNFLAGS)
|
|||||||
#
|
#
|
||||||
# Add configure option to enable strict compilation
|
# Add configure option to enable strict compilation
|
||||||
AC_DEFUN([XORG_STRICT_OPTION], [
|
AC_DEFUN([XORG_STRICT_OPTION], [
|
||||||
AC_REQUIRE([AC_PROG_CC])
|
# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
|
||||||
AC_REQUIRE([AC_PROG_CC_C99])
|
AC_REQUIRE([AC_PROG_CC_C99])
|
||||||
AC_REQUIRE([XORG_CWARNFLAGS])
|
AC_REQUIRE([XORG_CWARNFLAGS])
|
||||||
|
|
||||||
@ -1996,6 +2034,7 @@ AC_SUBST([CWARNFLAGS])
|
|||||||
# Defines default options for X.Org modules.
|
# Defines default options for X.Org modules.
|
||||||
#
|
#
|
||||||
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
AC_DEFUN([XORG_DEFAULT_OPTIONS], [
|
||||||
|
AC_REQUIRE([AC_PROG_INSTALL])
|
||||||
XORG_CWARNFLAGS
|
XORG_CWARNFLAGS
|
||||||
XORG_STRICT_OPTION
|
XORG_STRICT_OPTION
|
||||||
XORG_RELEASE_VERSION
|
XORG_RELEASE_VERSION
|
||||||
@ -2049,22 +2088,9 @@ dnl
|
|||||||
|
|
||||||
# XORG_RELEASE_VERSION
|
# XORG_RELEASE_VERSION
|
||||||
# --------------------
|
# --------------------
|
||||||
# Adds --with/without-release-string and changes the PACKAGE and
|
# Defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
||||||
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
|
||||||
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
|
||||||
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
|
||||||
|
|
||||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||||
AC_ARG_WITH(release-version,
|
|
||||||
AS_HELP_STRING([--with-release-version=STRING],
|
|
||||||
[Use release version string in package name]),
|
|
||||||
[RELEASE_VERSION="$withval"],
|
|
||||||
[RELEASE_VERSION=""])
|
|
||||||
if test "x$RELEASE_VERSION" != "x"; then
|
|
||||||
PACKAGE="$PACKAGE-$RELEASE_VERSION"
|
|
||||||
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
|
|
||||||
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
|
|
||||||
fi
|
|
||||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
|
||||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||||
[Major version of this package])
|
[Major version of this package])
|
||||||
|
|||||||
@ -27,9 +27,6 @@
|
|||||||
/* Define to 1 if you have the <unistd.h> header file. */
|
/* Define to 1 if you have the <unistd.h> header file. */
|
||||||
#undef HAVE_UNISTD_H
|
#undef HAVE_UNISTD_H
|
||||||
|
|
||||||
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
|
|
||||||
#undef NO_MINUS_C_MINUS_O
|
|
||||||
|
|
||||||
/* Name of package */
|
/* Name of package */
|
||||||
#undef PACKAGE
|
#undef PACKAGE
|
||||||
|
|
||||||
|
|||||||
1476
app/xmore/configure
vendored
1476
app/xmore/configure
vendored
File diff suppressed because it is too large
Load Diff
@ -21,28 +21,26 @@ 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])
|
||||||
AC_INIT(xmore,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xmore)
|
AC_INIT([xmore],
|
||||||
|
[1.0.2],
|
||||||
|
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||||
|
[xmore])
|
||||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
# Require xorg-macros: 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)
|
||||||
XORG_DEFAULT_OPTIONS
|
XORG_DEFAULT_OPTIONS
|
||||||
|
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
AC_PROG_CC
|
|
||||||
AM_PROG_CC_C_O
|
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
||||||
|
|
||||||
# Checks for pkg-config packages
|
# Checks for pkg-config packages
|
||||||
PKG_CHECK_MODULES(XMORE, xaw7)
|
PKG_CHECK_MODULES(XMORE, xaw7)
|
||||||
AC_SUBST(XMORE_CFLAGS)
|
|
||||||
AC_SUBST(XMORE_LIBS)
|
|
||||||
|
|
||||||
PKG_CHECK_MODULES(APPDEFS, xt)
|
PKG_CHECK_MODULES(APPDEFS, xt)
|
||||||
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
|
xt_appdefaultdir=`$PKG_CONFIG --variable=appdefaultdir xt`
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user