X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.in;h=4f9553101e8d7c930dcbfaee1287588f5a8f0c3c;hb=4f3aaa1ede95eb5a83bd92242b36cf80f0210150;hp=13c6fcfa69388bf89e196d9a20758fdd2d63f306;hpb=790a40ec9965a5dcfa6b0fef36476001da3e603e;p=simgear.git

diff --git a/configure.in b/configure.in
index 13c6fcfa..4f955310 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
@@ -98,11 +110,11 @@ base_LIBS="$LIBS"
 dnl Thread related checks
 AC_CHECK_LIB(pthread, pthread_exit)
 AC_CHECK_HEADER(pthread.h)
-if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -o "x$ac_cv_header_pthread_h" = "xyes"; then
+if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
     CXXFLAGS="$CXXFLAGS -D_REENTRANT"
     CFLAGS="$CFLAGS -D_REENTRANT"
 fi
-AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -o "x$ac_cv_header_pthread_h" = "xyes")
+AM_CONDITIONAL(HAVE_THREADS, test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes")
 
 AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(X11, XCreateWindow)
@@ -332,8 +344,8 @@ if test "x$ac_cv_header_zlib_h" != "xyes"; then
    echo "Building zlib"
 fi
 
-if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -o "x$ac_cv_header_pthread_h" = "xyes"; then
-   echo "Threads: pthread is supported."
+if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
+   echo "Threads: pthread lib found."
 else
-   echo "Threads: no threads (pthreads not found.)"
+   echo "Threads: no threads (pthread lib not found.)"
 fi