Irix tweaks.

diff --git a/configure.in b/configure.in
index 13c6fcfa69388bf89e196d9a20758fdd2d63f306..d6277bbe71a3efb90fc5426b2fe13485fc2c7695 100644 (file)
--- 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 106162cdf74d65dd00926a83874f89d0c47d2d78..b3094a1ab30e6766761bd8b8a98c9b69d269e86f 100644 (file)
--- 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 c1cc903dfa35496508b7c0fdbcad3b4584b52d36..d88376e82016d1c593d0fa6987ce4fa4f8bd6c6f 100644 (file)
--- 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 e2fbcdfbbc60b88e6986a3ab0d0a3d68ac65feeb..0eb935c1637d437407373e754e1fc8ce398eea3f 100644 (file)
--- 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;