qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to xorg-macros 1.11.0

Browse Source
This commit is contained in:
matthieu 2010-10-31 16:59:19 +00:00
parent 2d85ef3fd1
commit ced6d65688
5 changed files with 138 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/macros/COPYING
View File

@ -21,7 +21,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
Copyright 2005-2006 Sun Microsystems, Inc. All rights reserved. Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),

64
util/macros/ChangeLog
View File

@ -1,3 +1,67 @@
commit ce32345589050b17b23b18157f95f060f4c776a3
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Oct 29 20:43:53 2010 -0700
Version bump: 1.11.0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit eb7ebbbbb2a6196322cf7e48f60a11f2f65f7534
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Fri Oct 22 19:12:46 2010 -0700
docs: Take optional argument to control defaults
The typical default of enabling documentation if the correct tool is
found is usually the right thing to do. However, some packages such as
Xlib have huge amounts of documentation that few people would need in
every output format. Allow packages to specify the default for each tool
by passing an argument to the macro.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 119f35b24d446a8f7b1da4a3eaa6d6e3ad982d69
Author: Dan Nicholson <dbn.lists@gmail.com>
Date: Sat Oct 9 17:41:10 2010 -0700
docs: Use m4 to handle optional macro defaults
Handling the optional documentation parameters with m4 allows the help
string to correctly represent the default.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit aeebb46766dada64de246fd9fe72e3c523c4e70e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Sep 23 15:00:20 2010 -0400
Version bump: 1.10.1
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 1905f89998cb26410872150679501fde506a03c7
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 3 22:47:02 2010 -0700
Sun's copyrights are now owned by Oracle
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit 808d547902fad81901db94e6344838350d0eeb52
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Aug 14 15:43:38 2010 -0400
XORG_MANPAGE_SECTIONS: add substitution for apploaddir
This represents the location of the app-defaults directory
Used in app/bitmap/man for example.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit fbe66aedcf2165e43388894d3b2ee2f38e889f93 commit fbe66aedcf2165e43388894d3b2ee2f38e889f93
Author: Gaetan Nadon <memsize@videotron.ca> Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jun 24 17:36:33 2010 -0400 Date: Thu Jun 24 17:36:33 2010 -0400

