debian/changelog | 6 util-macros/ChangeLog | 159 ++++++++++++++++++ util-macros/configure | 20 +- util-macros/configure.ac | 2 util-macros/xorg-macros.m4.in | 362 ++++++++++++++++++++++++++++++++++++++++-- 5 files changed, 523 insertions(+), 26 deletions(-)
New commits: commit d96c58037a954d41a35810dddca0e2ea5a55b83d Author: Julien Cristau <[email protected]> Date: Sat Apr 3 17:53:51 2010 +0200 util-macros 1.6.1. diff --git a/debian/changelog b/debian/changelog index 588a23b..d799d0c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xutils-dev (1:7.5+3) UNRELEASED; urgency=low + + * util-macros 1.6.1. + + -- Julien Cristau <[email protected]> Sat, 03 Apr 2010 17:53:38 +0200 + xutils-dev (1:7.5+2) unstable; urgency=low [ Julien Cristau ] diff --git a/util-macros/ChangeLog b/util-macros/ChangeLog index d0fd11c..2ea646d 100644 --- a/util-macros/ChangeLog +++ b/util-macros/ChangeLog @@ -1,3 +1,162 @@ +commit be6c44abf825a5814ca836165f62b66c30e7a966 +Author: Gaetan Nadon <[email protected]> +Date: Thu Mar 11 11:11:42 2010 -0500 + + Version bump: 1.6.1 + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit b1660bfd095627778496bf403a741ff6ad44659a +Author: Gaetan Nadon <[email protected]> +Date: Tue Mar 9 10:52:15 2010 -0500 + + doc: fix typo in AC_MSG_CHECKING for XORG_CHECK_LINUXDOC + + The message should start with a lowercase letter. + + Reviewed-by: Jeremy Huddleston <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Reviewed-by: Dan Nicholson <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 2c833326fdd83039999b5563eb9f621ff57e3bf5 +Author: Gaetan Nadon <[email protected]> +Date: Tue Mar 9 10:13:22 2010 -0500 + + doc: Specify minimum xmlto version to XORG_WITH_DOXYGEN + + Adds an optional parameter to XORG_WITH_DOXYGEN to enforce a minimum + version needed like the asciidoc version check. + + Reviewed-by: Dan Nicholson <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit d7cedc8ce552581c9acbfbe373cbee16a689abef +Author: Dan Nicholson <[email protected]> +Date: Wed Mar 3 20:16:46 2010 -0800 + + doc: Specify minimum xmlto version to XORG_WITH_XMLTO + + Adds an optional parameter to XORG_WITH_XMLTO to enforce a minimum + version needed like the asciidoc version check. + + Signed-off-by: Dan Nicholson <[email protected]> + +commit c87b5e9657e3fa1270f7283ab8b16aed1be7b5fd +Author: Dan Nicholson <[email protected]> +Date: Wed Mar 3 20:16:45 2010 -0800 + + doc: Specify minimum asciidoc version to XORG_WITH_ASCIIDOC + + Adds an optional parameter to XORG_WITH_ASCIIDOC to enforce a minimum + version needed. + + Tested-by: Gaetan Nadon <[email protected]> + Tested-by: Fernando Carrijo <[email protected]> + Signed-off-by: Dan Nicholson <[email protected]> + +commit a01b2ce6b196555660a64c43623acab1f6fea76a +Author: Dan Nicholson <[email protected]> +Date: Sat Feb 27 11:28:08 2010 -0800 + + silent: Set AM_DEFAULT_VERBOSITY for compatibility on older automake + + Custom silent rules will become recursive on older automake where + AM_SILENT_RULES is not included. Set AM_DEFAULT_VERBOSITY in this + fallback case for compatibility. + + Signed-off-by: Dan Nicholson <[email protected]> + Reviewed-by: Gaetan Nadon <[email protected]> + +commit de24a6d42eafa1aaa089927e9b2c2c7ef8827550 +Author: Gaetan Nadon <[email protected]> +Date: Tue Feb 23 11:03:42 2010 -0500 + + AM_SILENT_RULES: move from XORG_CWARNFLAGS to XORG_DEFAULT_OPTIONS + + This m4 statement does not belong in the macro for compiler + warning flags. It is more appropriate to group it with the macro + providing default options for X.Org modules. + + Reviewed-by: Dan Nicholson <[email protected]> + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 0851a3455fddbbaef73fae088469a48f2f975783 +Author: Gaetan Nadon <[email protected]> +Date: Fri Jan 29 14:02:26 2010 -0500 + + Version bump: 1.6.0 + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit a8f386498bb18c7f95f874a56e3526a1b0b3029c +Author: Gaetan Nadon <[email protected]> +Date: Tue Feb 2 17:14:00 2010 -0500 + + doc: add XORG_ENABLE_DEVEL_DOCS and XORG_ENABLE_SPECS + + Identical to XORG_ENABLE_DOCS, this macros allows modules + to classify docs per type and selectively control their building. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 1df1e7fd649b4ff3e00a908d4ade54bc6b32892f +Author: Gaetan Nadon <[email protected]> +Date: Sun Jan 31 08:56:50 2010 -0500 + + XORG_WITH_GROFF: add tests for -ms and -mm macro packages + + OS and distros often splits groff in a basic and full package, the former + having the groff program and the later having devices, fonts and macros + Checking for the groff executable is not enough. + + Use HAVE_GROFF if you do not use -ms or -mm + Use HAVE_GROFF_MS and/or HAVE_GROFF_MM otherwise + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 6fce3ec9157794d1a90ae28b2615c00ce84f95ed +Author: Gaetan Nadon <[email protected]> +Date: Fri Jan 29 10:47:40 2010 -0500 + + Add XORG_ENABLE_DOCS to control the building of documentation + + This macro is intended for modules to control, in a single option, + the building of the documentaion. Using --enable-docs=no, all + documentation is skipped, regardless of the tool used to build it. + + It should be used in conjunction with other XORG_WITH_* macros + which handle cases where some specific tool is not available. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit df1fe112b8fca77ce10ecfe2b9e4a082b29b732d +Author: Gaetan Nadon <[email protected]> +Date: Fri Jan 29 10:25:00 2010 -0500 + + Additional doc macros for GROFF, FOP and PS2PDF + + Identical to XMLTO, DOXYGEN and ASCIIDOC. + Allow platform builders to selectively turn off tools that + are not present or back level. Matching documentation target + will be shipped. + + For example, --without-fop will skip the pdf format while + allowing other formats to proceed. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 4411328d3200392e9b8d830a45d9ac679abb4ead +Author: Jeremy Huddleston <[email protected]> +Date: Wed Feb 3 23:39:37 2010 -0800 + + Add -Wformat=2 to the default CWARNFLAGS + + This will include -Wformat-security to catch possible security problems in formatting in printf, scanf, etc. + + Signed-off-by: Jeremy Huddleston <[email protected]> + Reviewed-by: Matt Turner <[email protected]> + commit 46d22716aed8d7e8ee188c2f2d2b3ba600dc3dd3 Author: Gaetan Nadon <[email protected]> Date: Sun Jan 17 21:21:10 2010 -0500 diff --git a/util-macros/configure b/util-macros/configure index d2239d0..2015e0a 100755 --- a/util-macros/configure +++ b/util-macros/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for util-macros 1.5.0. +# Generated by GNU Autoconf 2.63 for util-macros 1.6.1. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -596,8 +596,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='util-macros' PACKAGE_TARNAME='util-macros' -PACKAGE_VERSION='1.5.0' -PACKAGE_STRING='util-macros 1.5.0' +PACKAGE_VERSION='1.6.1' +PACKAGE_STRING='util-macros 1.6.1' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' ac_unique_file="Makefile.am" @@ -1228,7 +1228,7 @@ if test "$ac_init_help" = "long"; then # 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 util-macros 1.5.0 to adapt to many kinds of systems. +\`configure' configures util-macros 1.6.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1294,7 +1294,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of util-macros 1.5.0:";; + short | recursive ) echo "Configuration of util-macros 1.6.1:";; esac cat <<\_ACEOF @@ -1374,7 +1374,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -util-macros configure 1.5.0 +util-macros configure 1.6.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1388,7 +1388,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by util-macros $as_me 1.5.0, which was +It was created by util-macros $as_me 1.6.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2105,7 +2105,7 @@ fi # Define the identity of the package. PACKAGE='util-macros' - VERSION='1.5.0' + VERSION='1.6.1' cat >>confdefs.h <<_ACEOF @@ -2899,7 +2899,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by util-macros $as_me 1.5.0, which was +This file was extended by util-macros $as_me 1.6.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -2949,7 +2949,7 @@ Report bugs to <[email protected]>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -util-macros config.status 1.5.0 +util-macros config.status 1.6.1 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/util-macros/configure.ac b/util-macros/configure.ac index ad244ba..b69a6b1 100644 --- a/util-macros/configure.ac +++ b/util-macros/configure.ac @@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ([2.60]) AC_INIT([util-macros], - [1.5.0], + [1.6.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [util-macros]) AC_CONFIG_SRCDIR([Makefile.am]) diff --git a/util-macros/xorg-macros.m4.in b/util-macros/xorg-macros.m4.in index caf61c2..055c83e 100644 --- a/util-macros/xorg-macros.m4.in +++ b/util-macros/xorg-macros.m4.in @@ -201,7 +201,7 @@ fi 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 BUILDDOC=yes @@ -213,7 +213,7 @@ 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 BUILDPDFDOC=yes @@ -261,7 +261,7 @@ AC_PATH_PROG(DOCBOOKPDF, docbook2pdf) AC_PATH_PROG(DOCBOOKHTML, docbook2html) AC_PATH_PROG(DOCBOOKTXT, docbook2txt) -AC_MSG_CHECKING([Whether to build text documentation]) +AC_MSG_CHECKING([whether to build text documentation]) if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKTXT != x && test x$BUILD_TXTDOC != xno; then BUILDTXTDOC=yes @@ -269,7 +269,7 @@ fi AM_CONDITIONAL(BUILD_TXTDOC, [test x$BUILDTXTDOC = xyes]) AC_MSG_RESULT([$BUILDTXTDOC]) -AC_MSG_CHECKING([Whether to build PDF documentation]) +AC_MSG_CHECKING([whether to build PDF documentation]) if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPDF != x && test x$BUILD_PDFDOC != xno; then BUILDPDFDOC=yes @@ -277,7 +277,7 @@ fi AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes]) AC_MSG_RESULT([$BUILDPDFDOC]) -AC_MSG_CHECKING([Whether to build PostScript documentation]) +AC_MSG_CHECKING([whether to build PostScript documentation]) if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKPS != x && test x$BUILD_PSDOC != xno; then BUILDPSDOC=yes @@ -285,7 +285,7 @@ fi AM_CONDITIONAL(BUILD_PSDOC, [test x$BUILDPSDOC = xyes]) AC_MSG_RESULT([$BUILDPSDOC]) -AC_MSG_CHECKING([Whether to build HTML documentation]) +AC_MSG_CHECKING([whether to build HTML documentation]) if test x$HAVE_DEFS_ENT != x && test x$DOCBOOKHTML != x && test x$BUILD_HTMLDOC != xno; then BUILDHTMLDOC=yes @@ -304,7 +304,7 @@ AC_SUBST(MAKE_PDF) AC_SUBST(MAKE_HTML) ]) # XORG_CHECK_DOCBOOK -# XORG_WITH_XMLTO +# XORG_WITH_XMLTO([MIN-VERSION]) # ---------------- # Minimum version: 1.5.0 # @@ -352,10 +352,24 @@ elif test "x$use_xmlto" = x"no" ; then else AC_MSG_ERROR([--with-xmlto expects 'yes' or 'no']) fi +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]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) -]) # XORG_CHECK_XMLTO +]) # XORG_WITH_XMLTO -# XORG_WITH_ASCIIDOC +# XORG_WITH_ASCIIDOC([MIN-VERSION]) # ---------------- # Minimum version: 1.5.0 # @@ -403,11 +417,25 @@ elif test "x$use_asciidoc" = x"no" ; then else AC_MSG_ERROR([--with-asciidoc expects 'yes' or 'no']) fi +m4_ifval([$1], +[if test "$have_asciidoc" = yes; then + # scrape the asciidoc version + AC_MSG_CHECKING([the asciidoc version]) + asciidoc_version=`$ASCIIDOC --version 2>/dev/null | cut -d' ' -f2` + AC_MSG_RESULT([$asciidoc_version]) + AS_VERSION_COMPARE([$asciidoc_version], [$1], + [if test "x$use_asciidoc" = xauto; then + AC_MSG_WARN([asciidoc version $asciidoc_version found, but $1 needed]) + have_asciidoc=no + else + AC_MSG_ERROR([asciidoc version $asciidoc_version found, but $1 needed]) + fi]) +fi]) AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) -]) # XORG_CHECK_ASCIIDOC +]) # XORG_WITH_ASCIIDOC -# XORG_WITH_DOXYGEN -# ---------------- +# XORG_WITH_DOXYGEN([MIN-VERSION]) +# -------------------------------- # Minimum version: 1.5.0 # # Documentation tools are not always available on all platforms and sometimes @@ -454,8 +482,311 @@ elif test "x$use_doxygen" = x"no" ; then else AC_MSG_ERROR([--with-doxygen expects 'yes' or 'no']) fi +m4_ifval([$1], +[if test "$have_doxygen" = yes; then + # scrape the doxygen version + AC_MSG_CHECKING([the doxygen version]) + doxygen_version=`$DOXYGEN --version 2>/dev/null` + AC_MSG_RESULT([$doxygen_version]) + AS_VERSION_COMPARE([$doxygen_version], [$1], + [if test "x$use_doxygen" = xauto; then + AC_MSG_WARN([doxygen version $doxygen_version found, but $1 needed]) + have_doxygen=no + else + AC_MSG_ERROR([doxygen version $doxygen_version found, but $1 needed]) + fi]) +fi]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) -]) # XORG_CHECK_DOXYGEN +]) # XORG_WITH_DOXYGEN + +# XORG_WITH_GROFF +# ---------------- +# Minimum version: 1.6.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-groff option, it allows maximum flexibilty in making decisions +# as whether or not to use the groff package. +# +# Interface to module: +# HAVE_GROFF: used in makefiles to conditionally generate documentation +# HAVE_GROFF_MM: the memorandum macros (-mm) package +# HAVE_GROFF_MS: the -ms macros package +# GROFF: returns the path of the groff program found +# returns the path set by the user in the environment +# --with-groff: 'yes' user instructs the module to use groff +# 'no' user instructs the module not to use groff +# +# If the user sets the value of GROFF, AC_PATH_PROG skips testing the path. +# +# OS and distros often splits groff in a basic and full package, the former +# having the groff program and the later having devices, fonts and macros +# Checking for the groff executable is not enough. +# +# If macros are missing, we cannot assume that groff is useless, so we don't +# unset HAVE_GROFF or GROFF env variables. +# HAVE_GROFF_?? can never be true while HAVE_GROFF is false. +# +AC_DEFUN([XORG_WITH_GROFF],[ +AC_ARG_VAR([GROFF], [Path to groff command]) +AC_ARG_WITH(groff, + AS_HELP_STRING([--with-groff], + [Use groff to regenerate documentation (default: yes, if installed)]), + [use_groff=$withval], [use_groff=auto]) + +if test "x$use_groff" = x"auto"; then + AC_PATH_PROG([GROFF], [groff]) + if test "x$GROFF" = "x"; then + AC_MSG_WARN([groff not found - documentation targets will be skipped]) + have_groff=no + else + have_groff=yes + fi +elif test "x$use_groff" = x"yes" ; then + AC_PATH_PROG([GROFF], [groff]) + if test "x$GROFF" = "x"; then + AC_MSG_ERROR([--with-groff=yes specified but groff not found in PATH]) + fi + have_groff=yes +elif test "x$use_groff" = x"no" ; then + if test "x$GROFF" != "x"; then + AC_MSG_WARN([ignoring GROFF environment variable since --with-groff=no was specified]) + fi + have_groff=no +else + AC_MSG_ERROR([--with-groff expects 'yes' or 'no']) +fi +# We have groff, test for the presence of the macro packages +if test "x$have_groff" = x"yes"; then + AC_MSG_CHECKING([for ${GROFF} -ms macros]) + if ${GROFF} -ms -I. /dev/null >/dev/null 2>&1 ; then + groff_ms_works=yes + else + groff_ms_works=no + fi + AC_MSG_RESULT([$groff_ms_works]) + AC_MSG_CHECKING([for ${GROFF} -mm macros]) + if ${GROFF} -mm -I. /dev/null >/dev/null 2>&1 ; then + groff_mm_works=yes + else + groff_mm_works=no + fi + AC_MSG_RESULT([$groff_mm_works]) +fi +AM_CONDITIONAL([HAVE_GROFF], [test "$have_groff" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MS], [test "$groff_ms_works" = yes]) +AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes]) +]) # XORG_WITH_GROFF + +# XORG_WITH_FOP +# ---------------- +# Minimum version: 1.6.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-fop option, it allows maximum flexibilty in making decisions +# as whether or not to use the fop package. +# +# Interface to module: +# HAVE_FOP: used in makefiles to conditionally generate documentation +# FOP: returns the path of the fop program found +# returns the path set by the user in the environment +# --with-fop: 'yes' user instructs the module to use fop +# 'no' user instructs the module not to use fop +# +# If the user sets the value of FOP, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_FOP],[ +AC_ARG_VAR([FOP], [Path to fop command]) +AC_ARG_WITH(fop, + AS_HELP_STRING([--with-fop], + [Use fop to regenerate documentation (default: yes, if installed)]), + [use_fop=$withval], [use_fop=auto]) + +if test "x$use_fop" = x"auto"; then + AC_PATH_PROG([FOP], [fop]) + if test "x$FOP" = "x"; then + AC_MSG_WARN([fop not found - documentation targets will be skipped]) + have_fop=no + else + have_fop=yes + fi +elif test "x$use_fop" = x"yes" ; then + AC_PATH_PROG([FOP], [fop]) + if test "x$FOP" = "x"; then + AC_MSG_ERROR([--with-fop=yes specified but fop not found in PATH]) + fi + have_fop=yes +elif test "x$use_fop" = x"no" ; then + if test "x$FOP" != "x"; then + AC_MSG_WARN([ignoring FOP environment variable since --with-fop=no was specified]) + fi + have_fop=no +else + AC_MSG_ERROR([--with-fop expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) +]) # XORG_WITH_FOP + +# XORG_WITH_PS2PDF +# ---------------- +# Minimum version: 1.6.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-ps2pdf option, it allows maximum flexibilty in making decisions +# as whether or not to use the ps2pdf package. +# +# Interface to module: +# HAVE_PS2PDF: used in makefiles to conditionally generate documentation +# PS2PDF: returns the path of the ps2pdf program found +# returns the path set by the user in the environment +# --with-ps2pdf: 'yes' user instructs the module to use ps2pdf +# 'no' user instructs the module not to use ps2pdf +# +# If the user sets the value of PS2PDF, AC_PATH_PROG skips testing the path. +# +AC_DEFUN([XORG_WITH_PS2PDF],[ +AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) +AC_ARG_WITH(ps2pdf, + AS_HELP_STRING([--with-ps2pdf], + [Use ps2pdf to regenerate documentation (default: yes, if installed)]), + [use_ps2pdf=$withval], [use_ps2pdf=auto]) + +if test "x$use_ps2pdf" = x"auto"; then + AC_PATH_PROG([PS2PDF], [ps2pdf]) + if test "x$PS2PDF" = "x"; then + AC_MSG_WARN([ps2pdf not found - documentation targets will be skipped]) + have_ps2pdf=no + else + have_ps2pdf=yes + fi +elif test "x$use_ps2pdf" = x"yes" ; then + AC_PATH_PROG([PS2PDF], [ps2pdf]) + if test "x$PS2PDF" = "x"; then + AC_MSG_ERROR([--with-ps2pdf=yes specified but ps2pdf not found in PATH]) + fi + have_ps2pdf=yes +elif test "x$use_ps2pdf" = x"no" ; then + if test "x$PS2PDF" != "x"; then + AC_MSG_WARN([ignoring PS2PDF environment variable since --with-ps2pdf=no was specified]) + fi + have_ps2pdf=no +else + AC_MSG_ERROR([--with-ps2pdf expects 'yes' or 'no']) +fi +AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes]) +]) # XORG_WITH_PS2PDF + +# XORG_ENABLE_DOCS (enable_docs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# Documentation tools are not always available on all platforms and sometimes +# not at the appropriate level. This macro enables a builder to skip all +# documentation targets except traditional man pages. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_DOCS: used in makefiles to conditionally generate documentation +# --enable-docs: 'yes' user instructs the module to generate docs +# 'no' user instructs the module not to generate docs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_DOCS],[ +default=$1 +if test "x$default" = x ; then + default="yes" +fi +AC_ARG_ENABLE(docs, + AS_HELP_STRING([--enable-docs], + [Enable building the documentation (default: yes)]), + [build_docs=$enableval], [build_docs=$default]) +AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) +AC_MSG_CHECKING([whether to build documentation]) +AC_MSG_RESULT([$build_docs]) +]) # XORG_ENABLE_DOCS + +# XORG_ENABLE_DEVEL_DOCS (enable_devel_docs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# This macro enables a builder to skip all developer documentation. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_DEVEL_DOCS: used in makefiles to conditionally generate developer docs +# --enable-devel-docs: 'yes' user instructs the module to generate developer docs +# 'no' user instructs the module not to generate developer docs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ +devel_default=$1 +if test "x$devel_default" = x ; then + devel_default="yes" +fi +AC_ARG_ENABLE(devel-docs, + AS_HELP_STRING([--enable-devel-docs], + [Enable building the developer documentation (default: yes)]), + [build_devel_docs=$enableval], [build_devel_docs=$devel_default]) +AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) +AC_MSG_CHECKING([whether to build developer documentation]) +AC_MSG_RESULT([$build_devel_docs]) +]) # XORG_ENABLE_DEVEL_DOCS + +# XORG_ENABLE_SPECS (enable_specs=yes) +# ---------------- +# Minimum version: 1.6.0 +# +# This macro enables a builder to skip all functional specification targets. +# Combined with the specific tool checking macros XORG_WITH_*, it provides +# maximum flexibilty in controlling documentation building. +# Refer to: +# XORG_WITH_XMLTO --with-xmlto +# XORG_WITH_ASCIIDOC --with-asciidoc +# XORG_WITH_DOXYGEN --with-doxygen +# XORG_WITH_FOP --with-fop +# XORG_WITH_GROFF --with-groff +# XORG_WITH_PS2PDF --with-ps2pdf +# +# Interface to module: +# ENABLE_SPECS: used in makefiles to conditionally generate specs +# --enable-specs: 'yes' user instructs the module to generate specs +# 'no' user instructs the module not to generate specs +# parm1: specify the default value, yes or no. +# +AC_DEFUN([XORG_ENABLE_SPECS],[ +spec_default=$1 +if test "x$spec_default" = x ; then + spec_default="yes" +fi +AC_ARG_ENABLE(specs, + AS_HELP_STRING([--enable-specs], + [Enable building the specs (default: yes)]), + [build_specs=$enableval], [build_specs=$spec_default]) +AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) +AC_MSG_CHECKING([whether to build functional specifications]) +AC_MSG_RESULT([$build_specs]) +]) # XORG_ENABLE_SPECS # XORG_CHECK_MALLOC_ZERO # ---------------------- @@ -589,7 +920,7 @@ AC_REQUIRE([AC_PROG_CC]) if test "x$GCC" = xyes ; then CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ --Wbad-function-cast" +-Wbad-function-cast -Wformat=2" case `$CC -dumpversion` in 3.4.* | 4.*) CWARNFLAGS="$CWARNFLAGS -Wold-style-definition -Wdeclaration-after-statement" @@ -602,7 +933,6 @@ else fi fi AC_SUBST(CWARNFLAGS) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) ]) # XORG_CWARNFLAGS # XORG_STRICT_OPTION @@ -647,6 +977,8 @@ XORG_RELEASE_VERSION XORG_CHANGELOG XORG_INSTALL XORG_MANPAGE_SECTIONS +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], + [AC_SUBST([AM_DEFAULT_VERBOSITY], [1])]) ]) # XORG_DEFAULT_OPTIONS # XORG_INSTALL() -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
