frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use XORG_COMPILER_BRAND from util-macros 1.14 to check for SUNCC 

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
This commit is contained in:
Alan Coopersmith 2011-05-02 19:47:44 -07:00
parent 4621bb270a
commit 9275b1fb6f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -32,10 +32,10 @@ AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign dist-bzip2]) AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE 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_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.13 or later before running autoconf/autogen])]) [m4_fatal([must install xorg-macros 1.14 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.13) XORG_MACROS_VERSION(1.14)
XORG_DEFAULT_OPTIONS XORG_DEFAULT_OPTIONS
XORG_WITH_DOXYGEN(1.6.1) XORG_WITH_DOXYGEN(1.6.1)
XORG_CHECK_SGML_DOCTOOLS(1.7) XORG_CHECK_SGML_DOCTOOLS(1.7)
@ -1522,7 +1522,6 @@ if test "x$XORG" = xyes; then
if test x$GCC = xyes; then if test x$GCC = xyes; then
VISIBILITY_CFLAGS="-fvisibility=hidden" VISIBILITY_CFLAGS="-fvisibility=hidden"
else else
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
if test x$SUNCC = xyes; then if test x$SUNCC = xyes; then
VISIBILITY_CFLAGS="-xldscope=hidden" VISIBILITY_CFLAGS="-xldscope=hidden"
else else
@ -1631,7 +1630,6 @@ if test "x$XORG" = xyes; then
if test "${OS_MINOR}" -lt 8 ; then if test "${OS_MINOR}" -lt 8 ; then
AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.]) AC_MSG_ERROR([This release no longer supports Solaris versions older than Solaris 8.])
fi fi
AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
if test "x$SUNCC" = "xyes"; then if test "x$SUNCC" = "xyes"; then
solaris_asm_inline="yes" solaris_asm_inline="yes"
fi fi