xutils-dev: Changes to 'debian-unstable'
debian/changelog | 17
debian/control | 9
debian/patches/02_mkdirhier_rewrite.diff | 314 --
debian/patches/series | 1
debian/rules | 6
imake/ChangeLog | 122
imake/Makefile.am | 23
imake/Makefile.in | 27
imake/aclocal.m4 | 426 ++-
imake/cleanlinks | 1
imake/config.guess | 18
imake/config.h.in | 6
imake/config.sub | 76
imake/configure | 1749 ++++--------
imake/configure.ac | 19
imake/imake.c | 12
imake/imake.man | 3
imake/imakemdep.h | 3
imake/makeg | 1
imake/makeg.man | 3
imake/mdepend.cpp | 5
imake/mergelib.cpp | 2
imake/mergelib.man | 1
imake/mkdirhier | 36
imake/mkdirhier.man | 3
imake/mkhtmlindex.pl | 2
imake/mkhtmlindex.sh | 2
imake/revpath.c | 1
imake/revpath.man | 1
imake/xmkmf.cpp | 4
imake/xmkmf.man | 3
makedepend/ChangeLog | 54
makedepend/Makefile.am | 40
makedepend/Makefile.in | 167 -
makedepend/aclocal.m4 | 851 +++++-
makedepend/config.guess | 196 -
makedepend/config.sub | 43
makedepend/configure | 4287 +++++++++++++------------------
makedepend/configure.ac | 11
makedepend/include.c | 6
makedepend/makedepend-config.h.in | 3
makedepend/tests/28045/foo.cpp | 2
makedepend/tests/28045/makedep.sh | 28
util-macros/ChangeLog | 37
util-macros/Makefile.in | 195 -
util-macros/aclocal.m4 | 149 -
util-macros/configure | 1836 ++++++-------
util-macros/configure.ac | 2
util-macros/install-sh | 5
util-macros/missing | 49
util-macros/xorg-macros.m4.in | 102
51 files changed, 5342 insertions(+), 5617 deletions(-)
New commits:
commit 212621367cb74fc23f447f691d936a424767347f
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Oct 31 16:35:32 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index d2fc088..c2cf390 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xutils-dev (1:7.5+5) UNRELEASED; urgency=low
+xutils-dev (1:7.5+5) unstable; urgency=low
[ Julien Cristau ]
* lndir 1.0.2.
@@ -17,7 +17,7 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
just calls mkdir -p.
* Add myself to Uploaders.
- -- Julien Cristau <jcristau@debian.org> Sat, 16 Oct 2010 22:27:22 +0200
+ -- Cyril Brulebois <kibi@debian.org> Sun, 31 Oct 2010 16:35:25 +0100
xutils-dev (1:7.5+4) unstable; urgency=low
commit 31972ed763a406ac56a81e8d4af43c13aae739ff
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Oct 31 16:35:13 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index a6b52a2..d2fc088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
* imake 1.0.4.
* Drop 02_mkdirhier_rewrite.diff, no longer needed since upstream now
just calls mkdir -p.
+ * Add myself to Uploaders.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Oct 2010 22:27:22 +0200
diff --git a/debian/control b/debian/control
index edd2af0..43dec2a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xutils-dev
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 5.0.0),
pkg-config,
commit 89be00c169717bd5b334c8be5b0b3e1e19c8ab07
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Oct 31 16:31:39 2010 +0100
Drop 02_mkdirhier_rewrite.diff, no longer needed since upstream now just calls mkdir -p.
diff --git a/debian/changelog b/debian/changelog
index 59e40e1..a6b52a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
* Introduce SUBDIRS_CHECK where one can list packages which implement a
testsuite. Put makedepend in it.
* imake 1.0.4.
+ * Drop 02_mkdirhier_rewrite.diff, no longer needed since upstream now
+ just calls mkdir -p.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Oct 2010 22:27:22 +0200
diff --git a/debian/patches/02_mkdirhier_rewrite.diff b/debian/patches/02_mkdirhier_rewrite.diff
deleted file mode 100644
index d2f5d88..0000000
--- a/debian/patches/02_mkdirhier_rewrite.diff
+++ /dev/null
@@ -1,314 +0,0 @@
-$Id: 099u_mkdirhier_rewrite.diff 480 2005-08-02 20:14:26Z branden $
-
-Reimplement mkdirhier; see Debian #141347 and #232357 for some reasons why.
-
-This shell script and manpage by Branden Robinson.
-
-Not submitted upstream to XFree86 or X.Org.
-
-Index: a/imake/mkdirhier
-===================================================================
---- a/imake/mkdirhier (revision 309)
-+++ b/imake/mkdirhier (working copy)
-@@ -1,67 +1,94 @@
- #!/bin/sh
--# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $
--# Courtesy of Paul Eggert
-
--newline='
--'
--IFS=$newline
-+# Copyright 2005 Branden Robinson.
-
--case ${1--} in
---*) echo >&2 "mkdirhier: usage: mkdirhier directory ..."; exit 1
--esac
-+# Permission is hereby granted, free of charge, to any person obtaining a
-+# copy of this software and associated documentation files (the "Software"),
-+# to deal in the Software without restriction, including without limitation
-+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+# and/or sell copies of the Software, and to permit persons to whom the
-+# Software is furnished to do so, subject to the following condition:
-+#
-+# The above copyright notice and this permission notice shall be
-+# included in all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+# SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+# DEALINGS IN THE SOFTWARE.
-
--status=
-+# I rewrote Paul Eggert's script in POSIX shell because it was a little
-+# odd, and did not confine itself to puritantical pre-POSIX conventions.
-+# For example, in one place it used:
-+# case ${1--} in
-+# -*)
-+# to test for $1 being null, presumably due to fears that test -n and -z
-+# will not be available. Yet later in the script, test -n was used.
-+#
-+# This seemed quite silly. I decided to rewrite it since I am arrgoant
-+# enough to think I know what I'm doing in POSIX shell.
-+#
-+# If someone needs a pre-POSIX version of mkdirhier, they'll probably need to
-+# turn to someone else, as I have no idea where such a thing is specified.
-
--for directory
--do
-- case $directory in
-- '')
-- echo >&2 "mkdirhier: empty directory name"
-- status=1
-- continue;;
-- *"$newline"*)
-- echo >&2 "mkdirhier: directory name contains a newline: \`\`$directory''"
-- status=1
-- continue;;
-- ///*) prefix=/;; # See Posix 2.3 "path".
-- //*) prefix=//;;
-- /*) prefix=/;;
-- -*) prefix=./;;
-- *) prefix=
-- esac
-+set -e
-
-- IFS=/
-- set x $directory
-- case $2 in
-- */*) # IFS parsing is broken
-- IFS=' '
-- set x `echo $directory | tr / ' '`
-- ;;
-- esac
-- IFS=$newline
-- shift
-+PROGNAME=${0##*/}
-+STATUS=0
-
-- for filename
-- do
-- path=$prefix$filename
-- prefix=$path/
-- shift
-+usage() {
-+ cat <<EOF
-+usage: $PROGNAME DIRECTORY ...
-+Create each directory DIRECTORY, also creating intermediate directories in the
-+specified hierarchy as necessary.
-
-- test -d "$path" || {
-- paths=$path
-- for filename
-- do
-- if [ -n "$filename" -a "$filename" != "." ]; then
-- path=$path/$filename
-- paths=$paths$newline$path
-- fi
-- done
-+Note: Use "mkdir -p" instead of "$PROGNAME" if the system supports it.
-+EOF
-+}
-
-- mkdir $paths || status=$?
-+makedir () {
-+ FUNC_STATUS=0
-+ # Does the desired directory already exist?
-+ if ! [ -d "$1" ]; then
-+ # Is a directory hierarchy specified (i.e., are any slashes in the
-+ # argument)?
-+ PARENT=${1%/*}
-+ if [ -n "$PARENT" ] && [ "$PARENT" != "$1" ]; then
-+ # Yes; does the desired directory's immediate parent exist?
-+ if ! [ -d "$PARENT" ]; then
-+ # No; push it onto the stack. If that fails, return
-+ # immediately, as we know later calls will also fail. E.g., if
-+ # we are asked to create /usr/bin/foo/bar/baz/quux and
-+ # /usr/bin/foo fails, we don't have to even try anything deeper
-+ # in the hierarchy.
-+ if ! makedir "$PARENT"; then
-+ return $FUNC_STATUS
-+ fi
-+ fi
-+ fi
-+ mkdir "$1" || FUNC_STATUS=$?
-+ fi
-+ return $FUNC_STATUS
-+}
-
-- break
-- }
-- done
-- done
-+if [ -z "$1" ]; then
-+ usage >&2
-+ exit 64
-+fi
-
--exit $status
-+while [ -n "$1" ]; do
-+ ARG="$1"
-+ makedir "$ARG" || \
-+ {
-+ STATUS=$?
-+ echo "$PROGNAME: could not create directory \"$ARG\"" >&2
-+ }
-+ shift
-+done
-+
-+exit $STATUS
-+
-+# vim:set ai et sts=4 sw=4 tw=80:
-Index: a/imake/mkdirhier.man
-===================================================================
---- a/imake/mkdirhier.man (revision 309)
-+++ b/imake/mkdirhier.man (working copy)
-@@ -1,42 +1,111 @@
--.\" $Xorg: mkdirhier.man,v 1.4 2001/02/09 02:03:17 xorgcvs Exp $
--.\" Copyright (c) 1993, 1994, 1998 The Open Group
--.\"
--.\" Permission to use, copy, modify, distribute, and sell this software and its
--.\" documentation for any purpose is hereby granted without fee, provided that
--.\" the above copyright notice appear in all copies and that both that
--.\" copyright notice and this permission notice appear in supporting
--.\" documentation.
--.\"
--.\" The above copyright notice and this permission notice shall be included in
--.\" all copies or substantial portions of the Software.
--.\"
-+.\" Copyright 2005 Branden Robinson.
-+.\"
-+.\" Permission is hereby granted, free of charge, to any person obtaining a
-+.\" copy of this software and associated documentation files (the "Software"),
-+.\" to deal in the Software without restriction, including without limitation
-+.\" the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+.\" and/or sell copies of the Software, and to permit persons to whom the
-+.\" Software is furnished to do so, subject to the following condition:
-+.\"
-+.\" The above copyright notice and this permission notice shall be
-+.\" included in all copies or substantial portions of the Software.
-+.\"
- .\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- .\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
--.\" THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
--.\" WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
--.\" OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--.\" SOFTWARE.
--.\"
--.\" Except as contained in this notice, the name of The Open Group shall not
--.\" be used in advertising or otherwise to promote the sale, use or other
--.\" dealing in this Software without prior written authorization from The
--.\" Open Group.
--.\"
--.\" $XFree86: xc/config/util/mkdirhier.man,v 1.2 2001/01/27 18:19:55 dawes Exp $
--.\"
--.TH MKDIRHIER 1 __xorgversion__
-+.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-+.\" SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-+.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-+.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+.\" DEALINGS IN THE SOFTWARE.
-+.TH mkdirhier 1 __xorgversion__
- .SH NAME
--mkdirhier \- makes a directory hierarchy
-+mkdirhier \- create a directory hierarchy
- .SH SYNOPSIS
- .B mkdirhier
--directory ...
-+.I directory
-+\&...
- .SH DESCRIPTION
--The
--.I mkdirhier
--command creates the specified directories. Unlike
--.I mkdir
--if any of the parent directories of the specified directory
--do not exist, it creates them as well.
-+.B mkdirhier
-+creates the specified directories.
-+Unlike some versions of
-+.BR mkdir ,
-+if any of the parent directories of the specified directory do not exist,
-+.B mkdirhier
-+creates them as well.
-+.PP
-+.B mkdirhier
-+is a wrapper for
-+.BR mkdir ;
-+systems with
-+.BR mkdir (__osmansuffix__)
-+implementations conformant with the Single Unix Specification may simply
-+use
-+.B mkdir \-p
-+instead \(em this includes all systems using the GNU Core Utilities'
-+version of
-+.BR mkdir .
-+.SH DIAGNOSTICS
-+If
-+.B mkdirhier
-+is not supplied with any arguments, a usage message is printed.
-+.PP
-+.B mkdirhier
-+prefixes its diagnostic messages with the name under which it was invoked,
-+followed by a colon (\(oq:\(cq) so that its messages can be distinguished
-+from others.
-+.TP
-+.B could not create directory \(dq\fIdirectory\fP\(dq
-+indicates that there was a failure while creating
-+.IR directory .
-+This message will likely be preceded by a diagnostic message from
-+.BR mkdir .
-+.SH "EXIT STATUS"
-+.TP
-+.B 64
-+.B mkdirhier
-+was not given any directory names to create.
-+.PP
-+.B mkdirhier
-+otherwise exits with the exit status of the last
-+.B mkdir
-+command that failed.
-+.SH BUGS
-+.B mkdirhier
-+does not create all the requested directories as an atomic operation;
-+therefore, it is is susceptible to race conditions.
-+For example, if
-+.B mkdirhier
-+is directed to create a hierarchy
-+.I a/b/c/d
-+and any of
-+.IR a/ ,
-+.IR b/ ,
-+or
-+.I c/
-+do not yet exist, any of the newly-created directories can be removed
-+and/or replaced by a symbolic link to another location in the window of
-+time after
-+.B mkdirhier
-+creates a directory and the directory immediately below it.
-+This means that failures can be provoked (since
-+.B mkdir
-+will fail to create a directory in a directory that does not already
-+exist),
-+or directories may be created in unexpected locations.
-+The same limitation holds for multiple directory arguments to
-+.BR mkdirhier ;
-+given two arguments
-+.I a/b/c/d
-+and
-+.IR a/b/c/f ,
-+it is possible for the directory hierarchy
-+.I a/b/c
-+to be disrupted in the time between the processing of the two arguments.
-+To avoid these problems, use
-+.B mkdir \-p
-+instead, or do not use
-+.B mkdirhier
-+to create directories in parts of the filesystem where untrusted users can
-+manipulate them.
- .SH "SEE ALSO"
--mkdir(1)
-+.BR mkdir (__osmansuffix__)
diff --git a/debian/patches/series b/debian/patches/series
index 3ed579a..86f6aba 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-02_mkdirhier_rewrite.diff
03_xutils-dev-FHS.diff
04_xutils-dev-debian.diff
05_xaw_without_xp.diff
commit 8be55fc0d2d66b624403fad625d880f6d8663394
Author: Cyril Brulebois <kibi@debian.org>
Date: Sun Oct 31 16:13:15 2010 +0100
imake 1.0.4.
diff --git a/debian/changelog b/debian/changelog
index d517621..59e40e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xutils-dev (1:7.5+5) UNRELEASED; urgency=low
* makedepend 1.0.3.
* Introduce SUBDIRS_CHECK where one can list packages which implement a
testsuite. Put makedepend in it.
+ * imake 1.0.4.
-- Julien Cristau <jcristau@debian.org> Sat, 16 Oct 2010 22:27:22 +0200
diff --git a/imake/ChangeLog b/imake/ChangeLog
index 33f6c36..eac8c18 100644
--- a/imake/ChangeLog
+++ b/imake/ChangeLog
@@ -1,3 +1,123 @@
+commit bf237073d39629599cb77bf0144f862c175bb640
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 19:10:35 2010 -0700
+
+ imake 1.0.4
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 29c3c8f2fc3859b1c8e1dd1f2327ab51c40fca21
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sat Oct 30 19:08:31 2010 -0700
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 3a3c6e584a1fee04a6bc4c11581c283d5fa8c603
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 19:04:22 2010 -0700
+
+ Use autoconf standard HAVE_MKSTEMP instead of HAS_MKSTEMP
+
+ We no longer need to maintain compatibility with the monolith
+ Imakefile -D flags in the sources.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f6587b17a6aef0404853ad5113158fddf4a90219
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 18:59:39 2010 -0700
+
+ config: Remove unnecessary calls from configure.ac
+
+ AC_PROG_CC, AC_PROG_SED, & AC_PROG_INSTALL are provided by
+ XORG_DEFAULT_OPTIONS now
+ PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bdf937d11774595eefc2ded78dcdf52dfe420443
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Oct 30 18:57:15 2010 -0700
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ca3374aee64c71c810159839c9b54c84b2bced24
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Apr 27 20:18:10 2010 -0500
+
+ Nuke RCS tags
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 01a05f973d52edc461c1100a939a70ea0ce9b048
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Apr 27 20:38:15 2010 -0500
+
+ mkdirhier: use mkdir -p
+
+ The '-p' option to mkdir(1) is required by SUSv2/Unix98, so we should be
+ able to rely on it on all systems we support. Some parts need to be
+ left in place in order to not alter some of its ancient, shall we say,
+ quirks.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 098bf61eb89c3d93d2ed814d3e39e6412f6fcf9e
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Apr 27 19:18:27 2010 -0500
+
+ Use standard .gitignore with custom section for imake
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Reviewed-by: Gaetan Nadon <gaetan.nadon@videotron.ca>
+
+commit 04da52fb5c4721c0218dbe6537c9ad0f7bd2ab04
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Apr 27 19:14:35 2010 -0500
+
+ Use AC_PROG_SED to find sed
+
+ AC_PROG_SED sets SED as the path to a fully-functional 'sed' (which may
+ also be called 'gsed' if GNU sed is installed alongside a proprietary
+ version).
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1127a5cb3166f4d5d0564732b3842fe81bf3e701
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Tue Apr 27 19:06:32 2010 -0500
+
+ Allow for EXEEXT in appman_DATA rule
+
+ As a result of commit 22578c3718e41da72c66ce6a4186ec7315d6e3ad:
+
+ make[1]: *** No rule to make target `imake.exe.1', needed by `all-am'.
+ make[1]: *** No rule to make target `revpath.exe.1', needed by `all-am'.
+
+ On PE/COFF platforms EXEEXT is set to ".exe" and is appended by automake
+ to all *_PROGRAMS. For portability this must be accounted for in any
+ custom rules which refer to any *_PROGRAMS.
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit 48145e04d24b1c575a22bac69c3c3033f72322fc
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Apr 15 19:52:20 2010 -0700
@@ -107,7 +227,7 @@ Date: Mon Jun 22 18:15:26 2009 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit eb8e41c3b3f280c34947579a5ee9fa511aee9acf
-Merge: e215b32... 9653950...
+Merge: e215b32 9653950
Author: Jeremy C. Reed <reed@tx.reedmedia.net>
Date: Thu Feb 14 23:27:42 2008 -0600
diff --git a/imake/Makefile.am b/imake/Makefile.am
index 1fe351d..6a932f3 100644
--- a/imake/Makefile.am
+++ b/imake/Makefile.am
@@ -125,30 +125,13 @@ appman_PRE = \
mkhtmlindex.man
# Only need to install man pages for programs/scripts being installed
-appman_needed_for = $(bin_PROGRAMS) $(bin_SCRIPTS)
-appman_DATA = $(appman_needed_for:%=%.@APP_MAN_SUFFIX@)
+appman_DATA = $(bin_PROGRAMS:%$(EXEEXT)=%.@APP_MAN_SUFFIX@) $(bin_SCRIPTS:%=%.@APP_MAN_SUFFIX@)
EXTRA_DIST += $(appman_PRE)
CLEANFILES += $(appman_DATA)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS += \
-e 's|__cpp__|$(RAWCPP)|g'
SUFFIXES = .$(APP_MAN_SUFFIX) .man
diff --git a/imake/Makefile.in b/imake/Makefile.in
index 47edc33..ca2ec3c 100644
--- a/imake/Makefile.in
+++ b/imake/Makefile.in
@@ -194,6 +194,9 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+MAN_SUBSTS = @MAN_SUBSTS@ -e 's|__cpp__|$(RAWCPP)|g'
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
MKDIR_P = @MKDIR_P@
@@ -211,12 +214,13 @@ PREPROCESSCMD_MKDEPEND = @PREPROCESSCMD_MKDEPEND@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
RAWCPPFLAGS = @RAWCPPFLAGS@
-SED = sed
+SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
XCONFDIR = @XCONFDIR@
+XORG_MAN_PAGE = @XORG_MAN_PAGE@
XPROTO_CFLAGS = @XPROTO_CFLAGS@
XPROTO_LIBS = @XPROTO_LIBS@
abs_builddir = @abs_builddir@
@@ -312,26 +316,7 @@ appman_PRE = \
# Only need to install man pages for programs/scripts being installed
-appman_needed_for = $(bin_PROGRAMS) $(bin_SCRIPTS)
-appman_DATA = $(appman_needed_for:%=%.@APP_MAN_SUFFIX@)
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
-XORGMANNAME = X Version 11
-MAN_SUBSTS = \
- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
- -e 's|__xservername__|Xorg|g' \
- -e 's|__xconfigfile__|xorg.conf|g' \
- -e 's|__projectroot__|$(prefix)|g' \
- -e 's|__apploaddir__|$(appdefaultdir)|' \
- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
- -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
- -e 's|__cpp__|$(RAWCPP)|g'
-
+appman_DATA = $(bin_PROGRAMS:%$(EXEEXT)=%.@APP_MAN_SUFFIX@) $(bin_SCRIPTS:%=%.@APP_MAN_SUFFIX@)
SUFFIXES = .$(APP_MAN_SUFFIX) .man
MAINTAINERCLEANFILES = ChangeLog
all: config.h
diff --git a/imake/aclocal.m4 b/imake/aclocal.m4
index 5fa3403..face861 100644
--- a/imake/aclocal.m4
+++ b/imake/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-[m4_warning([this file was generated for autoconf 2.65.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+[m4_warning([this file was generated for autoconf 2.68.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -1030,7 +1030,7 @@ AC_SUBST([am__untar])
dnl xorg-macros.m4. Generated from xorg-macros.m4.in xorgversion.m4 by configure.
dnl
-dnl Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved.
+dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. 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 "Software"),
@@ -1067,7 +1067,7 @@ dnl DEALINGS IN THE SOFTWARE.
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.6.0])
+m4_define([vers_have], [1.11.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -1135,9 +1135,12 @@ AC_SUBST(RAWCPPFLAGS)
# 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
+# Added MAN_SUBSTS in version 1.8
+# Added AC_PROG_SED in version 1.8
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
AC_REQUIRE([AC_CANONICAL_HOST])
+AC_REQUIRE([AC_PROG_SED])
if test x$APP_MAN_SUFFIX = x ; then
APP_MAN_SUFFIX=1
@@ -1206,8 +1209,60 @@ AC_SUBST([FILE_MAN_DIR])
AC_SUBST([MISC_MAN_DIR])
AC_SUBST([DRIVER_MAN_DIR])
AC_SUBST([ADMIN_MAN_DIR])
+
+XORG_MAN_PAGE="X Version 11"
+AC_SUBST([XORG_MAN_PAGE])
+MAN_SUBSTS="\
+ -e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+ -e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+ -e 's|__xservername__|Xorg|g' \
+ -e 's|__xconfigfile__|xorg.conf|g' \
+ -e 's|__projectroot__|\$(prefix)|g' \
+ -e 's|__apploaddir__|\$(appdefaultdir)|g' \
+ -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
+ -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
+ -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
+ -e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
+ -e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
+ -e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
+AC_SUBST([MAN_SUBSTS])
+
]) # XORG_MANPAGE_SECTIONS
+# XORG_CHECK_SGML_DOCTOOLS([MIN-VERSION])
+# ------------------------
+# Minimum version: 1.7.0
+#
+# Defines the variable XORG_SGML_PATH containing the location of X11/defs.ent
+# provided by xorg-sgml-doctools, if installed.
+AC_DEFUN([XORG_CHECK_SGML_DOCTOOLS],[
+AC_MSG_CHECKING([for X.Org SGML entities m4_ifval([$1],[>= $1])])
+XORG_SGML_PATH=
+PKG_CHECK_EXISTS([xorg-sgml-doctools m4_ifval([$1],[>= $1])],
+ [XORG_SGML_PATH=`$PKG_CONFIG --variable=sgmlrootdir xorg-sgml-doctools`],
+ [m4_ifval([$1],[:],
+ [if test x"$cross_compiling" != x"yes" ; then
+ AC_CHECK_FILE([$prefix/share/sgml/X11/defs.ent],
+ [XORG_SGML_PATH=$prefix/share/sgml])
+ fi])
+ ])
+
+# Define variables STYLESHEET_SRCDIR and XSL_STYLESHEET containing
+# the path and the name of the doc stylesheet
+if test "x$XORG_SGML_PATH" != "x" ; then
+ AC_MSG_RESULT([$XORG_SGML_PATH])
+ STYLESHEET_SRCDIR=$XORG_SGML_PATH/X11
+ XSL_STYLESHEET=$STYLESHEET_SRCDIR/xorg.xsl
+else
+ AC_MSG_RESULT([no])
+fi
+
+AC_SUBST(XORG_SGML_PATH)
+AC_SUBST(STYLESHEET_SRCDIR)
+AC_SUBST(XSL_STYLESHEET)
+AM_CONDITIONAL([HAVE_STYLESHEETS], [test "x$XSL_STYLESHEET" != "x"])
+]) # XORG_CHECK_SGML_DOCTOOLS
+
# XORG_CHECK_LINUXDOC
# -------------------
# Minimum version: 1.0.0
@@ -1217,23 +1272,14 @@ AC_SUBST([ADMIN_MAN_DIR])
# Whether or not the necessary tools and files are found can be checked
# with the AM_CONDITIONAL "BUILD_LINUXDOC"
AC_DEFUN([XORG_CHECK_LINUXDOC],[
-if test x$XORG_SGML_PATH = x ; then
- XORG_SGML_PATH=$prefix/share/sgml
-fi
-HAVE_DEFS_ENT=
-
-if test x"$cross_compiling" = x"yes" ; then
- HAVE_DEFS_ENT=no
-else
- AC_CHECK_FILE([$XORG_SGML_PATH/X11/defs.ent], [HAVE_DEFS_ENT=yes])
-fi
+AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
+AC_REQUIRE([XORG_WITH_PS2PDF])
AC_PATH_PROG(LINUXDOC, linuxdoc)
-AC_PATH_PROG(PS2PDF, ps2pdf)
-AC_MSG_CHECKING([Whether to build documentation])
+AC_MSG_CHECKING([whether to build documentation])
-if test x$HAVE_DEFS_ENT != x && test x$LINUXDOC != x ; then
+if test x$XORG_SGML_PATH != x && test x$LINUXDOC != x ; then
BUILDDOC=yes
else
BUILDDOC=no
@@ -1243,9 +1289,9 @@ AM_CONDITIONAL(BUILD_LINUXDOC, [test x$BUILDDOC = xyes])
AC_MSG_RESULT([$BUILDDOC])
-AC_MSG_CHECKING([Whether to build pdf documentation])
+AC_MSG_CHECKING([whether to build pdf documentation])
-if test x$PS2PDF != x && test x$BUILD_PDFDOC != xno; then
+if test x$have_ps2pdf != xno && test x$BUILD_PDFDOC != xno; then
BUILDPDFDOC=yes
else
BUILDPDFDOC=no
@@ -1255,7 +1301,7 @@ 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_TEXT="SGML_SEARCH_PATH=$XORG_SGML_PATH GROFF_NO_SGR=y $LINUXDOC -B txt -f"
MAKE_PS="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
MAKE_PDF="$PS2PDF"
MAKE_HTML="SGML_SEARCH_PATH=$XORG_SGML_PATH $LINUXDOC -B html --split=0"
@@ -1275,48 +1321,44 @@ AC_SUBST(MAKE_HTML)
# 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],[
-if test x$XORG_SGML_PATH = x ; then
- XORG_SGML_PATH=$prefix/share/sgml
-fi
-HAVE_DEFS_ENT=
+AC_REQUIRE([XORG_CHECK_SGML_DOCTOOLS])
+
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 &&
+AC_MSG_CHECKING([whether to build text documentation])
+if test x$XORG_SGML_PATH != 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 &&
+AC_MSG_CHECKING([whether to build PDF documentation])
+if test x$XORG_SGML_PATH != 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 &&
+AC_MSG_CHECKING([whether to build PostScript documentation])
+if test x$XORG_SGML_PATH != 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 &&
+AC_MSG_CHECKING([whether to build HTML documentation])
+if test x$XORG_SGML_PATH != x && test x$DOCBOOKHTML != x &&
test x$BUILD_HTMLDOC != xno; then
BUILDHTMLDOC=yes
fi
@@ -1334,15 +1376,17 @@ AC_SUBST(MAKE_PDF)
AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_DOCBOOK
-# XORG_WITH_XMLTO
+# XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
# ----------------
# Minimum version: 1.5.0
+# Minimum version for optional DEFAULT argument: 1.11.0
#
# Documentation tools are not always available on all platforms and sometimes
# not at the appropriate level. This macro enables a module to test for the
# presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-xmlto option, it allows maximum flexibilty in making decisions
-# as whether or not to use the xmlto package.
+# as whether or not to use the xmlto package. When DEFAULT is not specified,
+# --with-xmlto assumes 'auto'.
#
# Interface to module:
# HAVE_XMLTO: used in makefiles to conditionally generate documentation
@@ -1351,14 +1395,20 @@ AC_SUBST(MAKE_HTML)
# --with-xmlto: 'yes' user instructs the module to use xmlto
# 'no' user instructs the module not to use xmlto
#
+# Added in version 1.10.0
+# HAVE_XMLTO_TEXT: used in makefiles to conditionally generate text documentation
+# xmlto for text output requires either lynx, links, or w3m browsers
+#
# If the user sets the value of XMLTO, AC_PATH_PROG skips testing the path.
#
AC_DEFUN([XORG_WITH_XMLTO],[
AC_ARG_VAR([XMLTO], [Path to xmlto command])
+m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(xmlto,
AS_HELP_STRING([--with-xmlto],
- [Use xmlto to regenerate documentation (default: yes, if installed)]),
- [use_xmlto=$withval], [use_xmlto=auto])
+ [Use xmlto to regenerate documentation (default: ]_defopt[)]),
+ [use_xmlto=$withval], [use_xmlto=]_defopt)
+m4_undefine([_defopt])
if test "x$use_xmlto" = x"auto"; then
AC_PATH_PROG([XMLTO], [xmlto])
@@ -1382,18 +1432,47 @@ elif test "x$use_xmlto" = x"no" ; then
else
AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no'])
fi
+
+# Test for a minimum version of xmlto, if provided.
+m4_ifval([$1],
+[if test "$have_xmlto" = yes; then
+ # scrape the xmlto version
+ AC_MSG_CHECKING([the xmlto version])
+ xmlto_version=`$XMLTO --version 2>/dev/null | cut -d' ' -f3`
+ AC_MSG_RESULT([$xmlto_version])
+ AS_VERSION_COMPARE([$xmlto_version], [$1],
+ [if test "x$use_xmlto" = xauto; then
+ AC_MSG_WARN([xmlto version $xmlto_version found, but $1 needed])
+ have_xmlto=no
+ else
+ AC_MSG_ERROR([xmlto version $xmlto_version found, but $1 needed])
+ fi])
+fi])
+
+# Test for the ability of xmlto to generate a text target
+have_xmlto_text=no
+cat > conftest.xml << "EOF"
+EOF
+AS_IF([test "$have_xmlto" = yes],
+ [AS_IF([$XMLTO --skip-validation txt conftest.xml >/dev/null 2>&1],
+ [have_xmlto_text=yes],
+ [AC_MSG_WARN([xmlto cannot generate text format, this format skipped])])])
+rm -f conftest.xml
+AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
Reply to: