[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Thu, 07 Jun 2007 07:54:20 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/06/07 07:54:19
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.448
retrieving revision 1.449
diff -u -b -r1.448 -r1.449
--- configure.in 22 May 2007 15:54:32 -0000 1.448
+++ configure.in 7 Jun 2007 07:54:19 -0000 1.449
@@ -1032,14 +1032,8 @@
;;
*-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
+ emacs_check_sunpro_c=yes
NON_GNU_CPP=/usr/ccs/lib/cpp
- fi
;;
* ) opsys=bsd4-2 ;;
esac
@@ -1275,6 +1269,24 @@
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.
- [Emacs-diffs] Changes to emacs/configure.in,v,
Glenn Morris <=
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2007/06/07
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/06/11
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2007/06/12
- [Emacs-diffs] Changes to emacs/configure.in,v, Chong Yidong, 2007/06/13
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/06/13
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/06/14
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2007/06/20
- [Emacs-diffs] Changes to emacs/configure.in,v, Jan Djärv, 2007/06/20
- [Emacs-diffs] Changes to emacs/configure.in,v, Glenn Morris, 2007/06/21