Update of /cvsroot/mahogany/M
In directory usw-pr-cvs1:/tmp/cvs-serv2926
Modified Files:
configure configure.in
Log Message:
IRIX fixes (bug 699)
Index: configure
===================================================================
RCS file: /cvsroot/mahogany/M/configure,v
retrieving revision 1.279
retrieving revision 1.280
diff -b -u -2 -r1.279 -r1.280
--- configure 13 Aug 2002 11:01:28 -0000 1.279
+++ configure 20 Sep 2002 13:25:46 -0000 1.280
@@ -564,5 +564,5 @@
-# From configure.in Id: configure.in,v 1.264 2002/07/16 00:24:39 vadz Exp
+# From configure.in Id: configure.in,v 1.265 2002/08/13 11:01:31 vadz Exp
rm -f conftestdata
@@ -1103,7 +1103,7 @@
fi
- # Check whether --with-wx-config or --without-wx-config was given.
-if test "${with_wx_config+set}" = set; then
[...1334 lines suppressed...]
+ IRIX*)
+ DEPFLAGS="-M"
+ ;;
+ esac
fi
@@ -5303,5 +5295,5 @@
if test "x$GXX" != "xyes"; then
echo $ac_n "checking whether ${CXX} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5306: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
+echo "configure:5298: checking whether ${CXX} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_cxx_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -5326,5 +5318,5 @@
if test "x$GCC" != "xyes"; then
echo $ac_n "checking whether ${CC} accepts ${DEPFLAGS}""... $ac_c" 1>&6
-echo "configure:5329: checking whether ${CC} accepts ${DEPFLAGS}" >&5
+echo "configure:5321: checking whether ${CC} accepts ${DEPFLAGS}" >&5
if eval "test \"`echo '$''{'m_cv_c_depflags'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
Index: configure.in
===================================================================
RCS file: /cvsroot/mahogany/M/configure.in,v
retrieving revision 1.265
retrieving revision 1.266
diff -b -u -2 -r1.265 -r1.266
--- configure.in 13 Aug 2002 11:01:31 -0000 1.265
+++ configure.in 20 Sep 2002 13:25:49 -0000 1.266
@@ -980,5 +980,9 @@
case "$GXX" in
yes) CCOSTYPE=gsg ;;
- *) CCOSTYPE=sg6 ;;
+ *) dnl should use sg6 for IRIX 6.5, sgi otherwise
+ case `uname -r` in
+ 6.5*) CCOSTYPE=sg6 ;;
+ *) CCOSTYPE=sgi ;;
+ esac
esac ;;
darwin*)
@@ -1170,9 +1174,24 @@
dnl supports the same options
DEPFLAGS=
-if test "x$GXX" = "xyes" -o "x$CCOSTYPE" = "xosf"; then
+if test "x$GXX" = "xyes"; then -o "x$CCOSTYPE" = "xosf"; then
+ DEPFLAGS="-MMD"
+else
+ dnl non-gcc compiler switches depend on platform (we assume that we use
+ dnl the native compiler if we don't use gcc)
+ case "$OSTYPE" in
+ OSF1*)
DEPFLAGS="-MMD"
-elif test "x$CCOSTYPE" = "xsol"; then
+ ;;
+
+ Solaris* | solaris* | SunOS*)
dnl Sun Forte C/C++ compiler is reported to have these
DEPFLAGS="-xM1"
+ ;;
+
+ IRIX*)
+ dnl see http://mahogany.sourceforge.net/cgi-bin/show_bug.cgi?id=699
+ DEPFLAGS="-M"
+ ;;
+ esac
fi
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
