renamed config.h to simgear_config.h

[simgear.git] / configure.in

diff --git a/configure.in b/configure.in
index 13c6fcfa69388bf89e196d9a20758fdd2d63f306..ab539c2156ca02d9f9f21fddb968ca1418ef207d 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
@@ -54,7 +66,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
@@ -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)
@@ -255,8 +267,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
@@ -270,7 +286,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 \
@@ -332,8 +348,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