Udpate to util-macros 1.17
This commit is contained in:
matthieu
parent
563a654b98
commit
7feb0caaf5
@ -1,3 +1,76 @@
|
||||
commit c0c42057e0d357c144e7933ee413b522950a0f17
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Tue Mar 13 19:45:12 2012 -0400
|
||||
|
||||
Version bump: 1.17
|
||||
|
||||
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
||||
|
||||
commit 51f69514e65637f575df901ef942515e70314f6a
|
||||
Author: Chase Douglas <chase.douglas@canonical.com>
|
||||
Date: Mon Mar 12 11:49:28 2012 -0700
|
||||
|
||||
Separate unknown warning options by language
|
||||
|
||||
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>
|
||||
|
||||
commit a1fec11ca3de6774fb70052f5f5ab167bf658690
|
||||
Author: Chase Douglas <chase.douglas@canonical.com>
|
||||
Date: Mon Mar 12 10:59:55 2012 -0700
|
||||
|
||||
Fix cflag test compiler message and cache ids
|
||||
|
||||
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>
|
||||
|
||||
commit a02a9048a1b831d13d32413e2af429ac8d7a5c2b
|
||||
Author: Jon TURNEY <jon.turney@dronecode.org.uk>
|
||||
Date: Sat Mar 10 15:04:28 2012 +0000
|
||||
|
||||
Don't use AS_ECHO in XORG_TESTSET_CFLAG
|
||||
|
||||
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>
|
||||
|
||||
commit 299ae797eff46900e7d5914ff4502662f97f2062
|
||||
Author: Chase Douglas <chase.douglas@canonical.com>
|
||||
Date: Fri Mar 9 14:46:00 2012 -0800
|
||||
|
||||
Add XORG_ENABLE_INTEGRATION_TESTS
|
||||
|
||||
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>
|
||||
|
||||
commit db238c632bb7136e3e44345820d514106e317420
|
||||
Author: Gaetan Nadon <memsize@videotron.ca>
|
||||
Date: Mon Mar 5 09:39:17 2012 -0500
|
||||
|
||||
@ -23,7 +23,7 @@ dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([util-macros],
|
||||
[1.16.2],
|
||||
[1.17],
|
||||
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
|
||||
[util-macros])
|
||||
AC_CONFIG_SRCDIR([Makefile.am])
|
||||
|
||||
@ -1056,6 +1056,39 @@ AC_MSG_CHECKING([whether to build unit test cases])
|
||||
AC_MSG_RESULT([$enable_unit_tests])
|
||||
]) # XORG_ENABLE_UNIT_TESTS
|
||||
|
||||
# XORG_ENABLE_INTEGRATION_TESTS (enable_unit_tests=auto)
|
||||
# ------------------------------------------------------
|
||||
# Minimum version: 1.17.0
|
||||
#
|
||||
# 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"
|
||||
#
|
||||
# Please see XORG_ENABLE_UNIT_TESTS for unit test support. Unit test support
|
||||
# usually requires less dependencies and may be built and run under less
|
||||
# stringent environments than integration tests.
|
||||
#
|
||||
# Interface to module:
|
||||
# ENABLE_INTEGRATION_TESTS: used in makefiles to conditionally build tests
|
||||
# enable_integration_tests: used in configure.ac for additional configuration
|
||||
# --enable-integration-tests: 'yes' user instructs the module to build tests
|
||||
# 'no' user instructs the module not to build tests
|
||||
# parm1: specify the default value, yes or no.
|
||||
#
|
||||
AC_DEFUN([XORG_ENABLE_INTEGRATION_TESTS],[
|
||||
AC_REQUIRE([XORG_MEMORY_CHECK_FLAGS])
|
||||
m4_define([_defopt], m4_default([$1], [auto]))
|
||||
AC_ARG_ENABLE(integration-tests, AS_HELP_STRING([--enable-integration-tests],
|
||||
[Enable building integration test cases (default: ]_defopt[)]),
|
||||
[enable_integration_tests=$enableval],
|
||||
[enable_integration_tests=]_defopt)
|
||||
m4_undefine([_defopt])
|
||||
AM_CONDITIONAL([ENABLE_INTEGRATION_TESTS],
|
||||
[test "x$enable_integration_tests" != xno])
|
||||
AC_MSG_CHECKING([whether to build unit test cases])
|
||||
AC_MSG_RESULT([$enable_integration_tests])
|
||||
]) # XORG_ENABLE_INTEGRATION_TESTS
|
||||
|
||||
# XORG_WITH_GLIB([MIN-VERSION], [DEFAULT])
|
||||
# ----------------------------------------
|
||||
# Minimum version: 1.13.0
|
||||
@ -1066,6 +1099,10 @@ AC_MSG_RESULT([$enable_unit_tests])
|
||||
# When used with ENABLE_UNIT_TESTS, it is assumed GLib is used for unit testing.
|
||||
# Otherwise the value of $enable_unit_tests is blank.
|
||||
#
|
||||
# Please see XORG_ENABLE_INTEGRATION_TESTS for integration test support. Unit
|
||||
# test support usually requires less dependencies and may be built and run under
|
||||
# less stringent environments than integration tests.
|
||||
#
|
||||
# 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
|
||||
@ -1466,36 +1503,40 @@ AC_LANG_CASE(
|
||||
[C], [
|
||||
AC_REQUIRE([AC_PROG_CC_C99])
|
||||
define([PREFIX], [C])
|
||||
define([CACHE_PREFIX], [cc])
|
||||
define([COMPILER], [$CC])
|
||||
],
|
||||
[C++], [
|
||||
define([PREFIX], [CXX])
|
||||
define([CACHE_PREFIX], [cxx])
|
||||
define([COMPILER], [$CXX])
|
||||
]
|
||||
)
|
||||
|
||||
[xorg_testset_save_]PREFIX[FLAGS]="$PREFIX[FLAGS]"
|
||||
|
||||
if test "x$xorg_testset_unknown_warning_option" = "x" ; then
|
||||
if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "x" ; then
|
||||
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
|
||||
AC_CACHE_CHECK([if compiler supports -Werror=unknown-warning-option],
|
||||
xorg_cv_compiler_flag_unknown_warning_option,
|
||||
AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unknown-warning-option],
|
||||
[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option],
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
|
||||
[xorg_cv_compiler_flag_unknown_warning_option=yes],
|
||||
[xorg_cv_compiler_flag_unknown_warning_option=no]))
|
||||
xorg_testset_unknown_warning_option=$xorg_cv_compiler_flag_unknown_warning_option
|
||||
[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=yes],
|
||||
[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option=no]))
|
||||
[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]=$[xorg_cv_]CACHE_PREFIX[_flag_unknown_warning_option]
|
||||
PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
|
||||
fi
|
||||
|
||||
if test "x$xorg_testset_unused_command_line_argument" = "x" ; then
|
||||
if test "x$xorg_testset_unknown_warning_option" = "xyes" ; then
|
||||
if test "x$[xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]" = "x" ; then
|
||||
if test "x$[xorg_testset_]CACHE_PREFIX[_unknown_warning_option]" = "xyes" ; then
|
||||
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unknown-warning-option"
|
||||
fi
|
||||
PREFIX[FLAGS]="$PREFIX[FLAGS] -Werror=unused-command-line-argument"
|
||||
AC_CACHE_CHECK([if compiler supports -Werror=unused-command-line-argument],
|
||||
xorg_cv_compiler_flag_unused_command_line_argument,
|
||||
AC_CACHE_CHECK([if ]COMPILER[ supports -Werror=unused-command-line-argument],
|
||||
[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument],
|
||||
AC_COMPILE_IFELSE([AC_LANG_SOURCE([int i;])],
|
||||
[xorg_cv_compiler_flag_unused_command_line_argument=yes],
|
||||
[xorg_cv_compiler_flag_unused_command_line_argument=no]))
|
||||
xorg_testset_unused_command_line_argument=$xorg_cv_compiler_flag_unused_command_line_argument
|
||||
[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=yes],
|
||||
[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument=no]))
|
||||
[xorg_testset_]CACHE_PREFIX[_unused_command_line_argument]=$[xorg_cv_]CACHE_PREFIX[_flag_unused_command_line_argument]
|
||||
PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
|
||||
fi
|
||||
|
||||
@ -1513,16 +1554,16 @@ m4_foreach([flag], m4_cdr($@), [
|
||||
PREFIX[FLAGS]="$PREFIX[FLAGS] ]flag["
|
||||
|
||||
dnl Some hackery here since AC_CACHE_VAL can't handle a non-literal varname
|
||||
AC_MSG_CHECKING([if $CC supports ]flag[])
|
||||
cacheid=`AS_ECHO([xorg_cv_cc_flag_]flag[])`
|
||||
AC_CACHE_VAL(AS_TR_SH($cacheid),
|
||||
AC_MSG_CHECKING([if ]COMPILER[ supports]flag[])
|
||||
cacheid=AS_TR_SH([xorg_cv_]CACHE_PREFIX[_flag_]flag[])
|
||||
AC_CACHE_VAL($cacheid,
|
||||
[AC_LINK_IFELSE([AC_LANG_PROGRAM([int i;])],
|
||||
[eval AS_TR_SH($cacheid)=yes],
|
||||
[eval AS_TR_SH($cacheid)=no])])
|
||||
[eval $cacheid=yes],
|
||||
[eval $cacheid=no])])
|
||||
|
||||
PREFIX[FLAGS]="$[xorg_testset_save_]PREFIX[FLAGS]"
|
||||
|
||||
eval supported=$AS_TR_SH($cacheid)
|
||||
eval supported=\$$cacheid
|
||||
AC_MSG_RESULT([$supported])
|
||||
if test "$supported" = "yes" ; then
|
||||
$1="$$1 ]flag["
|
||||
|
||||
Loading…
Reference in New Issue
Block a user