20
util/macros/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh #! /bin/sh
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.62 for util-macros 1.10.0. # Generated by GNU Autoconf 2.62 for util-macros 1.11.0.
# #
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # 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. # Identity of this package.
PACKAGE_NAME='util-macros' PACKAGE_NAME='util-macros'
PACKAGE_TARNAME='util-macros' PACKAGE_TARNAME='util-macros'
PACKAGE_VERSION='1.10.0' PACKAGE_VERSION='1.11.0'
PACKAGE_STRING='util-macros 1.10.0' PACKAGE_STRING='util-macros 1.11.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am" ac_unique_file="Makefile.am"
@ -1225,7 +1225,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing. # 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. # This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF cat <<_ACEOF
\`configure' configures util-macros 1.10.0 to adapt to many kinds of systems. \`configure' configures util-macros 1.11.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]... Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1291,7 +1291,7 @@ fi
if test -n "$ac_init_help"; then if test -n "$ac_init_help"; then
case $ac_init_help in case $ac_init_help in
short | recursive ) echo "Configuration of util-macros 1.10.0:";; short | recursive ) echo "Configuration of util-macros 1.11.0:";;
esac esac
cat <<\_ACEOF cat <<\_ACEOF
@ -1365,7 +1365,7 @@ fi
test -n "$ac_init_help" && exit $ac_status test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then if $ac_init_version; then
cat <<\_ACEOF cat <<\_ACEOF
util-macros configure 1.10.0 util-macros configure 1.11.0
generated by GNU Autoconf 2.62 generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1379,7 +1379,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake. running configure, to aid debugging if configure makes a mistake.
It was created by util-macros $as_me 1.10.0, which was It was created by util-macros $as_me 1.11.0, which was
generated by GNU Autoconf 2.62. Invocation command line was generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@ $ $0 $@
@ -2029,7 +2029,7 @@ fi
# Define the identity of the package. # Define the identity of the package.
PACKAGE='util-macros' PACKAGE='util-macros'
VERSION='1.10.0' VERSION='1.11.0'
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
@ -2812,7 +2812,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their # report actual input values of CONFIG_FILES etc. instead of their
# values after options handling. # values after options handling.
ac_log=" ac_log="
This file was extended by util-macros $as_me 1.10.0, which was This file was extended by util-macros $as_me 1.11.0, which was
generated by GNU Autoconf 2.62. Invocation command line was generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES CONFIG_FILES = $CONFIG_FILES
@ -2855,7 +2855,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\ ac_cs_version="\\
util-macros config.status 1.10.0 util-macros config.status 1.11.0
configured by $0, generated by GNU Autoconf 2.62, configured by $0, generated by GNU Autoconf 2.62,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

2
util/macros/configure.ac
View File

@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.60]) AC_PREREQ([2.60])
AC_INIT([util-macros], AC_INIT([util-macros],
[1.10.0], [1.11.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[util-macros]) [util-macros])
AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_SRCDIR([Makefile.am])

105
util/macros/xorg-macros.m4.in
View File

@ -1,6 +1,6 @@
dnl @configure_input@ dnl @configure_input@
dnl 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
dnl Permission is hereby granted, free of charge, to any person obtaining a dnl Permission is hereby granted, free of charge, to any person obtaining a
dnl copy of this software and associated documentation files (the "Software"), dnl copy of this software and associated documentation files (the "Software"),
@ -188,6 +188,7 @@ MAN_SUBSTS="\
-e 's|__xservername__|Xorg|g' \ -e 's|__xservername__|Xorg|g' \
-e 's|__xconfigfile__|xorg.conf|g' \ -e 's|__xconfigfile__|xorg.conf|g' \
-e 's|__projectroot__|\$(prefix)|g' \ -e 's|__projectroot__|\$(prefix)|g' \
-e 's|__apploaddir__|\$(appdefaultdir)|g' \
-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \ -e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \ -e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \ -e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
@ -345,15 +346,17 @@ AC_SUBST(MAKE_PDF)
AC_SUBST(MAKE_HTML) AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_DOCBOOK ]) # XORG_CHECK_DOCBOOK
# XORG_WITH_XMLTO([MIN-VERSION]) # XORG_WITH_XMLTO([MIN-VERSION], [DEFAULT])
# ---------------- # ----------------
# Minimum version: 1.5.0 # 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 # 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 # 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 # 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 # 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: # Interface to module:
# HAVE_XMLTO: used in makefiles to conditionally generate documentation # HAVE_XMLTO: used in makefiles to conditionally generate documentation
@ -370,10 +373,12 @@ AC_SUBST(MAKE_HTML)
# #
AC_DEFUN([XORG_WITH_XMLTO],[ AC_DEFUN([XORG_WITH_XMLTO],[
AC_ARG_VAR([XMLTO], [Path to xmlto command]) AC_ARG_VAR([XMLTO], [Path to xmlto command])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(xmlto, AC_ARG_WITH(xmlto,
AS_HELP_STRING([--with-xmlto], AS_HELP_STRING([--with-xmlto],
[Use xmlto to regenerate documentation (default: yes, if installed)]), [Use xmlto to regenerate documentation (default: ]_defopt[)]),
[use_xmlto=$withval], [use_xmlto=auto]) [use_xmlto=$withval], [use_xmlto=]_defopt)
m4_undefine([_defopt])
if test "x$use_xmlto" = x"auto"; then if test "x$use_xmlto" = x"auto"; then
AC_PATH_PROG([XMLTO], [xmlto]) AC_PATH_PROG([XMLTO], [xmlto])
@ -427,15 +432,17 @@ AM_CONDITIONAL([HAVE_XMLTO_TEXT], [test $have_xmlto_text = yes])
AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes]) AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
]) # XORG_WITH_XMLTO ]) # XORG_WITH_XMLTO
# XORG_WITH_ASCIIDOC([MIN-VERSION]) # XORG_WITH_ASCIIDOC([MIN-VERSION], [DEFAULT])
# ---------------- # ----------------
# Minimum version: 1.5.0 # 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 # 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 # 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 # presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-asciidoc option, it allows maximum flexibilty in making decisions # the --with-asciidoc option, it allows maximum flexibilty in making decisions
# as whether or not to use the asciidoc package. # as whether or not to use the asciidoc package. When DEFAULT is not specified,
# --with-asciidoc assumes 'auto'.
# #
# Interface to module: # Interface to module:
# HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation # HAVE_ASCIIDOC: used in makefiles to conditionally generate documentation
@ -448,10 +455,12 @@ AM_CONDITIONAL([HAVE_XMLTO], [test "$have_xmlto" = yes])
# #
AC_DEFUN([XORG_WITH_ASCIIDOC],[ AC_DEFUN([XORG_WITH_ASCIIDOC],[
AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command]) AC_ARG_VAR([ASCIIDOC], [Path to asciidoc command])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(asciidoc, AC_ARG_WITH(asciidoc,
AS_HELP_STRING([--with-asciidoc], AS_HELP_STRING([--with-asciidoc],
[Use asciidoc to regenerate documentation (default: yes, if installed)]), [Use asciidoc to regenerate documentation (default: ]_defopt[)]),
[use_asciidoc=$withval], [use_asciidoc=auto]) [use_asciidoc=$withval], [use_asciidoc=]_defopt)
m4_undefine([_defopt])
if test "x$use_asciidoc" = x"auto"; then if test "x$use_asciidoc" = x"auto"; then
AC_PATH_PROG([ASCIIDOC], [asciidoc]) AC_PATH_PROG([ASCIIDOC], [asciidoc])
@ -492,15 +501,17 @@ fi])
AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes]) AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
]) # XORG_WITH_ASCIIDOC ]) # XORG_WITH_ASCIIDOC
# XORG_WITH_DOXYGEN([MIN-VERSION]) # XORG_WITH_DOXYGEN([MIN-VERSION], [DEFAULT])
# -------------------------------- # --------------------------------
# Minimum version: 1.5.0 # 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 # 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 # 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 # presence of the tool and obtain it's path in separate variables. Coupled with
# the --with-doxygen option, it allows maximum flexibilty in making decisions # the --with-doxygen option, it allows maximum flexibilty in making decisions
# as whether or not to use the doxygen package. # as whether or not to use the doxygen package. When DEFAULT is not specified,
# --with-doxygen assumes 'auto'.
# #
# Interface to module: # Interface to module:
# HAVE_DOXYGEN: used in makefiles to conditionally generate documentation # HAVE_DOXYGEN: used in makefiles to conditionally generate documentation
@ -513,10 +524,12 @@ AM_CONDITIONAL([HAVE_ASCIIDOC], [test "$have_asciidoc" = yes])
# #
AC_DEFUN([XORG_WITH_DOXYGEN],[ AC_DEFUN([XORG_WITH_DOXYGEN],[
AC_ARG_VAR([DOXYGEN], [Path to doxygen command]) AC_ARG_VAR([DOXYGEN], [Path to doxygen command])
m4_define([_defopt], m4_default([$2], [auto]))
AC_ARG_WITH(doxygen, AC_ARG_WITH(doxygen,
AS_HELP_STRING([--with-doxygen], AS_HELP_STRING([--with-doxygen],
[Use doxygen to regenerate documentation (default: yes, if installed)]), [Use doxygen to regenerate documentation (default: ]_defopt[)]),
[use_doxygen=$withval], [use_doxygen=auto]) [use_doxygen=$withval], [use_doxygen=]_defopt)
m4_undefine([_defopt])
if test "x$use_doxygen" = x"auto"; then if test "x$use_doxygen" = x"auto"; then
AC_PATH_PROG([DOXYGEN], [doxygen]) AC_PATH_PROG([DOXYGEN], [doxygen])
@ -557,15 +570,17 @@ fi])
AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes]) AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
]) # XORG_WITH_DOXYGEN ]) # XORG_WITH_DOXYGEN
# XORG_WITH_GROFF # XORG_WITH_GROFF([DEFAULT])
# ---------------- # ----------------
# Minimum version: 1.6.0 # Minimum version: 1.6.0
# Minimum version for optional DEFAULT argument: 1.11.0
# #
# Documentation tools are not always available on all platforms and sometimes # 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 # 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 # 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 # the --with-groff option, it allows maximum flexibilty in making decisions
# as whether or not to use the groff package. # as whether or not to use the groff package. When DEFAULT is not specified,
# --with-groff assumes 'auto'.
# #
# Interface to module: # Interface to module:
# HAVE_GROFF: used in makefiles to conditionally generate documentation # HAVE_GROFF: used in makefiles to conditionally generate documentation
@ -594,10 +609,12 @@ AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = yes])
# #
AC_DEFUN([XORG_WITH_GROFF],[ AC_DEFUN([XORG_WITH_GROFF],[
AC_ARG_VAR([GROFF], [Path to groff command]) AC_ARG_VAR([GROFF], [Path to groff command])
m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(groff, AC_ARG_WITH(groff,
AS_HELP_STRING([--with-groff], AS_HELP_STRING([--with-groff],
[Use groff to regenerate documentation (default: yes, if installed)]), [Use groff to regenerate documentation (default: ]_defopt[)]),
[use_groff=$withval], [use_groff=auto]) [use_groff=$withval], [use_groff=]_defopt)
m4_undefine([_defopt])
if test "x$use_groff" = x"auto"; then if test "x$use_groff" = x"auto"; then
AC_PATH_PROG([GROFF], [groff]) AC_PATH_PROG([GROFF], [groff])
@ -660,15 +677,17 @@ AM_CONDITIONAL([HAVE_GROFF_MM], [test "$groff_mm_works" = yes])
AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes]) AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
]) # XORG_WITH_GROFF ]) # XORG_WITH_GROFF
# XORG_WITH_FOP # XORG_WITH_FOP([DEFAULT])
# ---------------- # ----------------
# Minimum version: 1.6.0 # Minimum version: 1.6.0
# Minimum version for optional DEFAULT argument: 1.11.0
# #
# Documentation tools are not always available on all platforms and sometimes # 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 # 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 # 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 # the --with-fop option, it allows maximum flexibilty in making decisions
# as whether or not to use the fop package. # as whether or not to use the fop package. When DEFAULT is not specified,
# --with-fop assumes 'auto'.
# #
# Interface to module: # Interface to module:
# HAVE_FOP: used in makefiles to conditionally generate documentation # HAVE_FOP: used in makefiles to conditionally generate documentation
@ -681,10 +700,12 @@ AM_CONDITIONAL([HAVE_GROFF_HTML], [test "$have_groff_html" = yes])
# #
AC_DEFUN([XORG_WITH_FOP],[ AC_DEFUN([XORG_WITH_FOP],[
AC_ARG_VAR([FOP], [Path to fop command]) AC_ARG_VAR([FOP], [Path to fop command])
m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(fop, AC_ARG_WITH(fop,
AS_HELP_STRING([--with-fop], AS_HELP_STRING([--with-fop],
[Use fop to regenerate documentation (default: yes, if installed)]), [Use fop to regenerate documentation (default: ]_defopt[)]),
[use_fop=$withval], [use_fop=auto]) [use_fop=$withval], [use_fop=]_defopt)
m4_undefine([_defopt])
if test "x$use_fop" = x"auto"; then if test "x$use_fop" = x"auto"; then
AC_PATH_PROG([FOP], [fop]) AC_PATH_PROG([FOP], [fop])
@ -711,15 +732,17 @@ fi
AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes]) AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
]) # XORG_WITH_FOP ]) # XORG_WITH_FOP
# XORG_WITH_PS2PDF # XORG_WITH_PS2PDF([DEFAULT])
# ---------------- # ----------------
# Minimum version: 1.6.0 # Minimum version: 1.6.0
# Minimum version for optional DEFAULT argument: 1.11.0
# #
# Documentation tools are not always available on all platforms and sometimes # 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 # 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 # 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 # the --with-ps2pdf option, it allows maximum flexibilty in making decisions
# as whether or not to use the ps2pdf package. # as whether or not to use the ps2pdf package. When DEFAULT is not specified,
# --with-ps2pdf assumes 'auto'.
# #
# Interface to module: # Interface to module:
# HAVE_PS2PDF: used in makefiles to conditionally generate documentation # HAVE_PS2PDF: used in makefiles to conditionally generate documentation
@ -732,10 +755,12 @@ AM_CONDITIONAL([HAVE_FOP], [test "$have_fop" = yes])
# #
AC_DEFUN([XORG_WITH_PS2PDF],[ AC_DEFUN([XORG_WITH_PS2PDF],[
AC_ARG_VAR([PS2PDF], [Path to ps2pdf command]) AC_ARG_VAR([PS2PDF], [Path to ps2pdf command])
m4_define([_defopt], m4_default([$1], [auto]))
AC_ARG_WITH(ps2pdf, AC_ARG_WITH(ps2pdf,
AS_HELP_STRING([--with-ps2pdf], AS_HELP_STRING([--with-ps2pdf],
[Use ps2pdf to regenerate documentation (default: yes, if installed)]), [Use ps2pdf to regenerate documentation (default: ]_defopt[)]),
[use_ps2pdf=$withval], [use_ps2pdf=auto]) [use_ps2pdf=$withval], [use_ps2pdf=]_defopt)
m4_undefine([_defopt])
if test "x$use_ps2pdf" = x"auto"; then if test "x$use_ps2pdf" = x"auto"; then
AC_PATH_PROG([PS2PDF], [ps2pdf]) AC_PATH_PROG([PS2PDF], [ps2pdf])
@ -786,14 +811,12 @@ AM_CONDITIONAL([HAVE_PS2PDF], [test "$have_ps2pdf" = yes])
# parm1: specify the default value, yes or no. # parm1: specify the default value, yes or no.
# #
AC_DEFUN([XORG_ENABLE_DOCS],[ AC_DEFUN([XORG_ENABLE_DOCS],[
default=$1 m4_define([default], m4_default([$1], [yes]))
if test "x$default" = x ; then
default="yes"
fi
AC_ARG_ENABLE(docs, AC_ARG_ENABLE(docs,
AS_HELP_STRING([--enable-docs], AS_HELP_STRING([--enable-docs],
[Enable building the documentation (default: yes)]), [Enable building the documentation (default: ]default[)]),
[build_docs=$enableval], [build_docs=$default]) [build_docs=$enableval], [build_docs=]default)
m4_undefine([default])
AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes]) AM_CONDITIONAL(ENABLE_DOCS, [test x$build_docs = xyes])
AC_MSG_CHECKING([whether to build documentation]) AC_MSG_CHECKING([whether to build documentation])
AC_MSG_RESULT([$build_docs]) AC_MSG_RESULT([$build_docs])
@ -821,14 +844,12 @@ AC_MSG_RESULT([$build_docs])
# parm1: specify the default value, yes or no. # parm1: specify the default value, yes or no.
# #
AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[ AC_DEFUN([XORG_ENABLE_DEVEL_DOCS],[
devel_default=$1 m4_define([devel_default], m4_default([$1], [yes]))
if test "x$devel_default" = x ; then
devel_default="yes"
fi
AC_ARG_ENABLE(devel-docs, AC_ARG_ENABLE(devel-docs,
AS_HELP_STRING([--enable-devel-docs], AS_HELP_STRING([--enable-devel-docs],
[Enable building the developer documentation (default: yes)]), [Enable building the developer documentation (default: ]devel_default[)]),
[build_devel_docs=$enableval], [build_devel_docs=$devel_default]) [build_devel_docs=$enableval], [build_devel_docs=]devel_default)
m4_undefine([devel_default])
AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes]) AM_CONDITIONAL(ENABLE_DEVEL_DOCS, [test x$build_devel_docs = xyes])
AC_MSG_CHECKING([whether to build developer documentation]) AC_MSG_CHECKING([whether to build developer documentation])
AC_MSG_RESULT([$build_devel_docs]) AC_MSG_RESULT([$build_devel_docs])
@ -856,14 +877,12 @@ AC_MSG_RESULT([$build_devel_docs])
# parm1: specify the default value, yes or no. # parm1: specify the default value, yes or no.
# #
AC_DEFUN([XORG_ENABLE_SPECS],[ AC_DEFUN([XORG_ENABLE_SPECS],[
spec_default=$1 m4_define([spec_default], m4_default([$1], [yes]))
if test "x$spec_default" = x ; then
spec_default="yes"
fi
AC_ARG_ENABLE(specs, AC_ARG_ENABLE(specs,
AS_HELP_STRING([--enable-specs], AS_HELP_STRING([--enable-specs],
[Enable building the specs (default: yes)]), [Enable building the specs (default: ]spec_default[)]),
[build_specs=$enableval], [build_specs=$spec_default]) [build_specs=$enableval], [build_specs=]spec_default)
m4_undefine([spec_default])
AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes]) AM_CONDITIONAL(ENABLE_SPECS, [test x$build_specs = xyes])
AC_MSG_CHECKING([whether to build functional specifications]) AC_MSG_CHECKING([whether to build functional specifications])
AC_MSG_RESULT([$build_specs]) AC_MSG_RESULT([$build_specs])