From dfbcb1566b8b62a153a5a4e4f1cf1b9c7ea2f73e Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Wed, 11 Apr 2001 21:14:24 +0000
Subject: [PATCH] Irix tweaks.

---
 configure.in                 | 12 ++++++++++++
 simgear/Makefile.am          |  5 +++--
 simgear/misc/props_io.cxx    |  3 ++-
 simgear/threads/SGThread.hxx | 11 +++++++++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index 13c6fcfa..d6277bbe 100644
--- a/configure.in
+++ b/configure.in
@@ -34,6 +34,18 @@ AC_PROG_RANLIB
 AC_PROG_INSTALL
 AC_PROG_LN_S
 
+OS=`uname -s`
+if test $OS = "IRIX" -o $OS = "IRIX64"; then
+    if text $CC = "CC"; then
+        AR="CC -ar"
+    else
+        AR="ar"
+    fi
+else
+    AR="ar"
+fi
+AC_SUBST(AR)
+
 if echo $includedir | egrep "simgear$" > /dev/null; then
     echo "includedir is" $includedir "libdir is" $libdir
 else
diff --git a/simgear/Makefile.am b/simgear/Makefile.am
index 106162cd..b3094a1a 100644
--- a/simgear/Makefile.am
+++ b/simgear/Makefile.am
@@ -31,6 +31,7 @@ include_HEADERS = \
 	compiler.h constants.h sg_inlines.h sg_traits.hxx sg_zlib.h version.h
 
 SUBDIRS = \
+	$(ZLIB_DIRS) \
 	bucket \
 	debug \
 	ephemeris \
@@ -46,5 +47,5 @@ SUBDIRS = \
 	sky \
 	$(SGTHREAD_DIR) \
 	timing \
-	xgl \
-	$(ZLIB_DIRS)
+	xgl
+
diff --git a/simgear/misc/props_io.cxx b/simgear/misc/props_io.cxx
index c1cc903d..d88376e8 100644
--- a/simgear/misc/props_io.cxx
+++ b/simgear/misc/props_io.cxx
@@ -7,6 +7,7 @@
 
 #include <stdlib.h>		// atof() atoi()
 
+#include <simgear/sg_inlines.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/xml/easyxml.hxx>
 
@@ -126,7 +127,7 @@ PropsVisitor::startElement (const char * name, const XMLAttributes &atts)
     int index = 0;
     if (att_n != 0) {
       index = atoi(att_n);
-      st.counters[name] = max(st.counters[name], index+1);
+      st.counters[name] = SG_MAX2(st.counters[name], index+1);
     } else {
       index = st.counters[name];
       st.counters[name]++;
diff --git a/simgear/threads/SGThread.hxx b/simgear/threads/SGThread.hxx
index e2fbcdfb..0eb935c1 100644
--- a/simgear/threads/SGThread.hxx
+++ b/simgear/threads/SGThread.hxx
@@ -23,9 +23,16 @@
 #ifndef SGTHREAD_HXX_INCLUDED
 #define SGTHREAD_HXX_INCLUDED 1
 
+#include <simgear/compiler.h>
+
 #include <pthread.h>
-#include <cassert>
-#include <cerrno>
+#if defined ( SG_HAVE_STD_INCLUDES )
+#  include <cassert>
+#  include <cerrno>
+#else
+#  include <assert.h>
+#  include <sys/errno.h>
+#endif
 
 class SGThread;