summaryrefslogtreecommitdiff
path: root/xorg-macros.m4.in
AgeCommit message (Collapse)Author
2010-08-14XORG_MANPAGE_SECTIONS: add substitution for apploaddirGaetan Nadon
This represents the location of the app-defaults directory Used in app/bitmap/man for example. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-06-25XORG_CHECK_SGML_DOCTOOLS: add interface for xorg stylesheetGaetan Nadon
Add STYLESHEET_SRCDIR for directory location and XSL_STLESHEET for the name of the xorg style sheet Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-06-25XORG_WITH_XMLTO: add HAVE_XMLTO_TEXT for text output formatGaetan Nadon
The xmlto program has dependencies when converting docbook XML to text format. It requires either lynx, links or w3m text web browsers. Users want to skip the text format to avoid having to install these. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-06-22XORG_WITH_GROFF: add HAVE_GROFF_HTML Automake conditionalGaetan Nadon
Groff uses grohtml to generate html output format. This program, in turn, uses a number of pnm* commands from the netpbm package, psselect from the psutils package and the ghostscript package. These are independently installed, so they could be missing. A check is made to ensure those dependencies are installed. If not, the makefile can use the conditional to supress the target. Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-27config: XORG_MANPAGE_SECTIONS: add AC_PROG_SEDGaetan Nadon
The sed command is required to create the man pages. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-27XORG_MANPAGE_SECTIONS: add MAN_SUBSTS automake variableGaetan Nadon
It will replace the 155 copies in package makefiles Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-25XORG_LINT_LIBRARY: rework to match XORG_WITH_LINTGaetan Nadon
XORG_LINT_LIBRARY has implementations dependencies on XORG_WITH_LINT The library name can no longer be set by overloading the semantic of --enable-lint-library. If this function is required it should be added using an AC_ARG_VAR. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-25XORG_WITH_LINT: rework and extend platform coverageGaetan Nadon
Guess the lint program name by platform. Use ARG variable for user input values. Provide default flags per platform. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-25XORG_DEFAULT_OPTIONS: add AC_PROG_INSTALLGaetan Nadon
All modules install something. This makes it clear it can removed from modules config. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-25XORG_STRICT_OPTION: remove redundant expansion of AC_PROG_CC macroGaetan Nadon
Calling AC_PROG_CC before AC_PROG_CC_C99 is not required. C99 is not an add-on to CC although either one will cache results than can be used by the other. This is effectively a no-op. Note that if a module configure.ac file calls AC_PROG_CC after AC_PROG_CC_C99, the compiler will be reset to ISO_C89 from ISO_C99. Currently about half the xorg modules use C89 while the other half use C99. Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-05-05doctools: accept an optional minimal versionYaakov Selkowitz
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
2010-05-05linuxdoc: Use XORG_WITH_PS2PDF to check for ps2pdfYaakov Selkowitz
Besides reusing existing code, this allows linuxdoc PDF output to be enabled or disabled by configure. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2010-04-29LinuxDoc: add -f option to filter out the ^H in text outputGaetan Nadon
Remove backspace-overstrikes from the intermediate form generated by groff. These appear as blocks in some text editors and as ^H in vi. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-04-04doc: add XORG_CHECK_SGML_DOCTOOLS to detect xorg-sgml-doctoolsYaakov Selkowitz
Trying to find X11/defs.ent with AC_CHECK_FILE does not work when cross-compiling, and the check assumed that xorg-sgml-doctools is installed to the same prefix which need not always be the case. xorg-sgml-doctools 1.4 provides a pkg-config file which we can use instead, fixing both those cases. This macro is provided in util-macros instead of with xorg-sgml-doctools, otherwise the latter would become a hard dependency just to run autoreconf. Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2010-03-10doc: fix typo in AC_MSG_CHECKING for XORG_CHECK_LINUXDOCGaetan Nadon
The message should start with a lowercase letter. Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-03-09doc: Specify minimum xmlto version to XORG_WITH_DOXYGENGaetan Nadon
Adds an optional parameter to XORG_WITH_DOXYGEN to enforce a minimum version needed like the asciidoc version check. Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-03-09doc: Specify minimum xmlto version to XORG_WITH_XMLTODan Nicholson
Adds an optional parameter to XORG_WITH_XMLTO to enforce a minimum version needed like the asciidoc version check. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-03-09doc: Specify minimum asciidoc version to XORG_WITH_ASCIIDOCDan Nicholson
Adds an optional parameter to XORG_WITH_ASCIIDOC to enforce a minimum version needed. Tested-by: Gaetan Nadon <memsize@videotron.ca> Tested-by: Fernando Carrijo <fcarrijo@yahoo.com.br> Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2010-02-28silent: Set AM_DEFAULT_VERBOSITY for compatibility on older automakeDan Nicholson
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 <dbn.lists@gmail.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2010-02-25AM_SILENT_RULES: move from XORG_CWARNFLAGS to XORG_DEFAULT_OPTIONSGaetan Nadon
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 <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-02-05doc: add XORG_ENABLE_DEVEL_DOCS and XORG_ENABLE_SPECSGaetan Nadon
Identical to XORG_ENABLE_DOCS, this macros allows modules to classify docs per type and selectively control their building. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-02-05XORG_WITH_GROFF: add tests for -ms and -mm macro packagesGaetan Nadon
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 <memsize@videotron.ca>
2010-02-05Add XORG_ENABLE_DOCS to control the building of documentationGaetan Nadon
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 <memsize@videotron.ca>
2010-02-05Additional doc macros for GROFF, FOP and PS2PDFGaetan Nadon
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 <memsize@videotron.ca>
2010-02-03Add -Wformat=2 to the default CWARNFLAGSJeremy Huddleston
This will include -Wformat-security to catch possible security problems in formatting in printf, scanf, etc. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Matt Turner <mattst88@gmail.com>
2010-01-17Add XORG_WITH_ASCIIDOC and XORG_WITH_DOXYGENGaetan Nadon
Based on XORG_WITH_XMLTO Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-01-17Add XORG_WITH_XMLTO to factorize xmlto tests.Matthieu Herrb
This also allow to configure with --without-xmlto to ignore a 3rd party xmlto tool on systems that normally don't have it, in order to have reproducable builds. Reviewed-by: Rémi Cardona <remi@gentoo.org> Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-01-14Update Sun license notices to current X.Org standard formAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2010-01-09INSTALL doesn't belong in docdir, use pkgdatadir insteadJulien Cristau
docdir stays in xorg-macros.pc so we don't break the existing $(INSTALL_CMD). Tested-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2009-12-15macros.m4.in: use backticks rather than $() for cmd subsGaetan Nadon
Reviewed-by: Dan Nicholson <dbn.lists at gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2009-12-15Use conservative default for malloc(0) when cross-compiling #24460Colin Watson
When cross-compiling, AC_RUN_IFELSE can't run test programs. MALLOC_ZERO_RETURNS_NULL=yes is a conservative default in this case. Signed-off-by: Colin Watson <cjwatson@canonical.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2009-11-26xorg-macros.pc.in: create a meta data file for util-macrosGaetan Nadon
This is motivated primarly by XORG_INSTALL who needs to locate the docdir when invoked from any module that may not be installed using same prefix (default or otherwise). There are other potential use for this file.
2009-11-07Add an XORG_INSTALL macro to allow comps to copy the INSTALL file #24206Gaetan Nadon
The Makefile installs INSTALL in share/doc/util-macros An INSTALL_CMD is provided in the new XORG_INSTALL macro which is added to XORG_DEFAULT_OPTIONS. Components add INSTALL target to their Makefile similar to ChangeLog
2009-09-03Fix obsolete macro warnings for AC_HELP_STRING #23628Gaetan Nadon
When checking for warnings in any module using XORG_RELEASE_VERSION one or more warnings on AC_HELP_STRING appears. The macro has been replaced with AS_HELP_STRING Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-09-02Add XORG_DEFAULT_OPTIONS meta-macro.Peter Hutterer
Many modules use the same set of m4 macros. Additions to the macros require updating the configure.ac for each module affected. In the case of e.g. protos and libs this means updating every single module. This patch adds a XORG_DEFAULT_OPTIONS meta-macro that uses the other macros defined. Macros can be added to this meta-macro and modules immediately get to make use of it - without changes required to configure.ac. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-09-01Add XORG_STRICT_OPTION macro for strict compilation optionPauli Nieminen
Strict compilation option can be used to get rid of warnings that often are showing real hidden bug in code. That just waits to cause problems. CWARNFLAGS has to be added to AM_C(PP)FLAGS to use strict compilation mode in Makefile.am. Automatic addition to compiler flags would cause some configure checks fail. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-27Add AM_SILENT_RULES to default XORG_CWARNFLAGSPeter Hutterer
Automake 1.11 supports silent builds with the new AM_SILENT_RULES. http://sources.redhat.com/automake/automake.html#Options This loosely qualifies as a CWARNFLAG since it allows all the warnings to be seen and enables modules to gain support from the feature without any changes needed to configure. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: James Cloos <cloos@jhcloos.com>
2009-06-09Use correct CWARNFLAGS when cross compilingJon TURNEY
Rather than checking the version of some random gcc which happens to be in the path to determine which warning flags are supported, we should check the gcc we are going to use for the build For example, when cross-compiling, if the host gcc is >= 3.4 but the cross-compiler gcc is not, this will cause unsupported warning flags to be used This seems to work, but I don't know enough autofoolery to be sure this is right... Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
2009-03-17Use m4 for XORG_MACROS_VERSION to error during autoconfDan Nicholson
Check the needed macros version with m4 so that the proper version is determined during autoconf. This prevents a faulty configure from being generated. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-19Fix incorrect warning message in XORG_MACROS_VERSIONDan
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-05Restore part of the XORG_MACROS_VERSION commentDan Nicholson
The 1.1 or later part is actually important since XORG_MACROS_VERSION didn't exist before then. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-05Fix comment in XORG_MACROS_VERSION on usageDan Nicholson
The comment recommending checking XORG_MACROS_VERSION with m4_ifndef was flawed for two reasons: * m4_fatal should be used if the macro is not defined. There's no use generating configure if the macro doesn't exist. Just fail during autoconf. * There's no reason to mention the version needed in the message. That check does not do version verification. That's what the actual macro is for. Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
2009-02-01XORG_CWARNFLAGS: += is not valid for appending in bourn scriptsJeremy Huddleston
Fixes: ./configure: line 12921: CWARNFLAGS+= -Wold-style-definition -Wdeclaration-after-statement: command not found
2008-12-10use more CWARNFLAGS with gcc 3.4 too.Matthieu Herrb
Only gcc 3.3 and earlier version don't support them. Reported and tested by Peter Breitenlohner.
2008-12-07Fix CWARNFLAGS for gcc versions < 4Matthieu Herrb
2008-12-01Allow setting XORG_SGML_PATH to a non-default path when running configureAlan Coopersmith
2008-11-29fix XORG_PROG_RAWCPP for cygwinPeter Breitenlohner
Patch by Yaakov Selkowitz from xorg mailing list http://lists.freedesktop.org/archives/xorg/attachments/20081016/04a64242/attachment.asc
2008-11-29define XORG_CWARNFLAGS macroPeter Breitenlohner
2008-11-29reorganize autoconf macro filesPeter Breitenlohner
append xorgversion.m4 to xorg-macros.m4.in, instead of installing it as separate file. Avoid copying some code from xorgversion.m4 to configure.ac.
2007-08-13Cannot use AC_CHECK_FILE when cross compiling; assume no LINUXDOC.Keith Packard
As AC_CHECK_FILE cannot be used when cross compiling, just assume linuxdoc is not present.