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

diff --git a/configure.in b/configure.in
index 9181d6d8..4f955310 100644
--- a/configure.in
+++ b/configure.in
@@ -6,16 +6,46 @@ dnl $Id$
 AC_INIT(simgear/bucket/newbucket.cxx)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 0.0.14)
+AM_INIT_AUTOMAKE(SimGear, 0.0.15)
+
+dnl Specify KAI C++ compiler and flags.
+dnl Borrowed with slight modification from blitz distribution.
+AC_ARG_WITH(cxx,
+  [  --with-cxx=COMPILER[:name-flags] set options for COMPILER (KCC)],
+  [case "$withval" in
+    KCC*)    # KAI C++ http://www.kai.com/
+      echo "Configuring for KAI C++"
+      AC_SG_SET_COMPILER($withval,"KCC","--restrict --strict_warnings")
+      CXX_OPTIMIZE_FLAGS=="+K3 -O3"
+      CXX_DEBUG_FLAGS="-g +K0"
+    ;;
+  esac
+])
+
+echo CXX = $CXX
+echo CC = $CC
 
 dnl Checks for programs.
 AC_PROG_MAKE_SET
 AC_PROG_CC
+AC_PROG_CPP
 AC_PROG_CXX
 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
@@ -77,6 +107,15 @@ AC_CHECK_LIB(m, cos)
 
 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" -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" -a "x$ac_cv_header_pthread_h" = "xyes")
+
 AC_CHECK_LIB(socket, socket)
 AC_CHECK_LIB(X11, XCreateWindow)
 AC_CHECK_LIB(Xext, XShmCreateImage)
@@ -256,11 +295,13 @@ AC_OUTPUT( \
 	simgear/io/Makefile \
 	simgear/magvar/Makefile \
 	simgear/math/Makefile \
+	simgear/metar/Makefile \
 	simgear/misc/Makefile \
 	simgear/route/Makefile \
 	simgear/screen/Makefile \
 	simgear/serial/Makefile \
 	simgear/sky/Makefile \
+	simgear/threads/Makefile \
 	simgear/timing/Makefile \
 	simgear/xgl/Makefile \
 	simgear/xml/Makefile \
@@ -302,3 +343,9 @@ fi
 if test "x$ac_cv_header_zlib_h" != "xyes"; then
    echo "Building zlib"
 fi
+
+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 (pthread lib not found.)"
+fi