Commit d608a83a authored by unknown's avatar unknown
Browse files

Better AR guessing. 


configure.in:
  Move AR guessing to misc.m4.
parent 8a52ef4a

config/ac-macros/misc.m4

+29 −0
Original line number Diff line number Diff line
@@ -737,3 +737,32 @@ then 
fi

AC_SUBST(CXX_VERSION)

])



AC_DEFUN([MYSQL_PROG_AR], [

AC_REQUIRE([MYSQL_CHECK_CXX_VERSION])

case $CXX_VERSION in

  MIPSpro*)

    AR=$CXX

    ARFLAGS="-ar -o"

  ;;

  *Forte*)

    AR=$CXX

    ARFLAGS="-xar -o"

  ;;

  *)

    if test -z "$AR"

    then

      AC_CHECK_PROG([AR], [ar], [ar])

    fi

    if test -z "$AR"

    then

      AC_MSG_ERROR([You need ar to build the library])

    fi

    if test -z "$ARFLAGS"

    then

      ARFLAGS="cru"

    fi

esac

AC_SUBST(AR)

AC_SUBST(ARFLAGS)

])

configure.in

+1 −9
Original line number Diff line number Diff line
@@ -354,15 +354,7 @@ then 
    [1], [Defined by configure. Use explicit template instantiation.])

fi



case $CXX_VERSION in

  MIPSpro*)

    AR=$CXX

    ARFLAGS="-ar -o"

  ;;

  *Forte*)

    AR=$CXX

    ARFLAGS="-xar -o"

esac

MYSQL_PROG_AR



# Avoid bug in fcntl on some versions of linux

AC_MSG_CHECKING("if we should use 'skip-locking' as default for $target_os")