X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.in;h=8e210d9e79418e81a28514e2899557d306a33f1b;hb=f1a79e6b9fb70208f19bd9c19f68617addcca2e0;hp=ab539c2156ca02d9f9f21fddb968ca1418ef207d;hpb=e2b4c0787a4398199ef2d35e05963acd58b7a04c;p=simgear.git diff --git a/configure.in b/configure.in index ab539c21..8e210d9e 100644 --- a/configure.in +++ b/configure.in @@ -6,7 +6,7 @@ dnl $Id$ AC_INIT(simgear/bucket/newbucket.cxx) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(SimGear, 0.0.15) +AM_INIT_AUTOMAKE(SimGear, 0.0.16) dnl Specify KAI C++ compiler and flags. dnl Borrowed with slight modification from blitz distribution. @@ -34,17 +34,14 @@ AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_LN_S +AR="ar" 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 @@ -353,3 +350,9 @@ if test "x$ac_cv_lib_pthread_pthread_exit" = "xyes" -a "x$ac_cv_header_pthread_h else echo "Threads: no threads (pthread lib not found.)" fi + +if test "$OS" = "IRIX" -o "$OS" = "IRIX64"; then + if test "$CXX" = "CC"; then + echo "\nRemember to run: sh ../FlightGear/irix-hack.sh!\07\n" + fi +fi