summaryrefslogtreecommitdiff
path: root/xorg-macros.m4.in
AgeCommit message (Collapse)Author
2013-09-06Strip trailing whitespaceAlan Coopersmith
sed -i 's/[[:space:]]*$//' * Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-08-26Use the right variable names for the compiler flags in XORG_TESTSET_CFLAGChris Wilson
Whilst populating the xorg_cv_ cache entries, and the subsequent xorg_testset_, we always include the FLAG_PREFIX in the name, to distinguish between C and C++ iterations. However, in the body of the test function, we dropped the FLAG_PREFIX expansion and so always used the empty string and hence did not correctly detect incorrect flags. The bug was introduced with commit 51f69514e65637f575df901ef942515e70314f6a Author: Chase Douglas <chase.douglas@canonical.com> Date: Mon Mar 12 11:49:28 2012 -0700 Separate unknown warning options by language Reported-and-tested-by: Sedat Dilek <sedat.dilek@gmail.com> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Cc: Sedat Dilek <sedat.dilek@gmail.com> Cc: Chase Douglas <chase.douglas@canonical.com> Cc: Gaetan Nadon<memsize@videotron.ca> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-04-04Fix spacing in XORG_TESTSET_CFLAGYaakov Selkowitz
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2012-03-12Separate unknown warning options by languageChase Douglas
If XORG_COMPILER_FLAGS is called more than once with separate languages, the unknown warning options used internally for unknown warning checking will be set the first time and then the cached value will be used for subsequent languages. This is a problem if the compilers differ between the languages. This change ensures that the unknown warning options are namespaced so multiple XORG_COMPILER_FLAGS calls with different languages are checked separately. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Gaetan Nadon<memsize@videotron.ca>
2012-03-12Fix cflag test compiler message and cache idsChase Douglas
When the language is C++, the flag checking message references $CC instead of $CXX. The cache id is also xorg_cv_cc_* instead of xorg_cv_cxx_*. This change fixes both issues. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Gaetan Nadon<memsize@videotron.ca>
2012-03-12Don't use AS_ECHO in XORG_TESTSET_CFLAGJon TURNEY
Further to commit 52ef6f6, since AS_ECHO isn't supported in autoconf 2.61 either, rewrite use of cache variable in XORG_TESTSET_CFLAG so 'echo' isn't needed at all. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Gaetan Nadon<memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-12Add XORG_ENABLE_INTEGRATION_TESTSChase Douglas
This macro enables a builder to enable/disable integration testing It makes no assumption about the test cases' implementation Test cases may or may not use Automake "Support for test suites" Unit test support usually requires less dependencies and may be built and run under less stringent environments than integration tests. Thus, two separate options for unit and integration testing is desirable. Copied from XORG_ENABLE_UNIT_TESTS. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Gaetan Nadon<memsize@videotron.ca>
2012-03-01Define BASE_CXXFLAGS when C++ is the chosen languageChase Douglas
You can use this functionality by setting the language to C++ before calling XORG_DEFAULT_OPTIONS. This can accomplished with AC_LANG(C++). Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2012-03-01Make XORG_TESTSET_CFLAG work for multiple languagesChase Douglas
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Gaetan Nadon<memsize@videotron.ca>
2012-02-19Use AS_ECHO rather than AS_ECHO_N in XORG_TESTSET_CFLAGJon TURNEY
The AS_ECHO_N macro was only introduced in autoconf 2.62. Backticks remove trailing newlines, so we don't need to use echo -n Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2012-01-22Cache the results of checking compiler flag support in XORG_TESTSET_CFLAGJon TURNEY
Since checking all those warning flags takes an amount of time I find irritating, here is an attempt at caching the results of checking compiler warning flag support A couple of aspects which need definitely need review or testing: * I've tried to get things right when not the first flag in the list of alternates is supported, but this really needs testing with a compiler other than gcc * The cache variable naming policy is a bit opaque me, so the names used may need corecting * I've tried to be careful, but who knows what portability sins I have committed :-) This change reduces the time to run the ./configure script produced from a configure.ac containing just AC_INIT([test], 1.0) XORG_COMPILER_FLAGS XORG_CWARNFLAGS XORG_STRICT_OPTION AC_OUTPUT() from ~60s to ~20s on my cygwin machine, and from ~15s to ~9s on a linux VM running on the same hardware v2: AS_TR_SH transforms characters which are invalid in shell variable names, so we don't have to use sed to transform spaces ourself Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-12-29Provide a configure option to turn off the selective -Werror=... CFLAGSJeremy Huddleston
Provide end users with a workaround if they find code doesn't build with the -Werror=... flags provided by BASE_CFLAGS. This can be useful if newer util-macros are used with older source code that had problems, or in the rare case when warnings are expanded to hit more cases (although this case should not happen too much in practice). Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-12-10Remove -Winline from BASE_CFLAGSJeremy Huddleston
This might be useful for performance tuning builds against specific compilers, but it is a bit too noisy to be used in general. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-12-01XORG_TESTSET_CFLAG: Try to both compile & link with the flagsAlan Coopersmith
Catches build problems caused by compilers that ignore unknown flags at compile time and pass them to the linker at link time, when the linker considers unknown flags to be fatal errors. Reviewed-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-11-11XORG_TESTSET_CFLAG: Add support fot -Werror=unused-command-line-argumentJeremy Huddleston
This warning was was added to clang in r144365 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-07Add XORG_MEMORY_CHECK_FLAGS and require it in XORG_ENABLE_UNIT_TESTSAlan Coopersmith
Based on the checks already in libXt/configure.ac and proposed for xserver/configure.ac - makes a common implementation before we make more copies. Callers should be able to just add TESTS_ENVIRONMENT = $(XORG_MALLOC_DEBUG_ENV) If built with an older xorg-macros, then the tests will simply be less stringent, matching what happens on platforms without any simple malloc debugging facilities available. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-07Define __wrap_exit in test program source for XORG_LD_WRAPAlan Coopersmith
Otherwise the test fails on Solaris releases that actually have support for ld -wrap because the linker instead returns an error that __wrap_exit is an undefined symbol. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-07Add an optional argument to XORG_LD_WRAPAlan Coopersmith
Allows specifying if ld -wrap support is 'required' or 'optional' for unit tests, so that builds like the xserver which only need ld -wrap for some tests can allow users to enable the others when ld -wrap is not available. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-06Add additional flags to XORG_COMPILER_FLAGSJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-06Update XORG_CWARNFLAGS to use XORG_COMPILER_FLAGSJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-06Add XORG_COMPILER_FLAGS to replace XORG_CWARNFLAGSJeremy Huddleston
See: https://bugs.freedesktop.org/show_bug.cgi?id=31238 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-06Use XORG_TESTSET_CFLAG in XORG_STRICT_OPTIONJeremy Huddleston
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-11-06Add XORG_TESTSET_CFLAG which can be used to test what flags the compiler ↵Jeremy Huddleston
supports Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-11-06Fix the test for -Werror=attributesJeremy Huddleston
The current test was always failing to compile because 'return 0;' was global rather than in the body of a function. Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-22XORG_WITH_XSLTPROC: warn at development time rather than config timeGaetan Nadon
Catching up unimplemented features should be done earlier by the developer during autoconf rather than during configure. Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-22Add XORG_WITH_PERL macroGaetan Nadon
Following the same pattern as XMLTO and friends. Allows all modules to use the same interface, variables and options to check for perl. Perl is used in libX11 and xserver. Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-22XORG_WITH_FOP: add minimum version checking supportGaetan Nadon
Adding this feature is motivated by a bug in fop 0.95 where fop crashes in the presence of some characters like the latin capital sharp s. Fop version 1.0 works correctly. This is the same feature found in XMLTO and the likes. In the macro public interface there is a shift in parameter position for the DEFAULT parameter. Doing development on older libraries (point releases on older versions) will still work the same way as the "no" value will be interpreted as the minimum version. It won't be found, so fop will be disabled anyway. Only libX11 has used XORG_WITH_FOP(no) and will be changed with a version bump on util-macros. Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-05XORG_PROG_RAWCPP: use AC_LANG_SOURCE to prevent warningsGaetan Nadon
The source for the AC_LANG_CONFTEST should be passed to AC_LANG_SOURCE to satisfy the more stringent testing done by autoconf 2.68. It is available in autoconf 2.60 where AC_LANG_DEFINES_PROVIDED is not. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-05-14Add AC_LANG_DEFINES_PROVIDED to XORG_RAW_CPP to silence autoconf warningsAlan Coopersmith
Since we're intentionally doing a special case to just check cpp output, and not a full program compilation, add the magic macro to silence: configure.ac:46: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... aclocal.m4:1077: XORG_PROG_RAWCPP is expanded from... configure.ac:46: the top level Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-05-06XORG_STRICT_OPTION: add -Werror=attributes to STRICT_CFLAGS for gccAlan Coopersmith
Flags unknown attributes as errors, if -Werror=attributes is supported. (The -Werror=* option was first spotted in gcc 4.2.0 manuals.) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-02Make XORG_STRICT_OPTION always set STRICT_CFLAGSAlan Coopersmith
Still only adds it to CWARNFLAGS if --enable-strict-compilation is passed, but sets the variable with the right flags for the compiler so it's available for other checks in configure scripts. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-05-01Create XORG_COMPILER_BRAND macro to centralize compiler checksAlan Coopersmith
Check for gcc vs. intel vs. sun in one place, instead of continuing to grow more places the check is replicated. Add clang check here too, as it's now seeing a lot of use to build X. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-03-10XORG_LD_WRAP: check if linker supports -wrapGaetan Nadon
Used mainly by test cases using a wrapper function. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-03-10XORG_WITH_GLIB: check for the GLib packageGaetan Nadon
XORG_WITH_GLIB([MIN-VERSION], [DEFAULT]) ---------------------------------------- Minimum version: 1.13.0 GLib is a library which provides advanced data structures and functions. This macro enables a module to test for the presence of Glib. When used in conjunction with XORG_ENABLE_UNIT_TESTS, use both AM_CONDITIONAL ENABLE_UNIT_TESTS and HAVE_GLIB. Glib may be used for purpose other than testing Package builders should use --without-glib to ensure it does not get pulled in. Unit tests may or may not use GLib. Developers should use --with-glib to error out if GLib is missing. Interface to module: HAVE_GLIB: used in makefiles to conditionally build targets with_glib: used in configure.ac to know if GLib has been found --with-glib: 'yes' user instructs the module to use glib 'no' user instructs the module not to use glib Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-03-10XORG_ENABLE_UNIT_TESTS: add support for unit testingGaetan Nadon
This macro enables a builder to enable/disable unit testing It makes no assumption about the test cases implementation Test cases may or may not use Automake "Support for test suites" They may or may not use the software utility library GLib Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-02-01XORG_WITH_XSLTPROC: add XSLT processor command line toolGaetan Nadon
The primary use will be for DocBook/XML cross links database generation. XSLT (Extensible Stylesheet Language Transformations) is a declarative, XML-based language used for the transformation of XML documents. The xsltproc command line tool is for applying XSLT stylesheets to XML documents. It is used under the cover by xmlto to generate html files from DocBook/XML. The XSLT processor is often used as a standalone tool for transformations. It should not be assumed that it is used only to work with documnetation. Tested-by: Matt Dew <marcoz@osource.org> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-12-07Use AC_LANG_PROGRAM in XORG_CHECK_MALLOC_ZERO to clear autoconf-2.68 warningsAlan Coopersmith
configure.ac:126: warning: AC_LANG_CONFTEST: no AC_LANG_SOURCE call detected in body ../../lib/autoconf/lang.m4:194: AC_LANG_CONFTEST is expanded from... ../../lib/autoconf/general.m4:2730: _AC_RUN_IFELSE is expanded from... ../../lib/m4sugar/m4sh.m4:606: AS_IF is expanded from... ../../lib/autoconf/general.m4:2749: AC_RUN_IFELSE is expanded from... aclocal.m4:1952: XORG_CHECK_MALLOC_ZERO is expanded from... configure.ac:126: the top level Also, calloc() takes two arguments; and all of them return void *, not char *; as the compiler points out when you #include <stdlib.h> instead of faking it badly. (And sometimes when you don't, due to compiler builtin versions of the functions.) Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2010-11-07XORG_ENABLE_DOCS: Fix "Enable building the documentation (yes: yes)"Gaetan Nadon
The quoting did not prevent the m4 defined variable "default" to replace the text string "default" in the help text. Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-10-29Version bump: 1.11.0util-macros-1.11.0Alan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2010-10-28docs: Take optional argument to control defaultsDan Nicholson
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>
2010-10-28docs: Use m4 to handle optional macro defaultsDan Nicholson
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>
2010-09-03Sun's copyrights are now owned by OracleAlan Coopersmith
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 22:00:43 +0000