cygwin-x-doc Makefile.in, 1.3, 1.4 configure, 1.8, 1.9 configure.ac,
1.5, 1.6 missing, 1.1.1.1, 1.2
Harold L Hunt II
xserver-commit at pdx.freedesktop.org
Tue Apr 13 16:37:24 PDT 2004
Committed by: harold
Update of /cvs/xserver/cygwin-x-doc
In directory pdx:/tmp/cvs-serv12000
Modified Files:
Makefile.in configure configure.ac missing
Log Message:
Update auto-generated files
Index: Makefile.in
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/Makefile.in 10 Mar 2004 00:52:01 -0000 1.3
+++ b/Makefile.in 13 Apr 2004 23:37:20 -0000 1.4
@@ -41,8 +41,11 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
+BUILD_HARDCOPY_FALSE = @BUILD_HARDCOPY_FALSE@
+BUILD_HARDCOPY_TRUE = @BUILD_HARDCOPY_TRUE@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
+DOCBOOK_DSL = @DOCBOOK_DSL@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
@@ -51,6 +54,7 @@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
JADE = @JADE@
+JADETEX = @JADETEX@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LN_S = @LN_S@
Index: configure
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/configure,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/configure 10 Apr 2004 18:13:50 -0000 1.8
+++ b/configure 13 Apr 2004 23:37:20 -0000 1.9
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for cygwin-x-doc 1.0.3.
+# Generated by GNU Autoconf 2.59 for cygwin-x-doc 1.0.4.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -267,12 +267,12 @@
# Identity of this package.
PACKAGE_NAME='cygwin-x-doc'
PACKAGE_TARNAME='cygwin-x-doc'
-PACKAGE_VERSION='1.0.3'
-PACKAGE_STRING='cygwin-x-doc 1.0.3'
+PACKAGE_VERSION='1.0.4'
+PACKAGE_STRING='cygwin-x-doc 1.0.4'
PACKAGE_BUGREPORT=''
ac_unique_file="common/entities.xml"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot LN_S docdir JADE NSGMLS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot LN_S docdir JADE NSGMLS JADETEX DOCBOOK_DSL BUILD_HARDCOPY_TRUE BUILD_HARDCOPY_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -721,7 +721,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures cygwin-x-doc 1.0.3 to adapt to many kinds of systems.
+\`configure' configures cygwin-x-doc 1.0.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -783,15 +783,20 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cygwin-x-doc 1.0.3:";;
+ short | recursive ) echo "Configuration of cygwin-x-doc 1.0.4:";;
esac
cat <<\_ACEOF
+Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --disable-hardcopy disable building of hardcopy documentation
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-docdir=DIR Use DIR to store documentation files (default
- ${datadir}/doc/cygwin-x-doc)
+ --with-docdir=DIR general documentation (DATADIR/doc/cygwin-x-doc)
+ --with-docbook-dsl=FILE docbook.dsl stylesheet
_ACEOF
fi
@@ -888,7 +893,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-cygwin-x-doc configure 1.0.3
+cygwin-x-doc configure 1.0.4
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -902,7 +907,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cygwin-x-doc $as_me 1.0.3, which was
+It was created by cygwin-x-doc $as_me 1.0.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1514,7 +1519,7 @@
# Define the identity of the package.
PACKAGE='cygwin-x-doc'
- VERSION='1.0.3'
+ VERSION='1.0.4'
cat >>confdefs.h <<_ACEOF
@@ -1655,19 +1660,13 @@
# Checks for programs.
-
-
# Check whether --with-docdir or --without-docdir was given.
if test "${with_docdir+set}" = set; then
withval="$with_docdir"
- with_docdir=$withval
-fi;
-if test "x$with_docdir" = "x" ; then
- docdir='${datadir}/doc/cygwin-x-doc'
+ docdir=$withval
else
- docdir=$with_docdir
-fi
-
+ docdir='${datadir}/doc/cygwin-x-doc'
+fi;
# dsssl processor
@@ -1710,12 +1709,10 @@
test -n "$JADE" && break
done
-
-if test "x$JADE" = "x" ; then
- { { echo "$as_me:$LINENO: error: No dsssl tool found. Cannot build documentation." >&5
+test -n "$JADE" || JADE="{ { echo "$as_me:$LINENO: error: No dsssl tool found. Cannot build documentation." >&5
echo "$as_me: error: No dsssl tool found. Cannot build documentation." >&2;}
- { (exit 1); exit 1; }; }
-fi
+ { (exit 1); exit 1; }; }"
+
# sgml validator
for ac_prog in nsgmls onsgmls
@@ -1757,11 +1754,134 @@
test -n "$NSGMLS" && break
done
+test -n "$NSGMLS" || NSGMLS="{ echo "$as_me:$LINENO: WARNING: No sgml validator found. Cannot validate sgml content." >&5
+echo "$as_me: WARNING: No sgml validator found. Cannot validate sgml content." >&2;}"
+
+
+# Check whether --enable-hardcopy or --disable-hardcopy was given.
+if test "${enable_hardcopy+set}" = set; then
+ enableval="$enable_hardcopy"
+ build_hardcopy=$enableval
+else
+ build_hardcopy=auto
+
+fi;
+
+if test x$build_hardcopy != xno; then
+for ac_prog in jadetex
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_JADETEX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -n "$JADETEX"; then
+ ac_cv_prog_JADETEX="$JADETEX" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_prog_JADETEX="$ac_prog"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
-if test "x$NSGMLS" = "x" ; then
- { echo "$as_me:$LINENO: WARNING: No sgml validator found. Cannot validate sgml content." >&5
-echo "$as_me: WARNING: No sgml validator found. Cannot validate sgml content." >&2;}
fi
+fi
+JADETEX=$ac_cv_prog_JADETEX
+if test -n "$JADETEX"; then
+ echo "$as_me:$LINENO: result: $JADETEX" >&5
+echo "${ECHO_T}$JADETEX" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ test -n "$JADETEX" && break
+done
+test -n "$JADETEX" || JADETEX="
+ { echo "$as_me:$LINENO: WARNING: jadetex not found. Cannot build hardcopy documentation." >&5
+echo "$as_me: WARNING: jadetex not found. Cannot build hardcopy documentation." >&2;}
+ build_hardcopy=no
+ "
+
+fi
+
+
+
+# Check whether --with-docbook-dsl or --without-docbook-dsl was given.
+if test "${with_docbook_dsl+set}" = set; then
+ withval="$with_docbook_dsl"
+ docbook_dsl_files=$withval
+else
+ docbook_dsl_files=" \
+ /usr/share/sgml/docbook-dsssl/print/docbook.dsl \
+ /usr/share/sgml/docbook/stylesheet/modular/dsssl/print/docbook.dsl \
+ "
+
+fi;
+
+if test x$build_hardcopy != xno; then
+ for file in $docbook_dsl_files; do
+ as_ac_File=`echo "ac_cv_file_$file" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $file" >&5
+echo $ECHO_N "checking for $file... $ECHO_C" >&6
+if eval "test \"\${$as_ac_File+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ test "$cross_compiling" = yes &&
+ { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
+echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
+ { (exit 1); exit 1; }; }
+if test -r "$file"; then
+ eval "$as_ac_File=yes"
+else
+ eval "$as_ac_File=no"
+fi
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
+if test `eval echo '${'$as_ac_File'}'` = yes; then
+
+ build_hardcopy=yes
+ docbook_dsl=$file
+ break
+
+fi
+
+ done
+ if test x$build_hardcopy != xyes; then
+ { echo "$as_me:$LINENO: WARNING: stylesheet not found. Cannot build hardcopy documentation." >&5
+echo "$as_me: WARNING: stylesheet not found. Cannot build hardcopy documentation." >&2;}
+ else
+ { echo "$as_me:$LINENO: build of hardcopy documentation enabled." >&5
+echo "$as_me: build of hardcopy documentation enabled." >&6;}
+ DOCBOOK_DSL="$docbook_dsl"
+ fi
+else
+ { echo "$as_me:$LINENO: build of hardcopy documentation disabled." >&5
+echo "$as_me: build of hardcopy documentation disabled." >&6;}
+fi
+
+
+
+
+if test x$build_hardcopy = xyes; then
+ BUILD_HARDCOPY_TRUE=
+ BUILD_HARDCOPY_FALSE='#'
+else
+ BUILD_HARDCOPY_TRUE='#'
+ BUILD_HARDCOPY_FALSE=
+fi
+
ac_config_files="$ac_config_files Makefile cg/Makefile faq/Makefile ug/Makefile stylesheets/Makefile ug/figures/Makefile common/Makefile"
@@ -1887,6 +2007,13 @@
LTLIBOBJS=$ac_ltlibobjs
+if test -z "${BUILD_HARDCOPY_TRUE}" && test -z "${BUILD_HARDCOPY_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BUILD_HARDCOPY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BUILD_HARDCOPY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -2158,7 +2285,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by cygwin-x-doc $as_me 1.0.3, which was
+This file was extended by cygwin-x-doc $as_me 1.0.4, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2213,7 +2340,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-cygwin-x-doc config.status 1.0.3
+cygwin-x-doc config.status 1.0.4
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -2429,6 +2556,10 @@
s, at docdir@,$docdir,;t t
s, at JADE@,$JADE,;t t
s, at NSGMLS@,$NSGMLS,;t t
+s, at JADETEX@,$JADETEX,;t t
+s, at DOCBOOK_DSL@,$DOCBOOK_DSL,;t t
+s, at BUILD_HARDCOPY_TRUE@,$BUILD_HARDCOPY_TRUE,;t t
+s, at BUILD_HARDCOPY_FALSE@,$BUILD_HARDCOPY_FALSE,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
s, at LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Index: configure.ac
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/configure.ac 13 Apr 2004 23:00:42 -0000 1.5
+++ b/configure.ac 13 Apr 2004 23:37:20 -0000 1.6
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(cygwin-x-doc, 1.0.3)
+AC_INIT(cygwin-x-doc, 1.0.4)
AC_CONFIG_SRCDIR([common/entities.xml])
AM_INIT_AUTOMAKE([dist-bzip2])
AC_PROG_LN_S
Index: missing
===================================================================
RCS file: /cvs/xserver/cygwin-x-doc/missing,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- a/missing 5 Sep 2003 17:37:18 -0000 1.1.1.1
+++ b/missing 13 Apr 2004 23:37:20 -0000 1.2
@@ -1,6 +1,6 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,6 +18,11 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, 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.
+
if test $# -eq 0; then
echo 1>&2 "Try \`$0 --help' for more information"
exit 1
@@ -25,6 +30,14 @@
run=:
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
@@ -65,7 +78,7 @@
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
- echo "missing 0.3 - GNU automake"
+ echo "missing 0.4 - GNU automake"
;;
-*)
@@ -74,31 +87,46 @@
exit 1
;;
- aclocal)
+ aclocal*)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acinclude.m4' or \`configure.in'. You might want
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
to install the \`Automake' and \`Perl' packages. Grab them from
any GNU archive site."
touch aclocal.m4
;;
autoconf)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`configure.in'. You might want to install the
+ you modified \`${configure_ac}'. You might want to install the
\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
archive site."
touch configure
;;
autoheader)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`acconfig.h' or \`configure.in'. You might want
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
to install the \`Autoconf' and \`GNU m4' packages. Grab them
from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in`
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
@@ -111,10 +139,15 @@
touch $touch_files
;;
- automake)
+ automake*)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
You might want to install the \`Automake' and \`Perl' packages.
Grab them from any GNU archive site."
find . -type f -name Makefile.am -print |
@@ -122,6 +155,34 @@
while read f; do touch "$f"; done
;;
+ autom4te)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+ system. You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
bison|yacc)
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
@@ -176,6 +237,11 @@
;;
help2man)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -196,6 +262,11 @@
;;
makeinfo)
+ if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+ # We have makeinfo, but it failed.
+ exit 1
+ fi
+
echo 1>&2 "\
WARNING: \`$1' is missing on your system. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -222,23 +293,23 @@
# Look for gnutar/gtar before invocation to avoid ugly error
# messages.
if (gnutar --version > /dev/null 2>&1); then
- gnutar ${1+"$@"} && exit 0
+ gnutar "$@" && exit 0
fi
if (gtar --version > /dev/null 2>&1); then
- gtar ${1+"$@"} && exit 0
+ gtar "$@" && exit 0
fi
firstarg="$1"
if shift; then
case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" ${1+"$@"} && exit 0
+ tar "$firstarg" "$@" && exit 0
;;
esac
case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" ${1+"$@"} && exit 0
+ tar "$firstarg" "$@" && exit 0
;;
esac
fi
@@ -255,7 +326,7 @@
WARNING: \`$1' is needed, and you do not seem to have it handy on your
system. You might have modified some files without having the
proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequirements for installing
+ it often tells you about the needed prerequisites for installing
this package. You may also peek at any GNU archive site, in case
some other package would contain this missing \`$1' program."
exit 1
More information about the xserver-commit
mailing list