Detect Irix/CC compiler and substitute AR="CC -ar".

[simgear.git] / configure.in

diff --git a/configure.in b/configure.in
index bdaa48e4288dc350bf63f62cb41195d56e3956da..f53cdb8f050240784578334d5ffe21fcf76d8560 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -35,16 +35,12 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 
 OS=`uname -s`
-if test $OS = "IRIX" -o $OS = "IRIX64"; then
-    if text $CC = "CC"; then
+if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then
+    if test "$CXX" = "CC"; then
         AR="CC -ar"
-    else
-        AR="ar"
+        AC_SUBST(AR)
     fi
-else
-    AR="ar"
 fi
-AC_SUBST(AR)
 
 if echo $includedir | egrep "simgear$" > /dev/null; then
     echo "includedir is" $includedir "libdir is" $libdir
@@ -66,7 +62,7 @@ AC_ARG_WITH(efence, [  --with-efence           Specify if we are building with "
 
 if test "x$with_efence" = "xyes" ; then
     echo "Building with efence"
-    LIBS= "$LIBS -lefence"
+    LIBS="$LIBS -lefence"
 fi
 
 dnl Check for MS Windows environment
@@ -267,8 +263,12 @@ AM_CONDITIONAL(HAVE_ZLIB, test "x$ac_cv_header_zlib_h" = "xyes" )
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS( \
-       fcntl.h getopt.h malloc.h memory.h stdlib.h sys/param.h sys/stat.h \
-        sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h )
+       fcntl.h getopt.h malloc.h memory.h stdint.h stdlib.h sys/param.h \
+       sys/stat.h sys/time.h sys/timeb.h unistd.h windows.h winbase.h values.h )
+
+if test "x$ac_cv_header_stdint_h" = "xyes"; then
+    AC_DEFINE( HAVE_STDINT_H )
+fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -282,7 +282,7 @@ AC_FUNC_VPRINTF
 AC_CHECK_FUNCS( ftime gettimeofday timegm memcpy bcopy mktime strstr rand \
        random setitimer getitimer signal GetLocalTime rint getrusage )
 
-AM_CONFIG_HEADER(simgear/config.h)
+AM_CONFIG_HEADER(simgear/simgear_config.h)
 
 AC_OUTPUT( \
        Makefile \
@@ -345,7 +345,7 @@ if test "x$ac_cv_header_zlib_h" != "xyes"; then
 fi
 
 if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h" = "xyes"; then
-   echo "Threads: pthread is supported."
+   echo "Threads: pthread lib found."
 else
-   echo "Threads: no threads (pthreads not found.)"
+   echo "Threads: no threads (pthread lib not found.)"
 fi