--- rpl/Attic/configure.in 2011/06/27 15:27:25 1.69 +++ rpl/Attic/configure.in 2011/07/22 21:04:37 1.71 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.0]) +AC_INIT([rpl],[4.1.1]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE @@ -23,7 +23,7 @@ MPFR=mpfr-3.0.1 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9943 PARI=pari-2.3.5 -GIAC=giac-0.9.1 +GIAC=giac-0.9.3 dnl Checks for C compiler AC_PROG_CC(gcc) @@ -122,11 +122,41 @@ if test "$with-32bits-abi" = "no"; then else ABI=-m32 fi],[ - ABI=-m32 + ABI= + ] +) + +if test x$ABI = x; then +AC_ARG_WITH(64bits, +[ --with-64bits-abi force 64bits ABI (multilib)],[ +if test "$with-64bits-abi" = "no"; then + ABI= +else + ABI=-m64 +fi],[ + ABI= + ] +) +fi + +dnl RPL/CAS support +AC_ARG_WITH(rplcas, +[ --with-rplcas compile rplcas (default=no)],[ +if test "$with-rplcas" = "no"; then + RPLCAS=-URPLCAS + LIBRPLCAS= +else + RPLCAS=-DRPLCAS + LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a +fi],[ + RPLCAS=-URPLCAS + LIBRPLCAS= ] ) AC_SUBST(ABI) +AC_SUBST(RPLCAS) +AC_SUBST(LIBRPLCAS) dnl Options AC_ARG_ENABLE(optimization, @@ -911,7 +941,7 @@ if test $(uname) = "OS/2"; then bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd" else if test "x$with_openssl_arch" = xnone; then - (cd tools/$OPENSSL && ./config) + (cd tools/$OPENSSL && ./config no-asm) elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then (cd tools/$OPENSSL && ./Configure) AC_MSG_ERROR([OS/COMP informations are required!]) @@ -919,7 +949,7 @@ else (cd tools/$OPENSSL && ./Configure) AC_MSG_ERROR([Please specify OS and Architecture]) else - (cd tools/$OPENSSL && ./Configure $with_openssl_arch) + (cd tools/$OPENSSL && ./Configure no-asm $with_openssl_arch) fi fi