(NON_GNU_CPP): On Solaris, set using a proper check for a Sun C

compiler.
This commit is contained in:
Glenn Morris 2007-06-07 07:55:19 +00:00
parent 5ee63e320f
commit 42bf63da03
2 changed files with 25 additions and 8 deletions

View file

@ -1,3 +1,8 @@
2007-06-07 Glenn Morris <rgm@gnu.org>
* configure.in (NON_GNU_CPP): On Solaris, set using a proper check
for a Sun C compiler.
2007-05-25 Chong Yidong <cyd@stupidchicken.com>
* mkinstalldirs: Sync to version in automake CVS.

View file

@ -1032,14 +1032,8 @@ dnl see the `changequote' comment above.
;;
*-sunos5* | *-solaris* )
opsys=sol2-6
## FIXME: make this into a proper fix that checks the compiler type,
## rather than relying on path. Or is /usr/ccs/lib/cpp a bad default now?
if [ "x$CC" = x/opt/SUNWspro/bin/cc ]; then
## -Xs prevents spurious whitespace.
NON_GNU_CPP="/opt/SUNWspro/bin/cc -E -Xs"
else
NON_GNU_CPP=/usr/ccs/lib/cpp
fi
emacs_check_sunpro_c=yes
NON_GNU_CPP=/usr/ccs/lib/cpp
;;
* ) opsys=bsd4-2 ;;
esac
@ -1275,6 +1269,24 @@ if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
## If not using gcc, and on Solaris, and no CPP specified, see if
## using a Sun compiler, which needs -Xs to prevent whitespace.
if test x"$GCC" != xyes && test x"$emacs_check_sunpro_c" = xyes && \
test x"$CPP" = x; then
AC_MSG_CHECKING([whether we are using a Sun C compiler])
AC_CACHE_VAL(emacs_cv_sunpro_c,
[AC_TRY_LINK([],
[#ifndef __SUNPRO_C
fail;
#endif
], emacs_cv_sunpro_c=yes, emacs_cv_sunpro_c=no)])
AC_MSG_RESULT($emacs_cv_sunpro_c)
if test x"$emacs_cv_sunpro_c" = xyes; then
NON_GNU_CPP="$CC -E -Xs"
fi
fi
#### Some systems specify a CPP to use unless we are using GCC.
#### Now that we know whether we are using GCC, we can decide whether
#### to use that one.