[PATCH 1/2] Use XORG_COMPILER_BRAND from util-macros 1.14 to check for SUNCC

[Jeremy Huddleston]

Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

On May 2, 2011, at 8:54 PM, Alan Coopersmith wrote:

> Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
> ---
> 
> To test with current util/macros git, bump the version in its configure.ac
> to 1.14.0 and install first.
> 
> configure.ac |    8 +++-----
> 1 files changed, 3 insertions(+), 5 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 61caaed..bd1bb0b 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -32,10 +32,10 @@ AC_CONFIG_SRCDIR([Makefile.am])
> AM_INIT_AUTOMAKE([foreign dist-bzip2])
> AM_MAINTAINER_MODE
> 
> -# Require xorg-macros minimum of 1.13 for XORG_ENABLE_UNIT_TESTS
> +# Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS
> m4_ifndef([XORG_MACROS_VERSION],
> -          [m4_fatal([must install xorg-macros 1.13 or later before running autoconf/autogen])])
> -XORG_MACROS_VERSION(1.13)
> +          [m4_fatal([must install xorg-macros 1.14 or later before running autoconf/autogen])])
> +XORG_MACROS_VERSION(1.14)
> XORG_DEFAULT_OPTIONS
> XORG_WITH_DOXYGEN(1.6.1)
> XORG_CHECK_SGML_DOCTOOLS(1.5)
> @@ -1522,7 +1522,6 @@ if test "x$XORG" = xyes; then
> 	    if test x$GCC = xyes; then
> 		VISIBILITY_CFLAGS="-fvisibility=hidden"
> 	    else
> -		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
> 		if test x$SUNCC = xyes; then
> 		    VISIBILITY_CFLAGS="-xldscope=hidden"
> 		else
> @@ -1631,7 +1630,6 @@ if test "x$XORG" = xyes; then
> 		if test "${OS_MINOR}" -lt 8 ; then
> 			AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])
> 		fi
> -		AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
> 		if test "x$SUNCC" = "xyes"; then
> 			solaris_asm_inline="yes"
> 		fi
> -- 
> 1.7.3.2
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>