X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=configure.in;h=f53cdb8f050240784578334d5ffe21fcf76d8560;hb=f93fa4b613bdbbe73c04b10563834defae736657;hp=bf4b516cf77ee9bb40d810044a67282b9f552519;hpb=400c9d6a2dede85c42abb256b08c52274e7aad48;p=simgear.git diff --git a/configure.in b/configure.in index bf4b516c..f53cdb8f 100644 --- 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 @@ -286,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 \