xsetroot 1.0.2.
This commit is contained in:
parent
9e0f4db840
commit
c16b35a432
|
@ -7,10 +7,11 @@ x11-xserver-utils (7.2+4) UNRELEASED; urgency=low
|
||||||
* xgamma 1.0.2.
|
* xgamma 1.0.2.
|
||||||
+ the manpage now explains how to print the gamma value more clearly
|
+ the manpage now explains how to print the gamma value more clearly
|
||||||
(closes: #296021).
|
(closes: #296021).
|
||||||
|
* xsetroot 1.0.2.
|
||||||
* Add upstream URL to debian/copyright, and update it from xgamma's COPYING
|
* Add upstream URL to debian/copyright, and update it from xgamma's COPYING
|
||||||
file.
|
file.
|
||||||
|
|
||||||
-- Julien Cristau <jcristau@debian.org> Mon, 13 Aug 2007 15:29:22 +0200
|
-- Julien Cristau <jcristau@debian.org> Mon, 13 Aug 2007 15:36:32 +0200
|
||||||
|
|
||||||
x11-xserver-utils (7.2+3) experimental; urgency=low
|
x11-xserver-utils (7.2+3) experimental; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -1,31 +1,198 @@
|
||||||
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
commit ba9fbd14258ab44c794bb1a6dd9af51c5f4c01ff
|
||||||
|
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
|
||||||
|
Date: Fri Aug 10 10:45:46 2007 +0200
|
||||||
|
|
||||||
|
Bump version for release
|
||||||
|
|
||||||
|
commit d1658d389d7fbad0c2ec2ea5e8563c3d06ed2a47
|
||||||
|
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||||
|
Date: Mon Jul 30 21:17:42 2007 +0200
|
||||||
|
|
||||||
|
Add option to check code with lint/sparse/etc.
|
||||||
|
|
||||||
|
commit 9282a4aa79b3cb4ae091a594de61dfc2ecfd9ea3
|
||||||
|
Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
|
||||||
|
Date: Mon Jul 30 21:11:20 2007 +0200
|
||||||
|
|
||||||
|
Change xsetroot_CFLAGS to AM_CFLAGS to avoid automake-1.10 warning
|
||||||
|
|
||||||
|
commit fe4a33713aca2ce32053f2c8356423efd1f534e1
|
||||||
|
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||||
|
Date: Mon Jul 30 21:08:00 2007 +0200
|
||||||
|
|
||||||
|
- Replace static ChangeLog with disthook to generate from git log
|
||||||
|
- generate INSTALL
|
||||||
|
|
||||||
|
commit f479fd29a876d445291d7e55de9e9a22bac419b6
|
||||||
|
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
|
||||||
|
Date: Mon Jul 30 21:07:05 2007 +0200
|
||||||
|
|
||||||
|
- renamed .cvsignore -> .gitignore
|
||||||
|
- Replace static ChangeLog with disthook to generate from git log
|
||||||
|
|
||||||
|
commit 382e52e07a110628efa0784b64088f6f64ae3112
|
||||||
|
Author: Marc Balmer <mbalmer@openbsd.org>
|
||||||
|
Date: Mon Jul 30 20:47:53 2007 +0200
|
||||||
|
|
||||||
|
Typo, it's xsetroot, not setroot.
|
||||||
|
|
||||||
|
commit e43e2cc868cff003d3e69c17a69bb7440393c359
|
||||||
|
Author: Kevin E Martin <kem@kem.org>
|
||||||
|
Date: Wed Dec 21 02:29:54 2005 +0000
|
||||||
|
|
||||||
* configure.ac:
|
|
||||||
Update package version for X11R7 release.
|
Update package version for X11R7 release.
|
||||||
|
|
||||||
2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
commit 3c3dc25e901fe4a93d308a4456d00783d6fff252
|
||||||
|
Author: Adam Jackson <ajax@nwnk.net>
|
||||||
|
Date: Mon Dec 19 16:22:47 2005 +0000
|
||||||
|
|
||||||
|
Stub COPYING files
|
||||||
|
|
||||||
|
commit 4e633038f484b9955fe6aa80fdbbcc4d827fa4f3
|
||||||
|
Author: Kevin E Martin <kem@kem.org>
|
||||||
|
Date: Thu Dec 15 00:24:11 2005 +0000
|
||||||
|
|
||||||
* configure.ac:
|
|
||||||
Update package version number for final X11R7 release candidate.
|
Update package version number for final X11R7 release candidate.
|
||||||
|
|
||||||
2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
commit aa60171a0cf04a787a29e1af3551976652d8ce84
|
||||||
|
Author: Kevin E Martin <kem@kem.org>
|
||||||
|
Date: Tue Dec 6 22:48:26 2005 +0000
|
||||||
|
|
||||||
* Makefile.am:
|
|
||||||
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
|
||||||
|
|
||||||
2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
commit a3844b7b2f68e295f69e9a8dbf45f311b717362b
|
||||||
|
Author: Kevin E Martin <kem@kem.org>
|
||||||
|
Date: Sat Dec 3 05:49:28 2005 +0000
|
||||||
|
|
||||||
* configure.ac:
|
|
||||||
Update package version number for X11R7 RC3 release.
|
Update package version number for X11R7 RC3 release.
|
||||||
|
|
||||||
2005-11-20 Alan Coopersmith <alan.coopersmith@sun.com>
|
commit a5056d61df9bc78b10ad200a7fc250842f034204
|
||||||
|
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||||
|
Date: Mon Nov 28 22:01:47 2005 +0000
|
||||||
|
|
||||||
* configure.ac:
|
Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
|
||||||
Change dependency from xmu to xmuu since the full xmu
|
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
|
||||||
(with all its baggage like Xt) is not needed here.
|
|
||||||
|
|
||||||
2005-10-18 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
commit bfc05c358c4c8698292e40729ede000939cfe4a8
|
||||||
|
Author: Eric Anholt <anholt@freebsd.org>
|
||||||
|
Date: Mon Nov 21 10:35:08 2005 +0000
|
||||||
|
|
||||||
|
Another pass at .cvsignores for apps.
|
||||||
|
|
||||||
|
commit 9826f19633f549f2282702f19e33f7e51c4c5e9e
|
||||||
|
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||||
|
Date: Mon Nov 21 03:14:16 2005 +0000
|
||||||
|
|
||||||
|
Change dependency from xmu to xmuu since the full xmu (with all its baggage
|
||||||
|
like Xt) is not needed here.
|
||||||
|
|
||||||
|
commit d6817bf87bfcd2be3215ea9e28e6d13b1d438657
|
||||||
|
Author: Eric Anholt <anholt@freebsd.org>
|
||||||
|
Date: Sun Nov 20 22:08:55 2005 +0000
|
||||||
|
|
||||||
|
Add/improve .cvsignore files for apps.
|
||||||
|
|
||||||
|
commit 86145da43db031adc122f8bf9baacd45be5e7d84
|
||||||
|
Author: Kevin E Martin <kem@kem.org>
|
||||||
|
Date: Wed Oct 19 02:47:57 2005 +0000
|
||||||
|
|
||||||
* configure.ac:
|
|
||||||
Update package version number for RC1 release.
|
Update package version number for RC1 release.
|
||||||
|
|
||||||
|
commit cb52055c08c845309c126a2763bacaba5798ed65
|
||||||
|
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||||
|
Date: Mon Oct 17 23:56:25 2005 +0000
|
||||||
|
|
||||||
|
Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to
|
||||||
|
work better with BSD make
|
||||||
|
|
||||||
|
commit a10e876217a9354dd26935fd013cae57882369fa
|
||||||
|
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||||
|
Date: Fri Oct 14 00:25:48 2005 +0000
|
||||||
|
|
||||||
|
Use sed to fill in variables in man page
|
||||||
|
|
||||||
|
commit 7b3f04619ecaec58e16a68037c435363ab27f447
|
||||||
|
Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
|
||||||
|
Date: Mon Aug 1 20:25:32 2005 +0000
|
||||||
|
|
||||||
|
Install man pages to section 1 instead of section m (Patch from Donnie
|
||||||
|
Berkholz)
|
||||||
|
|
||||||
|
commit 63dc3c29b9f7af53efe466a7ed1476b4f4f17228
|
||||||
|
Author: Kevin E Martin <kem@kem.org>
|
||||||
|
Date: Fri Jul 29 21:22:38 2005 +0000
|
||||||
|
|
||||||
|
Various changes preparing packages for RC0:
|
||||||
|
- Verify and update package version numbers as needed
|
||||||
|
- Implement versioning scheme
|
||||||
|
- Change bug address to point to bugzilla bug entry form
|
||||||
|
- Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
|
||||||
|
reenable it)
|
||||||
|
- Fix makedepend to use pkgconfig and pass distcheck
|
||||||
|
- Update build script to build macros first
|
||||||
|
- Update modular Xorg version
|
||||||
|
|
||||||
|
commit d5e74073175fbfb70a6f859d565262af09938642
|
||||||
|
Author: Adam Jackson <ajax@nwnk.net>
|
||||||
|
Date: Wed Jul 20 19:32:04 2005 +0000
|
||||||
|
|
||||||
|
Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global
|
||||||
|
configure cache, you cache it, and the cached value is probably wrong.
|
||||||
|
|
||||||
|
commit 0cc65bf4e9e0522422a9bd5824dc21dd05bf0368
|
||||||
|
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||||
|
Date: Fri Jul 15 16:49:26 2005 +0000
|
||||||
|
|
||||||
|
Add dependency on xbitmaps
|
||||||
|
|
||||||
|
commit 2f3ed0d66595b15a2893098d0c0b05a568fb01e7
|
||||||
|
Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
|
||||||
|
Date: Fri Jul 1 20:09:06 2005 +0000
|
||||||
|
|
||||||
|
xtrap.pc.in: s/Xfixes/XTrap/ xi.pc.in: s/Xt/Xi/ Xv/src/Makefile.am: remove
|
||||||
|
whitespace after backslash modularizeapp.sh: s/destkop/desktop/
|
||||||
|
modular/symlink.sh: Add bitmaps for xeyes, system.xsm for xsm, and
|
||||||
|
Xvidtune.cpp for xvidtune. Also comment out non-existing mga_bios.h
|
||||||
|
Check in buildsystems for xsetroot, xsm, xstdcmap, xtrap, and xvinfo
|
||||||
|
|
||||||
|
commit da9e01ac6c7199ea2d7cac40af7587192c23aff2
|
||||||
|
Author: Egbert Eich <eich@suse.de>
|
||||||
|
Date: Fri Apr 23 19:55:06 2004 +0000
|
||||||
|
|
||||||
|
Merging XORG-CURRENT into trunk
|
||||||
|
|
||||||
|
commit 7cc5582a833e643be56bc5154e86eea988d537a9
|
||||||
|
Author: Egbert Eich <eich@suse.de>
|
||||||
|
Date: Sun Mar 14 08:35:45 2004 +0000
|
||||||
|
|
||||||
|
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
|
||||||
|
|
||||||
|
commit cb915ca7ff57ceabc129556e9771c2fd2c401a76
|
||||||
|
Author: Egbert Eich <eich@suse.de>
|
||||||
|
Date: Wed Mar 3 12:13:18 2004 +0000
|
||||||
|
|
||||||
|
Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
|
||||||
|
|
||||||
|
commit 10edd9087ebd46ca19500b987054d11f1c8e53fe
|
||||||
|
Author: Egbert Eich <eich@suse.de>
|
||||||
|
Date: Thu Feb 26 13:36:26 2004 +0000
|
||||||
|
|
||||||
|
readding XFree86's cvs IDs
|
||||||
|
|
||||||
|
commit 0976043e2f31f6bad969c3f996961c59fc953d84
|
||||||
|
Author: Egbert Eich <eich@suse.de>
|
||||||
|
Date: Thu Feb 26 09:24:17 2004 +0000
|
||||||
|
|
||||||
|
Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
|
||||||
|
|
||||||
|
commit 133f2a1c164a945366816cb4a71419ebe5c575ea
|
||||||
|
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||||
|
Date: Fri Nov 14 16:49:23 2003 +0000
|
||||||
|
|
||||||
|
XFree86 4.3.0.1
|
||||||
|
|
||||||
|
commit 500a078602d5db1e420a07c81dada5a676e0cc90
|
||||||
|
Author: Kaleb Keithley <kaleb@freedesktop.org>
|
||||||
|
Date: Fri Nov 14 15:54:55 2003 +0000
|
||||||
|
|
||||||
|
R6.6 is the Xorg base-line
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
bin_PROGRAMS = xsetroot
|
bin_PROGRAMS = xsetroot
|
||||||
|
|
||||||
xsetroot_CFLAGS = $(XSETROOT_CFLAGS)
|
AM_CFLAGS = $(XSETROOT_CFLAGS)
|
||||||
xsetroot_LDADD = $(XSETROOT_LIBS)
|
xsetroot_LDADD = $(XSETROOT_LIBS)
|
||||||
|
|
||||||
xsetroot_SOURCES = \
|
xsetroot_SOURCES = \
|
||||||
|
@ -35,9 +35,18 @@ appmandir = $(APP_MAN_DIR)
|
||||||
|
|
||||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||||
|
|
||||||
EXTRA_DIST = $(appman_PRE)
|
EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
|
||||||
CLEANFILES = $(appman_DATA)
|
CLEANFILES = $(appman_DATA)
|
||||||
|
|
||||||
|
MAINTAINERCLEANFILES = ChangeLog
|
||||||
|
|
||||||
|
.PHONY: ChangeLog
|
||||||
|
|
||||||
|
ChangeLog:
|
||||||
|
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||||
|
|
||||||
|
dist-hook: ChangeLog
|
||||||
|
|
||||||
SED = sed
|
SED = sed
|
||||||
|
|
||||||
# Strings to replace in man pages
|
# Strings to replace in man pages
|
||||||
|
@ -61,3 +70,10 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||||
|
|
||||||
.man.$(APP_MAN_SUFFIX):
|
.man.$(APP_MAN_SUFFIX):
|
||||||
sed $(MAN_SUBSTS) < $< > $@
|
sed $(MAN_SUBSTS) < $< > $@
|
||||||
|
|
||||||
|
if LINT
|
||||||
|
ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||||
|
$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
|
||||||
|
lint:
|
||||||
|
$(LINT) $(ALL_LINT_FLAGS) $(xsetroot_SOURCES)
|
||||||
|
endif LINT
|
||||||
|
|
|
@ -62,8 +62,7 @@ bin_PROGRAMS = xsetroot$(EXEEXT)
|
||||||
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||||
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
|
||||||
compile config.guess config.sub depcomp install-sh missing \
|
config.guess config.sub depcomp install-sh missing
|
||||||
mkinstalldirs
|
|
||||||
subdir = .
|
subdir = .
|
||||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||||
|
@ -71,13 +70,13 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||||
$(ACLOCAL_M4)
|
$(ACLOCAL_M4)
|
||||||
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
|
||||||
configure.lineno configure.status.lineno
|
configure.lineno configure.status.lineno
|
||||||
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
mkinstalldirs = $(SHELL) $(install_sh) -d
|
||||||
CONFIG_HEADER = config.h
|
CONFIG_HEADER = config.h
|
||||||
CONFIG_CLEAN_FILES =
|
CONFIG_CLEAN_FILES =
|
||||||
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
|
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
|
||||||
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
|
||||||
PROGRAMS = $(bin_PROGRAMS)
|
PROGRAMS = $(bin_PROGRAMS)
|
||||||
am_xsetroot_OBJECTS = xsetroot-xsetroot.$(OBJEXT)
|
am_xsetroot_OBJECTS = xsetroot.$(OBJEXT)
|
||||||
xsetroot_OBJECTS = $(am_xsetroot_OBJECTS)
|
xsetroot_OBJECTS = $(am_xsetroot_OBJECTS)
|
||||||
am__DEPENDENCIES_1 =
|
am__DEPENDENCIES_1 =
|
||||||
xsetroot_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
xsetroot_DEPENDENCIES = $(am__DEPENDENCIES_1)
|
||||||
|
@ -147,6 +146,10 @@ LIBOBJS = @LIBOBJS@
|
||||||
LIBS = @LIBS@
|
LIBS = @LIBS@
|
||||||
LIB_MAN_DIR = @LIB_MAN_DIR@
|
LIB_MAN_DIR = @LIB_MAN_DIR@
|
||||||
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
|
||||||
|
LINT = @LINT@
|
||||||
|
LINT_FALSE = @LINT_FALSE@
|
||||||
|
LINT_FLAGS = @LINT_FLAGS@
|
||||||
|
LINT_TRUE = @LINT_TRUE@
|
||||||
LTLIBOBJS = @LTLIBOBJS@
|
LTLIBOBJS = @LTLIBOBJS@
|
||||||
MAINT = @MAINT@
|
MAINT = @MAINT@
|
||||||
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
|
||||||
|
@ -170,6 +173,8 @@ VERSION = @VERSION@
|
||||||
XSETROOT_CFLAGS = @XSETROOT_CFLAGS@
|
XSETROOT_CFLAGS = @XSETROOT_CFLAGS@
|
||||||
XSETROOT_LIBS = @XSETROOT_LIBS@
|
XSETROOT_LIBS = @XSETROOT_LIBS@
|
||||||
ac_ct_CC = @ac_ct_CC@
|
ac_ct_CC = @ac_ct_CC@
|
||||||
|
ac_ct_STRIP = @ac_ct_STRIP@
|
||||||
|
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
|
||||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||||
am__include = @am__include@
|
am__include = @am__include@
|
||||||
|
@ -184,35 +189,28 @@ build_cpu = @build_cpu@
|
||||||
build_os = @build_os@
|
build_os = @build_os@
|
||||||
build_vendor = @build_vendor@
|
build_vendor = @build_vendor@
|
||||||
datadir = @datadir@
|
datadir = @datadir@
|
||||||
datarootdir = @datarootdir@
|
|
||||||
docdir = @docdir@
|
|
||||||
dvidir = @dvidir@
|
|
||||||
exec_prefix = @exec_prefix@
|
exec_prefix = @exec_prefix@
|
||||||
host = @host@
|
host = @host@
|
||||||
host_alias = @host_alias@
|
host_alias = @host_alias@
|
||||||
host_cpu = @host_cpu@
|
host_cpu = @host_cpu@
|
||||||
host_os = @host_os@
|
host_os = @host_os@
|
||||||
host_vendor = @host_vendor@
|
host_vendor = @host_vendor@
|
||||||
htmldir = @htmldir@
|
|
||||||
includedir = @includedir@
|
includedir = @includedir@
|
||||||
infodir = @infodir@
|
infodir = @infodir@
|
||||||
install_sh = @install_sh@
|
install_sh = @install_sh@
|
||||||
libdir = @libdir@
|
libdir = @libdir@
|
||||||
libexecdir = @libexecdir@
|
libexecdir = @libexecdir@
|
||||||
localedir = @localedir@
|
|
||||||
localstatedir = @localstatedir@
|
localstatedir = @localstatedir@
|
||||||
mandir = @mandir@
|
mandir = @mandir@
|
||||||
mkdir_p = @mkdir_p@
|
mkdir_p = @mkdir_p@
|
||||||
oldincludedir = @oldincludedir@
|
oldincludedir = @oldincludedir@
|
||||||
pdfdir = @pdfdir@
|
|
||||||
prefix = @prefix@
|
prefix = @prefix@
|
||||||
program_transform_name = @program_transform_name@
|
program_transform_name = @program_transform_name@
|
||||||
psdir = @psdir@
|
|
||||||
sbindir = @sbindir@
|
sbindir = @sbindir@
|
||||||
sharedstatedir = @sharedstatedir@
|
sharedstatedir = @sharedstatedir@
|
||||||
sysconfdir = @sysconfdir@
|
sysconfdir = @sysconfdir@
|
||||||
target_alias = @target_alias@
|
target_alias = @target_alias@
|
||||||
xsetroot_CFLAGS = $(XSETROOT_CFLAGS)
|
AM_CFLAGS = $(XSETROOT_CFLAGS)
|
||||||
xsetroot_LDADD = $(XSETROOT_LIBS)
|
xsetroot_LDADD = $(XSETROOT_LIBS)
|
||||||
xsetroot_SOURCES = \
|
xsetroot_SOURCES = \
|
||||||
xsetroot.c
|
xsetroot.c
|
||||||
|
@ -222,8 +220,9 @@ appman_PRE = \
|
||||||
|
|
||||||
appmandir = $(APP_MAN_DIR)
|
appmandir = $(APP_MAN_DIR)
|
||||||
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
|
||||||
EXTRA_DIST = $(appman_PRE)
|
EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
|
||||||
CLEANFILES = $(appman_DATA)
|
CLEANFILES = $(appman_DATA)
|
||||||
|
MAINTAINERCLEANFILES = ChangeLog
|
||||||
SED = sed
|
SED = sed
|
||||||
|
|
||||||
# Strings to replace in man pages
|
# Strings to replace in man pages
|
||||||
|
@ -243,6 +242,9 @@ MAN_SUBSTS = \
|
||||||
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
|
||||||
|
|
||||||
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
SUFFIXES = .$(APP_MAN_SUFFIX) .man
|
||||||
|
@LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
|
||||||
|
@LINT_TRUE@ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
|
||||||
|
|
||||||
all: config.h
|
all: config.h
|
||||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||||
|
|
||||||
|
@ -331,7 +333,7 @@ mostlyclean-compile:
|
||||||
distclean-compile:
|
distclean-compile:
|
||||||
-rm -f *.tab.c
|
-rm -f *.tab.c
|
||||||
|
|
||||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsetroot-xsetroot.Po@am__quote@
|
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsetroot.Po@am__quote@
|
||||||
|
|
||||||
.c.o:
|
.c.o:
|
||||||
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
|
||||||
|
@ -346,20 +348,6 @@ distclean-compile:
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||||
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
|
||||||
|
|
||||||
xsetroot-xsetroot.o: xsetroot.c
|
|
||||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsetroot_CFLAGS) $(CFLAGS) -MT xsetroot-xsetroot.o -MD -MP -MF "$(DEPDIR)/xsetroot-xsetroot.Tpo" -c -o xsetroot-xsetroot.o `test -f 'xsetroot.c' || echo '$(srcdir)/'`xsetroot.c; \
|
|
||||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xsetroot-xsetroot.Tpo" "$(DEPDIR)/xsetroot-xsetroot.Po"; else rm -f "$(DEPDIR)/xsetroot-xsetroot.Tpo"; exit 1; fi
|
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xsetroot.c' object='xsetroot-xsetroot.o' libtool=no @AMDEPBACKSLASH@
|
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
||||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsetroot_CFLAGS) $(CFLAGS) -c -o xsetroot-xsetroot.o `test -f 'xsetroot.c' || echo '$(srcdir)/'`xsetroot.c
|
|
||||||
|
|
||||||
xsetroot-xsetroot.obj: xsetroot.c
|
|
||||||
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsetroot_CFLAGS) $(CFLAGS) -MT xsetroot-xsetroot.obj -MD -MP -MF "$(DEPDIR)/xsetroot-xsetroot.Tpo" -c -o xsetroot-xsetroot.obj `if test -f 'xsetroot.c'; then $(CYGPATH_W) 'xsetroot.c'; else $(CYGPATH_W) '$(srcdir)/xsetroot.c'; fi`; \
|
|
||||||
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/xsetroot-xsetroot.Tpo" "$(DEPDIR)/xsetroot-xsetroot.Po"; else rm -f "$(DEPDIR)/xsetroot-xsetroot.Tpo"; exit 1; fi
|
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xsetroot.c' object='xsetroot-xsetroot.obj' libtool=no @AMDEPBACKSLASH@
|
|
||||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
|
||||||
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xsetroot_CFLAGS) $(CFLAGS) -c -o xsetroot-xsetroot.obj `if test -f 'xsetroot.c'; then $(CYGPATH_W) 'xsetroot.c'; else $(CYGPATH_W) '$(srcdir)/xsetroot.c'; fi`
|
|
||||||
uninstall-info-am:
|
uninstall-info-am:
|
||||||
install-appmanDATA: $(appman_DATA)
|
install-appmanDATA: $(appman_DATA)
|
||||||
@$(NORMAL_INSTALL)
|
@$(NORMAL_INSTALL)
|
||||||
|
@ -456,6 +444,9 @@ distdir: $(DISTFILES)
|
||||||
|| exit 1; \
|
|| exit 1; \
|
||||||
fi; \
|
fi; \
|
||||||
done
|
done
|
||||||
|
$(MAKE) $(AM_MAKEFLAGS) \
|
||||||
|
top_distdir="$(top_distdir)" distdir="$(distdir)" \
|
||||||
|
dist-hook
|
||||||
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
|
||||||
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
|
||||||
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
|
||||||
|
@ -585,6 +576,7 @@ distclean-generic:
|
||||||
maintainer-clean-generic:
|
maintainer-clean-generic:
|
||||||
@echo "This command is intended for maintainers to use"
|
@echo "This command is intended for maintainers to use"
|
||||||
@echo "it deletes files that may require special tools to rebuild."
|
@echo "it deletes files that may require special tools to rebuild."
|
||||||
|
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
|
||||||
clean: clean-am
|
clean: clean-am
|
||||||
|
|
||||||
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
|
clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
|
||||||
|
@ -640,8 +632,8 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||||
|
|
||||||
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
|
||||||
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
|
clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
|
||||||
dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
|
dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
|
||||||
distclean-compile distclean-generic distclean-hdr \
|
distclean distclean-compile distclean-generic distclean-hdr \
|
||||||
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
distclean-tags distcleancheck distdir distuninstallcheck dvi \
|
||||||
dvi-am html html-am info info-am install install-am \
|
dvi-am html html-am info info-am install install-am \
|
||||||
install-appmanDATA install-binPROGRAMS install-data \
|
install-appmanDATA install-binPROGRAMS install-data \
|
||||||
|
@ -654,8 +646,17 @@ uninstall-am: uninstall-appmanDATA uninstall-binPROGRAMS \
|
||||||
uninstall-info-am
|
uninstall-info-am
|
||||||
|
|
||||||
|
|
||||||
|
.PHONY: ChangeLog
|
||||||
|
|
||||||
|
ChangeLog:
|
||||||
|
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
|
||||||
|
|
||||||
|
dist-hook: ChangeLog
|
||||||
|
|
||||||
.man.$(APP_MAN_SUFFIX):
|
.man.$(APP_MAN_SUFFIX):
|
||||||
sed $(MAN_SUBSTS) < $< > $@
|
sed $(MAN_SUBSTS) < $< > $@
|
||||||
|
@LINT_TRUE@lint:
|
||||||
|
@LINT_TRUE@ $(LINT) $(ALL_LINT_FLAGS) $(xsetroot_SOURCES)
|
||||||
# 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:
|
||||||
|
|
|
@ -169,490 +169,6 @@ else
|
||||||
fi[]dnl
|
fi[]dnl
|
||||||
])# PKG_CHECK_MODULES
|
])# PKG_CHECK_MODULES
|
||||||
|
|
||||||
dnl
|
|
||||||
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
|
||||||
dnl
|
|
||||||
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
dnl copy of this software and associated documentation files (the
|
|
||||||
dnl "Software"), to deal in the Software without restriction, including
|
|
||||||
dnl without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
dnl distribute, and/or sell copies of the Software, and to permit persons
|
|
||||||
dnl to whom the Software is furnished to do so, provided that the above
|
|
||||||
dnl copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
dnl the Software and that both the above copyright notice(s) and this
|
|
||||||
dnl permission notice appear in supporting documentation.
|
|
||||||
dnl
|
|
||||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
|
||||||
dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
|
||||||
dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
|
|
||||||
dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
|
|
||||||
dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
|
||||||
dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
|
||||||
dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
dnl
|
|
||||||
dnl Except as contained in this notice, the name of a copyright holder
|
|
||||||
dnl shall not be used in advertising or otherwise to promote the sale, use
|
|
||||||
dnl or other dealings in this Software without prior written authorization
|
|
||||||
dnl of the copyright holder.
|
|
||||||
|
|
||||||
# XORG_MACROS_VERSION(required-version)
|
|
||||||
# -------------------------------------
|
|
||||||
# Minimum version: 1.1.0
|
|
||||||
#
|
|
||||||
# If you're using a macro added in Version 1.1 or newer, include this in
|
|
||||||
# your configure.ac with the minimum required version, such as:
|
|
||||||
# XORG_MACROS_VERSION(1.1)
|
|
||||||
#
|
|
||||||
# To force at least a version with this macro defined, also add:
|
|
||||||
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# See the "minimum version" comment for each macro you use to see what
|
|
||||||
# version you require.
|
|
||||||
AC_DEFUN([XORG_MACROS_VERSION],[
|
|
||||||
[XORG_MACROS_needed_version=$1
|
|
||||||
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
|
||||||
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
|
||||||
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
|
||||||
[XORG_MACROS_version=1.1.5
|
|
||||||
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
|
||||||
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
|
||||||
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
|
||||||
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
|
|
||||||
fi
|
|
||||||
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
|
|
||||||
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([yes, $XORG_MACROS_version])
|
|
||||||
]) # XORG_MACROS_VERSION
|
|
||||||
|
|
||||||
# XORG_PROG_RAWCPP()
|
|
||||||
# ------------------
|
|
||||||
# Minimum version: 1.0.0
|
|
||||||
#
|
|
||||||
# Find cpp program and necessary flags for use in pre-processing text files
|
|
||||||
# such as man pages and config files
|
|
||||||
AC_DEFUN([XORG_PROG_RAWCPP],[
|
|
||||||
AC_REQUIRE([AC_PROG_CPP])
|
|
||||||
AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
|
|
||||||
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
|
|
||||||
|
|
||||||
# Check for flag to avoid builtin definitions - assumes unix is predefined,
|
|
||||||
# which is not the best choice for supporting other OS'es, but covers most
|
|
||||||
# of the ones we need for now.
|
|
||||||
AC_MSG_CHECKING([if $RAWCPP requires -undef])
|
|
||||||
AC_LANG_CONFTEST([Does cpp redefine unix ?])
|
|
||||||
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
else
|
|
||||||
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
|
||||||
RAWCPPFLAGS=-undef
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
else
|
|
||||||
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
rm -f conftest.$ac_ext
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([if $RAWCPP requires -traditional])
|
|
||||||
AC_LANG_CONFTEST([Does cpp preserve "whitespace"?])
|
|
||||||
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
else
|
|
||||||
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
|
||||||
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
else
|
|
||||||
AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
rm -f conftest.$ac_ext
|
|
||||||
AC_SUBST(RAWCPPFLAGS)
|
|
||||||
]) # XORG_PROG_RAWCPP
|
|
||||||
|
|
||||||
# XORG_MANPAGE_SECTIONS()
|
|
||||||
# -----------------------
|
|
||||||
# Minimum version: 1.0.0
|
|
||||||
#
|
|
||||||
# Determine which sections man pages go in for the different man page types
|
|
||||||
# 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.
|
|
||||||
# Override default settings by setting environment variables
|
|
||||||
|
|
||||||
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
|
||||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
|
||||||
|
|
||||||
if test x$APP_MAN_SUFFIX = x ; then
|
|
||||||
APP_MAN_SUFFIX=1
|
|
||||||
fi
|
|
||||||
if test x$APP_MAN_DIR = x ; then
|
|
||||||
APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$LIB_MAN_SUFFIX = x ; then
|
|
||||||
LIB_MAN_SUFFIX=3
|
|
||||||
fi
|
|
||||||
if test x$LIB_MAN_DIR = x ; then
|
|
||||||
LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$FILE_MAN_SUFFIX = x ; then
|
|
||||||
case $host_os in
|
|
||||||
solaris*) FILE_MAN_SUFFIX=4 ;;
|
|
||||||
*) FILE_MAN_SUFFIX=5 ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
if test x$FILE_MAN_DIR = x ; then
|
|
||||||
FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$MISC_MAN_SUFFIX = x ; then
|
|
||||||
case $host_os in
|
|
||||||
solaris*) MISC_MAN_SUFFIX=5 ;;
|
|
||||||
*) MISC_MAN_SUFFIX=7 ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
if test x$MISC_MAN_DIR = x ; then
|
|
||||||
MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$DRIVER_MAN_SUFFIX = x ; then
|
|
||||||
case $host_os in
|
|
||||||
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
|
||||||
*) DRIVER_MAN_SUFFIX=4 ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
if test x$DRIVER_MAN_DIR = x ; then
|
|
||||||
DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$ADMIN_MAN_SUFFIX = x ; then
|
|
||||||
case $host_os in
|
|
||||||
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
|
||||||
*) ADMIN_MAN_SUFFIX=8 ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
if test x$ADMIN_MAN_DIR = x ; then
|
|
||||||
ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
AC_SUBST([APP_MAN_SUFFIX])
|
|
||||||
AC_SUBST([LIB_MAN_SUFFIX])
|
|
||||||
AC_SUBST([FILE_MAN_SUFFIX])
|
|
||||||
AC_SUBST([MISC_MAN_SUFFIX])
|
|
||||||
AC_SUBST([DRIVER_MAN_SUFFIX])
|
|
||||||
AC_SUBST([ADMIN_MAN_SUFFIX])
|
|
||||||
AC_SUBST([APP_MAN_DIR])
|
|
||||||
AC_SUBST([LIB_MAN_DIR])
|
|
||||||
AC_SUBST([FILE_MAN_DIR])
|
|
||||||
AC_SUBST([MISC_MAN_DIR])
|
|
||||||
AC_SUBST([DRIVER_MAN_DIR])
|
|
||||||
AC_SUBST([ADMIN_MAN_DIR])
|
|
||||||
]) # XORG_MANPAGE_SECTIONS
|
|
||||||
|
|
||||||
# XORG_CHECK_LINUXDOC
|
|
||||||
# -------------------
|
|
||||||
# Minimum version: 1.0.0
|
|
||||||
#
|
|
||||||
# Defines the variable MAKE_TEXT if the necessary tools and
|
|
||||||
# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
|
|
||||||
# Whether or not the necessary tools and files are found can be checked
|
|
||||||
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
|
||||||
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
|
||||||
XORG_SGML_PATH=$prefix/share/sgml
|
|
||||||
HAVE_DEFS_ENT=
|
|
||||||
|
|
||||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
|
||||||
|
|
||||||
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
|
||||||
AC_PATH_PROG(PS2PDF, ps2pdf)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([Whether to build documentation])
|
|
||||||
|
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
|
|
||||||
BUILDDOC=yes
|
|
||||||
else
|
|
||||||
BUILDDOC=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
|
|
||||||
|
|
||||||
AC_MSG_RESULT([$BUILDDOC])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([Whether to build pdf documentation])
|
|
||||||
|
|
||||||
if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
|
|
||||||
BUILDPDFDOC=yes
|
|
||||||
else
|
|
||||||
BUILDPDFDOC=no
|
|
||||||
fi
|
|
||||||
|
|
||||||
AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
|
|
||||||
|
|
||||||
AC_MSG_RESULT([$BUILDPDFDOC])
|
|
||||||
|
|
||||||
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
|
|
||||||
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
|
|
||||||
MAKE_PDF="$PS2PDF"
|
|
||||||
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
|
|
||||||
|
|
||||||
AC_SUBST(MAKE_TEXT)
|
|
||||||
AC_SUBST(MAKE_PS)
|
|
||||||
AC_SUBST(MAKE_PDF)
|
|
||||||
AC_SUBST(MAKE_HTML)
|
|
||||||
]) # XORG_CHECK_LINUXDOC
|
|
||||||
|
|
||||||
# XORG_CHECK_DOCBOOK
|
|
||||||
# -------------------
|
|
||||||
# Minimum version: 1.0.0
|
|
||||||
#
|
|
||||||
# Checks for the ability to build output formats from SGML DocBook source.
|
|
||||||
# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
|
|
||||||
# indicates whether the necessary tools and files are found and, if set,
|
|
||||||
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
|
||||||
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
|
||||||
XORG_SGML_PATH=$prefix/share/sgml
|
|
||||||
HAVE_DEFS_ENT=
|
|
||||||
BUILDTXTDOC=no
|
|
||||||
BUILDPDFDOC=no
|
|
||||||
BUILDPSDOC=no
|
|
||||||
BUILDHTMLDOC=no
|
|
||||||
|
|
||||||
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
|
||||||
|
|
||||||
AC_PATH_PROG(DOCBOOKPS, docbook2ps)
|
|
||||||
AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
|
|
||||||
AC_PATH_PROG(DOCBOOKHTML, docbook2html)
|
|
||||||
AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([Whether to build text documentation])
|
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
|
|
||||||
test x$BUILD_TXTDOC != xno; then
|
|
||||||
BUILDTXTDOC=yes
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
|
|
||||||
AC_MSG_RESULT([$BUILDTXTDOC])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([Whether to build PDF documentation])
|
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
|
|
||||||
test x$BUILD_PDFDOC != xno; then
|
|
||||||
BUILDPDFDOC=yes
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
|
|
||||||
AC_MSG_RESULT([$BUILDPDFDOC])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([Whether to build PostScript documentation])
|
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
|
|
||||||
test x$BUILD_PSDOC != xno; then
|
|
||||||
BUILDPSDOC=yes
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
|
|
||||||
AC_MSG_RESULT([$BUILDPSDOC])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([Whether to build HTML documentation])
|
|
||||||
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
|
|
||||||
test x$BUILD_HTMLDOC != xno; then
|
|
||||||
BUILDHTMLDOC=yes
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
|
|
||||||
AC_MSG_RESULT([$BUILDHTMLDOC])
|
|
||||||
|
|
||||||
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
|
|
||||||
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
|
|
||||||
MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
|
|
||||||
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
|
|
||||||
|
|
||||||
AC_SUBST(MAKE_TEXT)
|
|
||||||
AC_SUBST(MAKE_PS)
|
|
||||||
AC_SUBST(MAKE_PDF)
|
|
||||||
AC_SUBST(MAKE_HTML)
|
|
||||||
]) # XORG_CHECK_DOCBOOK
|
|
||||||
|
|
||||||
# XORG_CHECK_MALLOC_ZERO
|
|
||||||
# ----------------------
|
|
||||||
# Minimum version: 1.0.0
|
|
||||||
#
|
|
||||||
# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
|
|
||||||
# malloc(0) returns NULL. Packages should add one of these cflags to
|
|
||||||
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
|
|
||||||
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
|
|
||||||
AC_ARG_ENABLE(malloc0returnsnull,
|
|
||||||
AC_HELP_STRING([--enable-malloc0returnsnull],
|
|
||||||
[malloc(0) returns NULL (default: auto)]),
|
|
||||||
[MALLOC_ZERO_RETURNS_NULL=$enableval],
|
|
||||||
[MALLOC_ZERO_RETURNS_NULL=auto])
|
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether malloc(0) returns NULL])
|
|
||||||
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
|
||||||
AC_RUN_IFELSE([
|
|
||||||
char *malloc();
|
|
||||||
char *realloc();
|
|
||||||
char *calloc();
|
|
||||||
main() {
|
|
||||||
char *m0, *r0, *c0, *p;
|
|
||||||
m0 = malloc(0);
|
|
||||||
p = malloc(10);
|
|
||||||
r0 = realloc(p,0);
|
|
||||||
c0 = calloc(0);
|
|
||||||
exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
|
|
||||||
}],
|
|
||||||
[MALLOC_ZERO_RETURNS_NULL=yes],
|
|
||||||
[MALLOC_ZERO_RETURNS_NULL=no])
|
|
||||||
fi
|
|
||||||
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
|
|
||||||
|
|
||||||
if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
|
|
||||||
MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
|
|
||||||
XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS
|
|
||||||
XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC"
|
|
||||||
else
|
|
||||||
MALLOC_ZERO_CFLAGS=""
|
|
||||||
XMALLOC_ZERO_CFLAGS=""
|
|
||||||
XTMALLOC_ZERO_CFLAGS=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_SUBST([MALLOC_ZERO_CFLAGS])
|
|
||||||
AC_SUBST([XMALLOC_ZERO_CFLAGS])
|
|
||||||
AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
|
||||||
]) # XORG_CHECK_MALLOC_ZERO
|
|
||||||
|
|
||||||
# XORG_WITH_LINT()
|
|
||||||
# ----------------
|
|
||||||
# Minimum version: 1.1.0
|
|
||||||
#
|
|
||||||
# Sets up flags for source checkers such as lint and sparse if --with-lint
|
|
||||||
# is specified. (Use --with-lint=sparse for sparse.)
|
|
||||||
# Sets $LINT to name of source checker passed with --with-lint (default: lint)
|
|
||||||
# Sets $LINT_FLAGS to flags to pass to source checker
|
|
||||||
# Sets LINT automake conditional if enabled (default: disabled)
|
|
||||||
#
|
|
||||||
AC_DEFUN([XORG_WITH_LINT],[
|
|
||||||
|
|
||||||
# Allow checking code with lint, sparse, etc.
|
|
||||||
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
|
|
||||||
[Use a lint-style source code checker (default: disabled)])],
|
|
||||||
[use_lint=$withval], [use_lint=no])
|
|
||||||
if test "x$use_lint" = "xyes" ; then
|
|
||||||
LINT="lint"
|
|
||||||
else
|
|
||||||
LINT="$use_lint"
|
|
||||||
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
|
|
||||||
|
|
||||||
AC_SUBST(LINT)
|
|
||||||
AC_SUBST(LINT_FLAGS)
|
|
||||||
AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
|
||||||
|
|
||||||
]) # XORG_WITH_LINT
|
|
||||||
|
|
||||||
# XORG_LINT_LIBRARY(LIBNAME)
|
|
||||||
# --------------------------
|
|
||||||
# Minimum version: 1.1.0
|
|
||||||
#
|
|
||||||
# Sets up flags for building lint libraries for checking programs that call
|
|
||||||
# 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
|
|
||||||
#
|
|
||||||
|
|
||||||
AC_DEFUN([XORG_LINT_LIBRARY],[
|
|
||||||
AC_REQUIRE([XORG_WITH_LINT])
|
|
||||||
# Build lint "library" for more indepth checks of programs calling this library
|
|
||||||
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
|
|
||||||
[Create lint library (default: disabled)])],
|
|
||||||
[make_lint_lib=$enableval], [make_lint_lib=no])
|
|
||||||
if test "x$make_lint_lib" != "xno" ; then
|
|
||||||
if test "x$LINT" = "xno" ; then
|
|
||||||
AC_MSG_ERROR([Cannot make lint library without --with-lint])
|
|
||||||
fi
|
|
||||||
if test "x$make_lint_lib" = "xyes" ; then
|
|
||||||
LINTLIB=llib-l$1.ln
|
|
||||||
else
|
|
||||||
LINTLIB=$make_lint_lib
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
AC_SUBST(LINTLIB)
|
|
||||||
AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
|
||||||
|
|
||||||
]) # XORG_LINT_LIBRARY
|
|
||||||
|
|
||||||
dnl Copyright 2005 Red Hat, Inc
|
|
||||||
dnl
|
|
||||||
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
|
||||||
dnl documentation for any purpose is hereby granted without fee, provided that
|
|
||||||
dnl the above copyright notice appear in all copies and that both that
|
|
||||||
dnl copyright notice and this permission notice appear in supporting
|
|
||||||
dnl documentation.
|
|
||||||
dnl
|
|
||||||
dnl The above copyright notice and this permission notice shall be included
|
|
||||||
dnl in all copies or substantial portions of the Software.
|
|
||||||
dnl
|
|
||||||
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
||||||
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
|
||||||
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
|
||||||
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
||||||
dnl OTHER DEALINGS IN THE SOFTWARE.
|
|
||||||
dnl
|
|
||||||
dnl Except as contained in this notice, the name of the copyright holders shall
|
|
||||||
dnl not be used in advertising or otherwise to promote the sale, use or
|
|
||||||
dnl other dealings in this Software without prior written authorization
|
|
||||||
dnl from the copyright holders.
|
|
||||||
dnl
|
|
||||||
|
|
||||||
# XORG_RELEASE_VERSION
|
|
||||||
# --------------------
|
|
||||||
# Adds --with/without-release-string and changes the PACKAGE and
|
|
||||||
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
|
||||||
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
|
||||||
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
|
||||||
|
|
||||||
AC_DEFUN([XORG_RELEASE_VERSION],[
|
|
||||||
AC_ARG_WITH(release-version,
|
|
||||||
AC_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],
|
|
||||||
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
|
||||||
[Major version of this package])
|
|
||||||
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
|
||||||
if test "x$PVM" = "x"; then
|
|
||||||
PVM="0"
|
|
||||||
fi
|
|
||||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
|
||||||
[$PVM],
|
|
||||||
[Minor version of this package])
|
|
||||||
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
|
||||||
if test "x$PVP" = "x"; then
|
|
||||||
PVP="0"
|
|
||||||
fi
|
|
||||||
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
|
|
||||||
[$PVP],
|
|
||||||
[Patch version of this package])
|
|
||||||
])
|
|
||||||
|
|
||||||
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
|
||||||
#
|
#
|
||||||
# This file is free software; the Free Software Foundation
|
# This file is free software; the Free Software Foundation
|
||||||
|
@ -1317,7 +833,7 @@ else
|
||||||
if test -f "$ac_aux_dir/mkinstalldirs"; then
|
if test -f "$ac_aux_dir/mkinstalldirs"; then
|
||||||
mkdir_p='$(mkinstalldirs)'
|
mkdir_p='$(mkinstalldirs)'
|
||||||
else
|
else
|
||||||
mkdir_p='$(install_sh) -d'
|
mkdir_p='$(SHELL) $(install_sh) -d'
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AC_SUBST([mkdir_p])])
|
AC_SUBST([mkdir_p])])
|
||||||
|
@ -1531,3 +1047,487 @@ AC_SUBST([am__tar])
|
||||||
AC_SUBST([am__untar])
|
AC_SUBST([am__untar])
|
||||||
]) # _AM_PROG_TAR
|
]) # _AM_PROG_TAR
|
||||||
|
|
||||||
|
dnl
|
||||||
|
dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
|
||||||
|
dnl
|
||||||
|
dnl Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
dnl copy of this software and associated documentation files (the
|
||||||
|
dnl "Software"), to deal in the Software without restriction, including
|
||||||
|
dnl without limitation the rights to use, copy, modify, merge, publish,
|
||||||
|
dnl distribute, and/or sell copies of the Software, and to permit persons
|
||||||
|
dnl to whom the Software is furnished to do so, provided that the above
|
||||||
|
dnl copyright notice(s) and this permission notice appear in all copies of
|
||||||
|
dnl the Software and that both the above copyright notice(s) and this
|
||||||
|
dnl permission notice appear in supporting documentation.
|
||||||
|
dnl
|
||||||
|
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
|
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||||
|
dnl OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
|
||||||
|
dnl HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
|
||||||
|
dnl INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
|
||||||
|
dnl FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
|
||||||
|
dnl NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
|
||||||
|
dnl WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
dnl
|
||||||
|
dnl Except as contained in this notice, the name of a copyright holder
|
||||||
|
dnl shall not be used in advertising or otherwise to promote the sale, use
|
||||||
|
dnl or other dealings in this Software without prior written authorization
|
||||||
|
dnl of the copyright holder.
|
||||||
|
|
||||||
|
# XORG_MACROS_VERSION(required-version)
|
||||||
|
# -------------------------------------
|
||||||
|
# Minimum version: 1.1.0
|
||||||
|
#
|
||||||
|
# If you're using a macro added in Version 1.1 or newer, include this in
|
||||||
|
# your configure.ac with the minimum required version, such as:
|
||||||
|
# XORG_MACROS_VERSION(1.1)
|
||||||
|
#
|
||||||
|
# To force at least a version with this macro defined, also add:
|
||||||
|
# m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# See the "minimum version" comment for each macro you use to see what
|
||||||
|
# version you require.
|
||||||
|
AC_DEFUN([XORG_MACROS_VERSION],[
|
||||||
|
[XORG_MACROS_needed_version=$1
|
||||||
|
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
|
||||||
|
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||||
|
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
|
||||||
|
[XORG_MACROS_version=1.1.5
|
||||||
|
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
|
||||||
|
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
|
||||||
|
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
|
||||||
|
AC_MSG_ERROR([configure built with incompatible version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.x])
|
||||||
|
fi
|
||||||
|
if test $XORG_MACROS_minor -lt $XORG_MACROS_needed_minor ; then
|
||||||
|
AC_MSG_ERROR([configure built with too old of a version of xorg-macros.m4 - requires version ${XORG_MACROS_major}.${XORG_MACROS_minor}.0 or newer])
|
||||||
|
fi
|
||||||
|
AC_MSG_RESULT([yes, $XORG_MACROS_version])
|
||||||
|
]) # XORG_MACROS_VERSION
|
||||||
|
|
||||||
|
# XORG_PROG_RAWCPP()
|
||||||
|
# ------------------
|
||||||
|
# Minimum version: 1.0.0
|
||||||
|
#
|
||||||
|
# Find cpp program and necessary flags for use in pre-processing text files
|
||||||
|
# such as man pages and config files
|
||||||
|
AC_DEFUN([XORG_PROG_RAWCPP],[
|
||||||
|
AC_REQUIRE([AC_PROG_CPP])
|
||||||
|
AC_PATH_PROGS(RAWCPP, [cpp], [${CPP}],
|
||||||
|
[$PATH:/bin:/usr/bin:/usr/lib:/usr/libexec:/usr/ccs/lib:/usr/ccs/lbin:/lib])
|
||||||
|
|
||||||
|
# Check for flag to avoid builtin definitions - assumes unix is predefined,
|
||||||
|
# which is not the best choice for supporting other OS'es, but covers most
|
||||||
|
# of the ones we need for now.
|
||||||
|
AC_MSG_CHECKING([if $RAWCPP requires -undef])
|
||||||
|
AC_LANG_CONFTEST([Does cpp redefine unix ?])
|
||||||
|
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
else
|
||||||
|
if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
||||||
|
RAWCPPFLAGS=-undef
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
rm -f conftest.$ac_ext
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([if $RAWCPP requires -traditional])
|
||||||
|
AC_LANG_CONFTEST([Does cpp preserve "whitespace"?])
|
||||||
|
if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
else
|
||||||
|
if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
||||||
|
RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
else
|
||||||
|
AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.])
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
rm -f conftest.$ac_ext
|
||||||
|
AC_SUBST(RAWCPPFLAGS)
|
||||||
|
]) # XORG_PROG_RAWCPP
|
||||||
|
|
||||||
|
# XORG_MANPAGE_SECTIONS()
|
||||||
|
# -----------------------
|
||||||
|
# Minimum version: 1.0.0
|
||||||
|
#
|
||||||
|
# Determine which sections man pages go in for the different man page types
|
||||||
|
# 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.
|
||||||
|
# Override default settings by setting environment variables
|
||||||
|
|
||||||
|
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||||
|
|
||||||
|
if test x$APP_MAN_SUFFIX = x ; then
|
||||||
|
APP_MAN_SUFFIX=1
|
||||||
|
fi
|
||||||
|
if test x$APP_MAN_DIR = x ; then
|
||||||
|
APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$LIB_MAN_SUFFIX = x ; then
|
||||||
|
LIB_MAN_SUFFIX=3
|
||||||
|
fi
|
||||||
|
if test x$LIB_MAN_DIR = x ; then
|
||||||
|
LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$FILE_MAN_SUFFIX = x ; then
|
||||||
|
case $host_os in
|
||||||
|
solaris*) FILE_MAN_SUFFIX=4 ;;
|
||||||
|
*) FILE_MAN_SUFFIX=5 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
if test x$FILE_MAN_DIR = x ; then
|
||||||
|
FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$MISC_MAN_SUFFIX = x ; then
|
||||||
|
case $host_os in
|
||||||
|
solaris*) MISC_MAN_SUFFIX=5 ;;
|
||||||
|
*) MISC_MAN_SUFFIX=7 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
if test x$MISC_MAN_DIR = x ; then
|
||||||
|
MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$DRIVER_MAN_SUFFIX = x ; then
|
||||||
|
case $host_os in
|
||||||
|
solaris*) DRIVER_MAN_SUFFIX=7 ;;
|
||||||
|
*) DRIVER_MAN_SUFFIX=4 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
if test x$DRIVER_MAN_DIR = x ; then
|
||||||
|
DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)'
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test x$ADMIN_MAN_SUFFIX = x ; then
|
||||||
|
case $host_os in
|
||||||
|
solaris*) ADMIN_MAN_SUFFIX=1m ;;
|
||||||
|
*) ADMIN_MAN_SUFFIX=8 ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
if test x$ADMIN_MAN_DIR = x ; then
|
||||||
|
ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
AC_SUBST([APP_MAN_SUFFIX])
|
||||||
|
AC_SUBST([LIB_MAN_SUFFIX])
|
||||||
|
AC_SUBST([FILE_MAN_SUFFIX])
|
||||||
|
AC_SUBST([MISC_MAN_SUFFIX])
|
||||||
|
AC_SUBST([DRIVER_MAN_SUFFIX])
|
||||||
|
AC_SUBST([ADMIN_MAN_SUFFIX])
|
||||||
|
AC_SUBST([APP_MAN_DIR])
|
||||||
|
AC_SUBST([LIB_MAN_DIR])
|
||||||
|
AC_SUBST([FILE_MAN_DIR])
|
||||||
|
AC_SUBST([MISC_MAN_DIR])
|
||||||
|
AC_SUBST([DRIVER_MAN_DIR])
|
||||||
|
AC_SUBST([ADMIN_MAN_DIR])
|
||||||
|
]) # XORG_MANPAGE_SECTIONS
|
||||||
|
|
||||||
|
# XORG_CHECK_LINUXDOC
|
||||||
|
# -------------------
|
||||||
|
# Minimum version: 1.0.0
|
||||||
|
#
|
||||||
|
# Defines the variable MAKE_TEXT if the necessary tools and
|
||||||
|
# files are found. $(MAKE_TEXT) blah.sgml will then produce blah.txt.
|
||||||
|
# Whether or not the necessary tools and files are found can be checked
|
||||||
|
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
|
||||||
|
AC_DEFUN([XORG_CHECK_LINUXDOC],[
|
||||||
|
XORG_SGML_PATH=$prefix/share/sgml
|
||||||
|
HAVE_DEFS_ENT=
|
||||||
|
|
||||||
|
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||||
|
|
||||||
|
AC_PATH_PROG(LINUXDOC, linuxdoc)
|
||||||
|
AC_PATH_PROG(PS2PDF, ps2pdf)
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([Whether to build documentation])
|
||||||
|
|
||||||
|
if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
|
||||||
|
BUILDDOC=yes
|
||||||
|
else
|
||||||
|
BUILDDOC=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
|
||||||
|
|
||||||
|
AC_MSG_RESULT([$BUILDDOC])
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([Whether to build pdf documentation])
|
||||||
|
|
||||||
|
if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
|
||||||
|
BUILDPDFDOC=yes
|
||||||
|
else
|
||||||
|
BUILDPDFDOC=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
|
||||||
|
|
||||||
|
AC_MSG_RESULT([$BUILDPDFDOC])
|
||||||
|
|
||||||
|
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
|
||||||
|
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
|
||||||
|
MAKE_PDF="$PS2PDF"
|
||||||
|
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
|
||||||
|
|
||||||
|
AC_SUBST(MAKE_TEXT)
|
||||||
|
AC_SUBST(MAKE_PS)
|
||||||
|
AC_SUBST(MAKE_PDF)
|
||||||
|
AC_SUBST(MAKE_HTML)
|
||||||
|
]) # XORG_CHECK_LINUXDOC
|
||||||
|
|
||||||
|
# XORG_CHECK_DOCBOOK
|
||||||
|
# -------------------
|
||||||
|
# Minimum version: 1.0.0
|
||||||
|
#
|
||||||
|
# Checks for the ability to build output formats from SGML DocBook source.
|
||||||
|
# For XXX in {TXT, PDF, PS, HTML}, the AM_CONDITIONAL "BUILD_XXXDOC"
|
||||||
|
# indicates whether the necessary tools and files are found and, if set,
|
||||||
|
# $(MAKE_XXX) blah.sgml will produce blah.xxx.
|
||||||
|
AC_DEFUN([XORG_CHECK_DOCBOOK],[
|
||||||
|
XORG_SGML_PATH=$prefix/share/sgml
|
||||||
|
HAVE_DEFS_ENT=
|
||||||
|
BUILDTXTDOC=no
|
||||||
|
BUILDPDFDOC=no
|
||||||
|
BUILDPSDOC=no
|
||||||
|
BUILDHTMLDOC=no
|
||||||
|
|
||||||
|
AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
|
||||||
|
|
||||||
|
AC_PATH_PROG(DOCBOOKPS, docbook2ps)
|
||||||
|
AC_PATH_PROG(DOCBOOKPDF, docbook2pdf)
|
||||||
|
AC_PATH_PROG(DOCBOOKHTML, docbook2html)
|
||||||
|
AC_PATH_PROG(DOCBOOKTXT, docbook2txt)
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([Whether to build text documentation])
|
||||||
|
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x &&
|
||||||
|
test x$BUILD_TXTDOC != xno; then
|
||||||
|
BUILDTXTDOC=yes
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes])
|
||||||
|
AC_MSG_RESULT([$BUILDTXTDOC])
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([Whether to build PDF documentation])
|
||||||
|
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x &&
|
||||||
|
test x$BUILD_PDFDOC != xno; then
|
||||||
|
BUILDPDFDOC=yes
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
|
||||||
|
AC_MSG_RESULT([$BUILDPDFDOC])
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([Whether to build PostScript documentation])
|
||||||
|
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x &&
|
||||||
|
test x$BUILD_PSDOC != xno; then
|
||||||
|
BUILDPSDOC=yes
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes])
|
||||||
|
AC_MSG_RESULT([$BUILDPSDOC])
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([Whether to build HTML documentation])
|
||||||
|
if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x &&
|
||||||
|
test x$BUILD_HTMLDOC != xno; then
|
||||||
|
BUILDHTMLDOC=yes
|
||||||
|
fi
|
||||||
|
AM_CONDITIONAL(BUILD_HTMLDOC, [test x$BUILDHTMLDOC = xyes])
|
||||||
|
AC_MSG_RESULT([$BUILDHTMLDOC])
|
||||||
|
|
||||||
|
MAKE_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKTXT"
|
||||||
|
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPS"
|
||||||
|
MAKE_PDF="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKPDF"
|
||||||
|
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $DOCBOOKHTML"
|
||||||
|
|
||||||
|
AC_SUBST(MAKE_TEXT)
|
||||||
|
AC_SUBST(MAKE_PS)
|
||||||
|
AC_SUBST(MAKE_PDF)
|
||||||
|
AC_SUBST(MAKE_HTML)
|
||||||
|
]) # XORG_CHECK_DOCBOOK
|
||||||
|
|
||||||
|
# XORG_CHECK_MALLOC_ZERO
|
||||||
|
# ----------------------
|
||||||
|
# Minimum version: 1.0.0
|
||||||
|
#
|
||||||
|
# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
|
||||||
|
# malloc(0) returns NULL. Packages should add one of these cflags to
|
||||||
|
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
|
||||||
|
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
|
||||||
|
AC_ARG_ENABLE(malloc0returnsnull,
|
||||||
|
AC_HELP_STRING([--enable-malloc0returnsnull],
|
||||||
|
[malloc(0) returns NULL (default: auto)]),
|
||||||
|
[MALLOC_ZERO_RETURNS_NULL=$enableval],
|
||||||
|
[MALLOC_ZERO_RETURNS_NULL=auto])
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([whether malloc(0) returns NULL])
|
||||||
|
if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
|
||||||
|
AC_RUN_IFELSE([
|
||||||
|
char *malloc();
|
||||||
|
char *realloc();
|
||||||
|
char *calloc();
|
||||||
|
main() {
|
||||||
|
char *m0, *r0, *c0, *p;
|
||||||
|
m0 = malloc(0);
|
||||||
|
p = malloc(10);
|
||||||
|
r0 = realloc(p,0);
|
||||||
|
c0 = calloc(0);
|
||||||
|
exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
|
||||||
|
}],
|
||||||
|
[MALLOC_ZERO_RETURNS_NULL=yes],
|
||||||
|
[MALLOC_ZERO_RETURNS_NULL=no])
|
||||||
|
fi
|
||||||
|
AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
|
||||||
|
|
||||||
|
if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
|
||||||
|
MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
|
||||||
|
XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS
|
||||||
|
XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC"
|
||||||
|
else
|
||||||
|
MALLOC_ZERO_CFLAGS=""
|
||||||
|
XMALLOC_ZERO_CFLAGS=""
|
||||||
|
XTMALLOC_ZERO_CFLAGS=""
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST([MALLOC_ZERO_CFLAGS])
|
||||||
|
AC_SUBST([XMALLOC_ZERO_CFLAGS])
|
||||||
|
AC_SUBST([XTMALLOC_ZERO_CFLAGS])
|
||||||
|
]) # XORG_CHECK_MALLOC_ZERO
|
||||||
|
|
||||||
|
# XORG_WITH_LINT()
|
||||||
|
# ----------------
|
||||||
|
# Minimum version: 1.1.0
|
||||||
|
#
|
||||||
|
# Sets up flags for source checkers such as lint and sparse if --with-lint
|
||||||
|
# is specified. (Use --with-lint=sparse for sparse.)
|
||||||
|
# Sets $LINT to name of source checker passed with --with-lint (default: lint)
|
||||||
|
# Sets $LINT_FLAGS to flags to pass to source checker
|
||||||
|
# Sets LINT automake conditional if enabled (default: disabled)
|
||||||
|
#
|
||||||
|
AC_DEFUN([XORG_WITH_LINT],[
|
||||||
|
|
||||||
|
# Allow checking code with lint, sparse, etc.
|
||||||
|
AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
|
||||||
|
[Use a lint-style source code checker (default: disabled)])],
|
||||||
|
[use_lint=$withval], [use_lint=no])
|
||||||
|
if test "x$use_lint" = "xyes" ; then
|
||||||
|
LINT="lint"
|
||||||
|
else
|
||||||
|
LINT="$use_lint"
|
||||||
|
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
|
||||||
|
|
||||||
|
AC_SUBST(LINT)
|
||||||
|
AC_SUBST(LINT_FLAGS)
|
||||||
|
AM_CONDITIONAL(LINT, [test x$LINT != xno])
|
||||||
|
|
||||||
|
]) # XORG_WITH_LINT
|
||||||
|
|
||||||
|
# XORG_LINT_LIBRARY(LIBNAME)
|
||||||
|
# --------------------------
|
||||||
|
# Minimum version: 1.1.0
|
||||||
|
#
|
||||||
|
# Sets up flags for building lint libraries for checking programs that call
|
||||||
|
# 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
|
||||||
|
#
|
||||||
|
|
||||||
|
AC_DEFUN([XORG_LINT_LIBRARY],[
|
||||||
|
AC_REQUIRE([XORG_WITH_LINT])
|
||||||
|
# Build lint "library" for more indepth checks of programs calling this library
|
||||||
|
AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
|
||||||
|
[Create lint library (default: disabled)])],
|
||||||
|
[make_lint_lib=$enableval], [make_lint_lib=no])
|
||||||
|
if test "x$make_lint_lib" != "xno" ; then
|
||||||
|
if test "x$LINT" = "xno" ; then
|
||||||
|
AC_MSG_ERROR([Cannot make lint library without --with-lint])
|
||||||
|
fi
|
||||||
|
if test "x$make_lint_lib" = "xyes" ; then
|
||||||
|
LINTLIB=llib-l$1.ln
|
||||||
|
else
|
||||||
|
LINTLIB=$make_lint_lib
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AC_SUBST(LINTLIB)
|
||||||
|
AM_CONDITIONAL(MAKE_LINT_LIB, [test x$make_lint_lib != xno])
|
||||||
|
|
||||||
|
]) # XORG_LINT_LIBRARY
|
||||||
|
|
||||||
|
dnl Copyright 2005 Red Hat, Inc
|
||||||
|
dnl
|
||||||
|
dnl Permission to use, copy, modify, distribute, and sell this software and its
|
||||||
|
dnl documentation for any purpose is hereby granted without fee, provided that
|
||||||
|
dnl the above copyright notice appear in all copies and that both that
|
||||||
|
dnl copyright notice and this permission notice appear in supporting
|
||||||
|
dnl documentation.
|
||||||
|
dnl
|
||||||
|
dnl The above copyright notice and this permission notice shall be included
|
||||||
|
dnl in all copies or substantial portions of the Software.
|
||||||
|
dnl
|
||||||
|
dnl THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
|
dnl OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
|
dnl MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
||||||
|
dnl IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
|
||||||
|
dnl OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
|
||||||
|
dnl ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
dnl OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
dnl
|
||||||
|
dnl Except as contained in this notice, the name of the copyright holders shall
|
||||||
|
dnl not be used in advertising or otherwise to promote the sale, use or
|
||||||
|
dnl other dealings in this Software without prior written authorization
|
||||||
|
dnl from the copyright holders.
|
||||||
|
dnl
|
||||||
|
|
||||||
|
# XORG_RELEASE_VERSION
|
||||||
|
# --------------------
|
||||||
|
# Adds --with/without-release-string and changes the PACKAGE and
|
||||||
|
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
|
||||||
|
# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
|
||||||
|
# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
|
||||||
|
|
||||||
|
AC_DEFUN([XORG_RELEASE_VERSION],[
|
||||||
|
AC_ARG_WITH(release-version,
|
||||||
|
AC_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],
|
||||||
|
[`echo $PACKAGE_VERSION | cut -d . -f 1`],
|
||||||
|
[Major version of this package])
|
||||||
|
PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
|
||||||
|
if test "x$PVM" = "x"; then
|
||||||
|
PVM="0"
|
||||||
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
|
||||||
|
[$PVM],
|
||||||
|
[Minor version of this package])
|
||||||
|
PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
|
||||||
|
if test "x$PVP" = "x"; then
|
||||||
|
PVP="0"
|
||||||
|
fi
|
||||||
|
AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
|
||||||
|
[$PVP],
|
||||||
|
[Patch version of this package])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
#! /bin/sh
|
||||||
|
|
||||||
|
srcdir=`dirname $0`
|
||||||
|
test -z "$srcdir" && srcdir=.
|
||||||
|
|
||||||
|
ORIGDIR=`pwd`
|
||||||
|
cd $srcdir
|
||||||
|
|
||||||
|
autoreconf -v --install || exit 1
|
||||||
|
cd $ORIGDIR || exit $?
|
||||||
|
|
||||||
|
$srcdir/configure --enable-maintainer-mode "$@"
|
||||||
|
|
142
xsetroot/compile
142
xsetroot/compile
|
@ -1,142 +0,0 @@
|
||||||
#! /bin/sh
|
|
||||||
# Wrapper for compilers which do not understand `-c -o'.
|
|
||||||
|
|
||||||
scriptversion=2005-05-14.22
|
|
||||||
|
|
||||||
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
|
|
||||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
|
||||||
#
|
|
||||||
# This program is free software; you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation; either version 2, or (at your option)
|
|
||||||
# any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program; if not, write to the Free Software
|
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
|
||||||
# distribute this file as part of a program that contains a
|
|
||||||
# configuration script generated by Autoconf, you may include it under
|
|
||||||
# the same distribution terms that you use for the rest of that program.
|
|
||||||
|
|
||||||
# This file is maintained in Automake, please report
|
|
||||||
# bugs to <bug-automake@gnu.org> or send patches to
|
|
||||||
# <automake-patches@gnu.org>.
|
|
||||||
|
|
||||||
case $1 in
|
|
||||||
'')
|
|
||||||
echo "$0: No command. Try \`$0 --help' for more information." 1>&2
|
|
||||||
exit 1;
|
|
||||||
;;
|
|
||||||
-h | --h*)
|
|
||||||
cat <<\EOF
|
|
||||||
Usage: compile [--help] [--version] PROGRAM [ARGS]
|
|
||||||
|
|
||||||
Wrapper for compilers which do not understand `-c -o'.
|
|
||||||
Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
|
|
||||||
arguments, and rename the output as expected.
|
|
||||||
|
|
||||||
If you are trying to build a whole package this is not the
|
|
||||||
right script to run: please start by reading the file `INSTALL'.
|
|
||||||
|
|
||||||
Report bugs to <bug-automake@gnu.org>.
|
|
||||||
EOF
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
-v | --v*)
|
|
||||||
echo "compile $scriptversion"
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
ofile=
|
|
||||||
cfile=
|
|
||||||
eat=
|
|
||||||
|
|
||||||
for arg
|
|
||||||
do
|
|
||||||
if test -n "$eat"; then
|
|
||||||
eat=
|
|
||||||
else
|
|
||||||
case $1 in
|
|
||||||
-o)
|
|
||||||
# configure might choose to run compile as `compile cc -o foo foo.c'.
|
|
||||||
# So we strip `-o arg' only if arg is an object.
|
|
||||||
eat=1
|
|
||||||
case $2 in
|
|
||||||
*.o | *.obj)
|
|
||||||
ofile=$2
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set x "$@" -o "$2"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
*.c)
|
|
||||||
cfile=$1
|
|
||||||
set x "$@" "$1"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
set x "$@" "$1"
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
shift
|
|
||||||
done
|
|
||||||
|
|
||||||
if test -z "$ofile" || test -z "$cfile"; then
|
|
||||||
# If no `-o' option was seen then we might have been invoked from a
|
|
||||||
# pattern rule where we don't need one. That is ok -- this is a
|
|
||||||
# normal compilation that the losing compiler can handle. If no
|
|
||||||
# `.c' file was seen then we are probably linking. That is also
|
|
||||||
# ok.
|
|
||||||
exec "$@"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Name of file we expect compiler to create.
|
|
||||||
cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
|
|
||||||
|
|
||||||
# Create the lock directory.
|
|
||||||
# Note: use `[/.-]' here to ensure that we don't use the same name
|
|
||||||
# that we are using for the .o file. Also, base the name on the expected
|
|
||||||
# object file name, since that is what matters with a parallel build.
|
|
||||||
lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
|
|
||||||
while true; do
|
|
||||||
if mkdir "$lockdir" >/dev/null 2>&1; then
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
# FIXME: race condition here if user kills between mkdir and trap.
|
|
||||||
trap "rmdir '$lockdir'; exit 1" 1 2 15
|
|
||||||
|
|
||||||
# Run the compile.
|
|
||||||
"$@"
|
|
||||||
ret=$?
|
|
||||||
|
|
||||||
if test -f "$cofile"; then
|
|
||||||
mv "$cofile" "$ofile"
|
|
||||||
elif test -f "${cofile}bj"; then
|
|
||||||
mv "${cofile}bj" "$ofile"
|
|
||||||
fi
|
|
||||||
|
|
||||||
rmdir "$lockdir"
|
|
||||||
exit $ret
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# mode: shell-script
|
|
||||||
# sh-indentation: 2
|
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
||||||
# time-stamp-start: "scriptversion="
|
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
||||||
# time-stamp-end: "$"
|
|
||||||
# End:
|
|
|
@ -1,10 +1,9 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Attempt to guess a canonical system name.
|
# Attempt to guess a canonical system name.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||||
# Inc.
|
|
||||||
|
|
||||||
timestamp='2007-03-06'
|
timestamp='2005-07-08'
|
||||||
|
|
||||||
# This file is free software; you can redistribute it and/or modify it
|
# This file is free software; you can redistribute it and/or modify it
|
||||||
# under the terms of the GNU General Public License as published by
|
# under the terms of the GNU General Public License as published by
|
||||||
|
@ -107,7 +106,7 @@ set_cc_for_build='
|
||||||
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
|
||||||
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
|
||||||
: ${TMPDIR=/tmp} ;
|
: ${TMPDIR=/tmp} ;
|
||||||
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
{ tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
|
||||||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
|
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
|
||||||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
|
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
|
||||||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
|
||||||
|
@ -161,7 +160,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
arm*) machine=arm-unknown ;;
|
arm*) machine=arm-unknown ;;
|
||||||
sh3el) machine=shl-unknown ;;
|
sh3el) machine=shl-unknown ;;
|
||||||
sh3eb) machine=sh-unknown ;;
|
sh3eb) machine=sh-unknown ;;
|
||||||
sh5el) machine=sh5le-unknown ;;
|
|
||||||
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
|
||||||
esac
|
esac
|
||||||
# The Operating System including object format, if it has switched
|
# The Operating System including object format, if it has switched
|
||||||
|
@ -208,11 +206,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||||
*:ekkoBSD:*:*)
|
*:ekkoBSD:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
*:SolidBSD:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
macppc:MirBSD:*:*)
|
macppc:MirBSD:*:*)
|
||||||
echo powerpc-unknown-mirbsd${UNAME_RELEASE}
|
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
*:MirBSD:*:*)
|
*:MirBSD:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
|
||||||
|
@ -769,19 +764,12 @@ EOF
|
||||||
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
*:FreeBSD:*:*)
|
*:FreeBSD:*:*)
|
||||||
case ${UNAME_MACHINE} in
|
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||||
pc98)
|
|
||||||
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
||||||
amd64)
|
|
||||||
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
||||||
*)
|
|
||||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
|
||||||
esac
|
|
||||||
exit ;;
|
exit ;;
|
||||||
i*:CYGWIN*:*)
|
i*:CYGWIN*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-cygwin
|
echo ${UNAME_MACHINE}-pc-cygwin
|
||||||
exit ;;
|
exit ;;
|
||||||
*:MINGW*:*)
|
i*:MINGW*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-mingw32
|
echo ${UNAME_MACHINE}-pc-mingw32
|
||||||
exit ;;
|
exit ;;
|
||||||
i*:windows32*:*)
|
i*:windows32*:*)
|
||||||
|
@ -791,15 +779,9 @@ EOF
|
||||||
i*:PW*:*)
|
i*:PW*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-pw32
|
echo ${UNAME_MACHINE}-pc-pw32
|
||||||
exit ;;
|
exit ;;
|
||||||
*:Interix*:[3456]*)
|
x86:Interix*:[34]*)
|
||||||
case ${UNAME_MACHINE} in
|
echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
|
||||||
x86)
|
|
||||||
echo i586-pc-interix${UNAME_RELEASE}
|
|
||||||
exit ;;
|
exit ;;
|
||||||
EM64T | authenticamd)
|
|
||||||
echo x86_64-unknown-interix${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
esac ;;
|
|
||||||
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
|
||||||
echo i${UNAME_MACHINE}-pc-mks
|
echo i${UNAME_MACHINE}-pc-mks
|
||||||
exit ;;
|
exit ;;
|
||||||
|
@ -812,7 +794,7 @@ EOF
|
||||||
i*:UWIN*:*)
|
i*:UWIN*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-uwin
|
echo ${UNAME_MACHINE}-pc-uwin
|
||||||
exit ;;
|
exit ;;
|
||||||
amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
|
amd64:CYGWIN*:*:*)
|
||||||
echo x86_64-unknown-cygwin
|
echo x86_64-unknown-cygwin
|
||||||
exit ;;
|
exit ;;
|
||||||
p*:CYGWIN*:*)
|
p*:CYGWIN*:*)
|
||||||
|
@ -835,9 +817,6 @@ EOF
|
||||||
arm*:Linux:*:*)
|
arm*:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
avr32*:Linux:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
cris:Linux:*:*)
|
cris:Linux:*:*)
|
||||||
echo cris-axis-linux-gnu
|
echo cris-axis-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
|
@ -872,11 +851,7 @@ EOF
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
EOF
|
EOF
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||||
/^CPU/{
|
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||||
;;
|
;;
|
||||||
mips64:Linux:*:*)
|
mips64:Linux:*:*)
|
||||||
|
@ -895,16 +870,9 @@ EOF
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
EOF
|
EOF
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
|
||||||
/^CPU/{
|
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
||||||
;;
|
;;
|
||||||
or32:Linux:*:*)
|
|
||||||
echo or32-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
ppc:Linux:*:*)
|
ppc:Linux:*:*)
|
||||||
echo powerpc-unknown-linux-gnu
|
echo powerpc-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
|
@ -948,15 +916,9 @@ EOF
|
||||||
sparc:Linux:*:* | sparc64:Linux:*:*)
|
sparc:Linux:*:* | sparc64:Linux:*:*)
|
||||||
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
echo ${UNAME_MACHINE}-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
vax:Linux:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-dec-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
x86_64:Linux:*:*)
|
x86_64:Linux:*:*)
|
||||||
echo x86_64-unknown-linux-gnu
|
echo x86_64-unknown-linux-gnu
|
||||||
exit ;;
|
exit ;;
|
||||||
xtensa:Linux:*:*)
|
|
||||||
echo xtensa-unknown-linux-gnu
|
|
||||||
exit ;;
|
|
||||||
i*86:Linux:*:*)
|
i*86:Linux:*:*)
|
||||||
# The BFD linker knows what the default object file format is, so
|
# The BFD linker knows what the default object file format is, so
|
||||||
# first see if it will tell us. cd to the root directory to prevent
|
# first see if it will tell us. cd to the root directory to prevent
|
||||||
|
@ -999,7 +961,7 @@ EOF
|
||||||
LIBC=gnulibc1
|
LIBC=gnulibc1
|
||||||
# endif
|
# endif
|
||||||
#else
|
#else
|
||||||
#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
|
#ifdef __INTEL_COMPILER
|
||||||
LIBC=gnu
|
LIBC=gnu
|
||||||
#else
|
#else
|
||||||
LIBC=gnuaout
|
LIBC=gnuaout
|
||||||
|
@ -1009,11 +971,7 @@ EOF
|
||||||
LIBC=dietlibc
|
LIBC=dietlibc
|
||||||
#endif
|
#endif
|
||||||
EOF
|
EOF
|
||||||
eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
|
||||||
/^LIBC/{
|
|
||||||
s: ::g
|
|
||||||
p
|
|
||||||
}'`"
|
|
||||||
test x"${LIBC}" != x && {
|
test x"${LIBC}" != x && {
|
||||||
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
||||||
exit
|
exit
|
||||||
|
@ -1215,15 +1173,6 @@ EOF
|
||||||
SX-6:SUPER-UX:*:*)
|
SX-6:SUPER-UX:*:*)
|
||||||
echo sx6-nec-superux${UNAME_RELEASE}
|
echo sx6-nec-superux${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
SX-7:SUPER-UX:*:*)
|
|
||||||
echo sx7-nec-superux${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
SX-8:SUPER-UX:*:*)
|
|
||||||
echo sx8-nec-superux${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
SX-8R:SUPER-UX:*:*)
|
|
||||||
echo sx8r-nec-superux${UNAME_RELEASE}
|
|
||||||
exit ;;
|
|
||||||
Power*:Rhapsody:*:*)
|
Power*:Rhapsody:*:*)
|
||||||
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
echo powerpc-apple-rhapsody${UNAME_RELEASE}
|
||||||
exit ;;
|
exit ;;
|
||||||
|
@ -1233,6 +1182,7 @@ EOF
|
||||||
*:Darwin:*:*)
|
*:Darwin:*:*)
|
||||||
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
||||||
case $UNAME_PROCESSOR in
|
case $UNAME_PROCESSOR in
|
||||||
|
*86) UNAME_PROCESSOR=i686 ;;
|
||||||
unknown) UNAME_PROCESSOR=powerpc ;;
|
unknown) UNAME_PROCESSOR=powerpc ;;
|
||||||
esac
|
esac
|
||||||
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
||||||
|
@ -1311,9 +1261,6 @@ EOF
|
||||||
i*86:skyos:*:*)
|
i*86:skyos:*:*)
|
||||||
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
|
echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
|
||||||
exit ;;
|
exit ;;
|
||||||
i*86:rdos:*:*)
|
|
||||||
echo ${UNAME_MACHINE}-pc-rdos
|
|
||||||
exit ;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Configuration validation subroutine script.
|
# Configuration validation subroutine script.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
|
||||||
# Inc.
|
|
||||||
|
|
||||||
timestamp='2007-01-18'
|
timestamp='2005-07-08'
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
# This file is (in principle) common to ALL GNU software.
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
# The presence of a machine in this file suggests that SOME GNU software
|
||||||
|
@ -120,9 +119,8 @@ esac
|
||||||
# Here we must recognize all the valid KERNEL-OS combinations.
|
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||||
case $maybe_os in
|
case $maybe_os in
|
||||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
|
||||||
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
|
||||||
os=-$maybe_os
|
os=-$maybe_os
|
||||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||||
;;
|
;;
|
||||||
|
@ -173,10 +171,6 @@ case $os in
|
||||||
-hiux*)
|
-hiux*)
|
||||||
os=-hiuxwe2
|
os=-hiuxwe2
|
||||||
;;
|
;;
|
||||||
-sco6)
|
|
||||||
os=-sco5v6
|
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
|
||||||
;;
|
|
||||||
-sco5)
|
-sco5)
|
||||||
os=-sco3.2v5
|
os=-sco3.2v5
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||||
|
@ -193,10 +187,6 @@ case $os in
|
||||||
# Don't forget version if it is 3.2v4 or newer.
|
# Don't forget version if it is 3.2v4 or newer.
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||||
;;
|
;;
|
||||||
-sco5v6*)
|
|
||||||
# Don't forget version if it is 3.2v4 or newer.
|
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
|
||||||
;;
|
|
||||||
-sco*)
|
-sco*)
|
||||||
os=-sco3.2v2
|
os=-sco3.2v2
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||||
|
@ -241,16 +231,15 @@ case $basic_machine in
|
||||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||||
| am33_2.0 \
|
| am33_2.0 \
|
||||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
|
||||||
| bfin \
|
| bfin \
|
||||||
| c4x | clipper \
|
| c4x | clipper \
|
||||||
| d10v | d30v | dlx | dsp16xx \
|
| d10v | d30v | dlx | dsp16xx \
|
||||||
| fido | fr30 | frv \
|
| fr30 | frv \
|
||||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||||
| i370 | i860 | i960 | ia64 \
|
| i370 | i860 | i960 | ia64 \
|
||||||
| ip2k | iq2000 \
|
| ip2k | iq2000 \
|
||||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
|
||||||
| maxq | mb | microblaze | mcore | mep \
|
|
||||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||||
| mips16 \
|
| mips16 \
|
||||||
| mips64 | mips64el \
|
| mips64 | mips64el \
|
||||||
|
@ -268,27 +257,28 @@ case $basic_machine in
|
||||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||||
| mipstx39 | mipstx39el \
|
| mipstx39 | mipstx39el \
|
||||||
| mn10200 | mn10300 \
|
| mn10200 | mn10300 \
|
||||||
| mt \
|
| ms1 \
|
||||||
| msp430 \
|
| msp430 \
|
||||||
| nios | nios2 \
|
|
||||||
| ns16k | ns32k \
|
| ns16k | ns32k \
|
||||||
| or32 \
|
| or32 \
|
||||||
| pdp10 | pdp11 | pj | pjl \
|
| pdp10 | pdp11 | pj | pjl \
|
||||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||||
| pyramid \
|
| pyramid \
|
||||||
| score \
|
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
|
||||||
| sh64 | sh64le \
|
| sh64 | sh64le \
|
||||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
|
||||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
| sparcv8 | sparcv9 | sparcv9b \
|
||||||
| spu | strongarm \
|
| strongarm \
|
||||||
| tahoe | thumb | tic4x | tic80 | tron \
|
| tahoe | thumb | tic4x | tic80 | tron \
|
||||||
| v850 | v850e \
|
| v850 | v850e \
|
||||||
| we32k \
|
| we32k \
|
||||||
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
|
||||||
| z8k)
|
| z8k)
|
||||||
basic_machine=$basic_machine-unknown
|
basic_machine=$basic_machine-unknown
|
||||||
;;
|
;;
|
||||||
|
m32c)
|
||||||
|
basic_machine=$basic_machine-unknown
|
||||||
|
;;
|
||||||
m6811 | m68hc11 | m6812 | m68hc12)
|
m6811 | m68hc11 | m6812 | m68hc12)
|
||||||
# Motorola 68HC11/12.
|
# Motorola 68HC11/12.
|
||||||
basic_machine=$basic_machine-unknown
|
basic_machine=$basic_machine-unknown
|
||||||
|
@ -296,9 +286,6 @@ case $basic_machine in
|
||||||
;;
|
;;
|
||||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
||||||
;;
|
;;
|
||||||
ms1)
|
|
||||||
basic_machine=mt-unknown
|
|
||||||
;;
|
|
||||||
|
|
||||||
# We use `pc' rather than `unknown'
|
# We use `pc' rather than `unknown'
|
||||||
# because (1) that's what they normally are, and
|
# because (1) that's what they normally are, and
|
||||||
|
@ -318,18 +305,18 @@ case $basic_machine in
|
||||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||||
| avr-* | avr32-* \
|
| avr-* \
|
||||||
| bfin-* | bs2000-* \
|
| bfin-* | bs2000-* \
|
||||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
||||||
| clipper-* | craynv-* | cydra-* \
|
| clipper-* | craynv-* | cydra-* \
|
||||||
| d10v-* | d30v-* | dlx-* \
|
| d10v-* | d30v-* | dlx-* \
|
||||||
| elxsi-* \
|
| elxsi-* \
|
||||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
||||||
| h8300-* | h8500-* \
|
| h8300-* | h8500-* \
|
||||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||||
| i*86-* | i860-* | i960-* | ia64-* \
|
| i*86-* | i860-* | i960-* | ia64-* \
|
||||||
| ip2k-* | iq2000-* \
|
| ip2k-* | iq2000-* \
|
||||||
| m32c-* | m32r-* | m32rle-* \
|
| m32r-* | m32rle-* \
|
||||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
| m88110-* | m88k-* | maxq-* | mcore-* \
|
||||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||||
|
@ -349,30 +336,31 @@ case $basic_machine in
|
||||||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||||
| mipstx39-* | mipstx39el-* \
|
| mipstx39-* | mipstx39el-* \
|
||||||
| mmix-* \
|
| mmix-* \
|
||||||
| mt-* \
|
| ms1-* \
|
||||||
| msp430-* \
|
| msp430-* \
|
||||||
| nios-* | nios2-* \
|
|
||||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
| none-* | np1-* | ns16k-* | ns32k-* \
|
||||||
| orion-* \
|
| orion-* \
|
||||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||||
| pyramid-* \
|
| pyramid-* \
|
||||||
| romp-* | rs6000-* \
|
| romp-* | rs6000-* \
|
||||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
|
||||||
| sparclite-* \
|
| sparclite-* \
|
||||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||||
| tahoe-* | thumb-* \
|
| tahoe-* | thumb-* \
|
||||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||||
| tron-* \
|
| tron-* \
|
||||||
| v850-* | v850e-* | vax-* \
|
| v850-* | v850e-* | vax-* \
|
||||||
| we32k-* \
|
| we32k-* \
|
||||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
|
||||||
| xstormy16-* | xtensa-* \
|
| xstormy16-* | xtensa-* \
|
||||||
| ymp-* \
|
| ymp-* \
|
||||||
| z8k-*)
|
| z8k-*)
|
||||||
;;
|
;;
|
||||||
|
m32c-*)
|
||||||
|
;;
|
||||||
# Recognize the various machine names and aliases which stand
|
# Recognize the various machine names and aliases which stand
|
||||||
# for a CPU type and a company and sometimes even an OS.
|
# for a CPU type and a company and sometimes even an OS.
|
||||||
386bsd)
|
386bsd)
|
||||||
|
@ -708,9 +696,6 @@ case $basic_machine in
|
||||||
basic_machine=i386-pc
|
basic_machine=i386-pc
|
||||||
os=-msdos
|
os=-msdos
|
||||||
;;
|
;;
|
||||||
ms1-*)
|
|
||||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
|
||||||
;;
|
|
||||||
mvs)
|
mvs)
|
||||||
basic_machine=i370-ibm
|
basic_machine=i370-ibm
|
||||||
os=-mvs
|
os=-mvs
|
||||||
|
@ -818,12 +803,6 @@ case $basic_machine in
|
||||||
pc532 | pc532-*)
|
pc532 | pc532-*)
|
||||||
basic_machine=ns32k-pc532
|
basic_machine=ns32k-pc532
|
||||||
;;
|
;;
|
||||||
pc98)
|
|
||||||
basic_machine=i386-pc
|
|
||||||
;;
|
|
||||||
pc98-*)
|
|
||||||
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
||||||
;;
|
|
||||||
pentium | p5 | k5 | k6 | nexgen | viac3)
|
pentium | p5 | k5 | k6 | nexgen | viac3)
|
||||||
basic_machine=i586-pc
|
basic_machine=i586-pc
|
||||||
;;
|
;;
|
||||||
|
@ -880,10 +859,6 @@ case $basic_machine in
|
||||||
basic_machine=i586-unknown
|
basic_machine=i586-unknown
|
||||||
os=-pw32
|
os=-pw32
|
||||||
;;
|
;;
|
||||||
rdos)
|
|
||||||
basic_machine=i386-pc
|
|
||||||
os=-rdos
|
|
||||||
;;
|
|
||||||
rom68k)
|
rom68k)
|
||||||
basic_machine=m68k-rom68k
|
basic_machine=m68k-rom68k
|
||||||
os=-coff
|
os=-coff
|
||||||
|
@ -910,10 +885,6 @@ case $basic_machine in
|
||||||
sb1el)
|
sb1el)
|
||||||
basic_machine=mipsisa64sb1el-unknown
|
basic_machine=mipsisa64sb1el-unknown
|
||||||
;;
|
;;
|
||||||
sde)
|
|
||||||
basic_machine=mipsisa32-sde
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
sei)
|
sei)
|
||||||
basic_machine=mips-sei
|
basic_machine=mips-sei
|
||||||
os=-seiux
|
os=-seiux
|
||||||
|
@ -925,9 +896,6 @@ case $basic_machine in
|
||||||
basic_machine=sh-hitachi
|
basic_machine=sh-hitachi
|
||||||
os=-hms
|
os=-hms
|
||||||
;;
|
;;
|
||||||
sh5el)
|
|
||||||
basic_machine=sh5le-unknown
|
|
||||||
;;
|
|
||||||
sh64)
|
sh64)
|
||||||
basic_machine=sh64-unknown
|
basic_machine=sh64-unknown
|
||||||
;;
|
;;
|
||||||
|
@ -1133,7 +1101,7 @@ case $basic_machine in
|
||||||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||||
basic_machine=sh-unknown
|
basic_machine=sh-unknown
|
||||||
;;
|
;;
|
||||||
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
sparc | sparcv8 | sparcv9 | sparcv9b)
|
||||||
basic_machine=sparc-sun
|
basic_machine=sparc-sun
|
||||||
;;
|
;;
|
||||||
cydra)
|
cydra)
|
||||||
|
@ -1206,23 +1174,21 @@ case $os in
|
||||||
| -aos* \
|
| -aos* \
|
||||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
|
||||||
| -openbsd* | -solidbsd* \
|
|
||||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
||||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||||
| -chorusos* | -chorusrdb* \
|
| -chorusos* | -chorusrdb* \
|
||||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
| -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
||||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
||||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
| -skyos* | -haiku*)
|
||||||
# Remember, each alternative MUST END IN *, to match a version number.
|
# Remember, each alternative MUST END IN *, to match a version number.
|
||||||
;;
|
;;
|
||||||
-qnx*)
|
-qnx*)
|
||||||
|
@ -1374,12 +1340,6 @@ else
|
||||||
# system, and we'll never get to this point.
|
# system, and we'll never get to this point.
|
||||||
|
|
||||||
case $basic_machine in
|
case $basic_machine in
|
||||||
score-*)
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
spu-*)
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
*-acorn)
|
*-acorn)
|
||||||
os=-riscix1.2
|
os=-riscix1.2
|
||||||
;;
|
;;
|
||||||
|
@ -1417,9 +1377,6 @@ case $basic_machine in
|
||||||
m68*-cisco)
|
m68*-cisco)
|
||||||
os=-aout
|
os=-aout
|
||||||
;;
|
;;
|
||||||
mep-*)
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
mips*-cisco)
|
mips*-cisco)
|
||||||
os=-elf
|
os=-elf
|
||||||
;;
|
;;
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -22,12 +22,16 @@ 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.57])
|
||||||
AC_INIT(xsetroot,[1.0.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetroot)
|
AC_INIT(xsetroot,[1.0.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xsetroot)
|
||||||
AM_INIT_AUTOMAKE([dist-bzip2])
|
AM_INIT_AUTOMAKE([dist-bzip2])
|
||||||
AM_MAINTAINER_MODE
|
AM_MAINTAINER_MODE
|
||||||
|
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
|
||||||
|
# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
|
||||||
|
m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
|
||||||
|
XORG_MACROS_VERSION(1.1)
|
||||||
|
|
||||||
AC_PROG_CC
|
AC_PROG_CC
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
|
||||||
|
@ -36,6 +40,7 @@ PKG_CHECK_MODULES(XSETROOT, xmuu x11 xbitmaps)
|
||||||
AC_SUBST(XSETROOT_CFLAGS)
|
AC_SUBST(XSETROOT_CFLAGS)
|
||||||
AC_SUBST(XSETROOT_LIBS)
|
AC_SUBST(XSETROOT_LIBS)
|
||||||
|
|
||||||
|
XORG_WITH_LINT
|
||||||
XORG_MANPAGE_SECTIONS
|
XORG_MANPAGE_SECTIONS
|
||||||
XORG_RELEASE_VERSION
|
XORG_RELEASE_VERSION
|
||||||
|
|
||||||
|
|
|
@ -1,158 +0,0 @@
|
||||||
#! /bin/sh
|
|
||||||
# mkinstalldirs --- make directory hierarchy
|
|
||||||
|
|
||||||
scriptversion=2005-06-29.22
|
|
||||||
|
|
||||||
# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
|
|
||||||
# Created: 1993-05-16
|
|
||||||
# Public domain.
|
|
||||||
#
|
|
||||||
# This file is maintained in Automake, please report
|
|
||||||
# bugs to <bug-automake@gnu.org> or send patches to
|
|
||||||
# <automake-patches@gnu.org>.
|
|
||||||
|
|
||||||
errstatus=0
|
|
||||||
dirmode=
|
|
||||||
|
|
||||||
usage="\
|
|
||||||
Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
|
|
||||||
|
|
||||||
Create each directory DIR (with mode MODE, if specified), including all
|
|
||||||
leading file name components.
|
|
||||||
|
|
||||||
Report bugs to <bug-automake@gnu.org>."
|
|
||||||
|
|
||||||
# process command line arguments
|
|
||||||
while test $# -gt 0 ; do
|
|
||||||
case $1 in
|
|
||||||
-h | --help | --h*) # -h for help
|
|
||||||
echo "$usage"
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
-m) # -m PERM arg
|
|
||||||
shift
|
|
||||||
test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
|
|
||||||
dirmode=$1
|
|
||||||
shift
|
|
||||||
;;
|
|
||||||
--version)
|
|
||||||
echo "$0 $scriptversion"
|
|
||||||
exit $?
|
|
||||||
;;
|
|
||||||
--) # stop option processing
|
|
||||||
shift
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
-*) # unknown option
|
|
||||||
echo "$usage" 1>&2
|
|
||||||
exit 1
|
|
||||||
;;
|
|
||||||
*) # first non-opt arg
|
|
||||||
break
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
for file
|
|
||||||
do
|
|
||||||
if test -d "$file"; then
|
|
||||||
shift
|
|
||||||
else
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
case $# in
|
|
||||||
0) exit 0 ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and
|
|
||||||
# mkdir -p a/c at the same time, both will detect that a is missing,
|
|
||||||
# one will create a, then the other will try to create a and die with
|
|
||||||
# a "File exists" error. This is a problem when calling mkinstalldirs
|
|
||||||
# from a parallel make. We use --version in the probe to restrict
|
|
||||||
# ourselves to GNU mkdir, which is thread-safe.
|
|
||||||
case $dirmode in
|
|
||||||
'')
|
|
||||||
if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
|
|
||||||
echo "mkdir -p -- $*"
|
|
||||||
exec mkdir -p -- "$@"
|
|
||||||
else
|
|
||||||
# On NextStep and OpenStep, the `mkdir' command does not
|
|
||||||
# recognize any option. It will interpret all options as
|
|
||||||
# directories to create, and then abort because `.' already
|
|
||||||
# exists.
|
|
||||||
test -d ./-p && rmdir ./-p
|
|
||||||
test -d ./--version && rmdir ./--version
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
|
|
||||||
test ! -d ./--version; then
|
|
||||||
echo "mkdir -m $dirmode -p -- $*"
|
|
||||||
exec mkdir -m "$dirmode" -p -- "$@"
|
|
||||||
else
|
|
||||||
# Clean up after NextStep and OpenStep mkdir.
|
|
||||||
for d in ./-m ./-p ./--version "./$dirmode";
|
|
||||||
do
|
|
||||||
test -d $d && rmdir $d
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
for file
|
|
||||||
do
|
|
||||||
case $file in
|
|
||||||
/*) pathcomp=/ ;;
|
|
||||||
*) pathcomp= ;;
|
|
||||||
esac
|
|
||||||
oIFS=$IFS
|
|
||||||
IFS=/
|
|
||||||
set fnord $file
|
|
||||||
shift
|
|
||||||
IFS=$oIFS
|
|
||||||
|
|
||||||
for d
|
|
||||||
do
|
|
||||||
test "x$d" = x && continue
|
|
||||||
|
|
||||||
pathcomp=$pathcomp$d
|
|
||||||
case $pathcomp in
|
|
||||||
-*) pathcomp=./$pathcomp ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
if test ! -d "$pathcomp"; then
|
|
||||||
echo "mkdir $pathcomp"
|
|
||||||
|
|
||||||
mkdir "$pathcomp" || lasterr=$?
|
|
||||||
|
|
||||||
if test ! -d "$pathcomp"; then
|
|
||||||
errstatus=$lasterr
|
|
||||||
else
|
|
||||||
if test ! -z "$dirmode"; then
|
|
||||||
echo "chmod $dirmode $pathcomp"
|
|
||||||
lasterr=
|
|
||||||
chmod "$dirmode" "$pathcomp" || lasterr=$?
|
|
||||||
|
|
||||||
if test ! -z "$lasterr"; then
|
|
||||||
errstatus=$lasterr
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
pathcomp=$pathcomp/
|
|
||||||
done
|
|
||||||
done
|
|
||||||
|
|
||||||
exit $errstatus
|
|
||||||
|
|
||||||
# Local Variables:
|
|
||||||
# mode: shell-script
|
|
||||||
# sh-indentation: 2
|
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
|
||||||
# time-stamp-start: "scriptversion="
|
|
||||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
|
||||||
# time-stamp-end: "$"
|
|
||||||
# End:
|
|
|
@ -38,7 +38,7 @@ xsetroot \- root window parameter setting utility for X
|
||||||
[-solid \fIcolor\fP] [-name \fIstring\fP]
|
[-solid \fIcolor\fP] [-name \fIstring\fP]
|
||||||
.SH DESCRIPTION
|
.SH DESCRIPTION
|
||||||
The
|
The
|
||||||
.I setroot
|
.I xsetroot
|
||||||
program
|
program
|
||||||
allows you to tailor the appearance of the background ("root")
|
allows you to tailor the appearance of the background ("root")
|
||||||
window on a workstation display running X. Normally, you experiment with
|
window on a workstation display running X. Normally, you experiment with
|
||||||
|
|
Loading…
Reference in New Issue