[BACK]Return to configure.in CVS log [TXT] [DIR] Up to [local] / rpl

Diff for /rpl/Attic/configure.in between versions 1.66 and 1.70

version 1.66, 2011/06/27 13:14:28 version 1.70, 2011/07/22 07:38:00
Line 1 Line 1
 dnl Process this file with autoconf to produce a configure script.  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
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE  AM_INIT_AUTOMAKE
Line 23  MPFR=mpfr-3.0.1 Line 23  MPFR=mpfr-3.0.1
 NTL=ntl-5.5.2  NTL=ntl-5.5.2
 COCOA=CoCoALib-0.9943  COCOA=CoCoALib-0.9943
 PARI=pari-2.3.5  PARI=pari-2.3.5
 GIAC=giac-0.9.1  GIAC=giac-0.9.3
   
 dnl Checks for C compiler  dnl Checks for C compiler
 AC_PROG_CC(gcc)  AC_PROG_CC(gcc)
Line 118  dnl 32 bits ABI Line 118  dnl 32 bits ABI
 AC_ARG_WITH(32bits,  AC_ARG_WITH(32bits,
 [  --with-32bits-abi       force 32bits ABI (multilib)],[  [  --with-32bits-abi       force 32bits ABI (multilib)],[
 if test "$with-32bits-abi" = "no"; then  if test "$with-32bits-abi" = "no"; then
     CFLAGS=      ABI=
     FFLAGS=  else
     CXXFLAGS=      ABI=-m32
     FCFLAGS=  fi],[
       ABI=-m32
       ]
   )
   
   AC_ARG_WITH(64bits,
   [  --with-64bits-abi       force 64bits ABI (multilib)],[
   if test "$with-64bits-abi" = "no"; then
       ABI=
   else
       ABI=-m64
   fi],[
       ABI=-m64
       ]
   )
   
   dnl RPL/CAS support
   AC_ARG_WITH(rplcas,
   [  --with-rplcas           compile rplcas (default=no)],[
   if test "$with-rplcas" = "no"; then
       RPLCAS=-URPLCAS
       LIBRPLCAS=
 else  else
     CFLAGS="$CFLAGS -m32"      RPLCAS=-DRPLCAS
     FFLAGS="$FFLAGS -m32"      LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a
     FCFLAGS="$FCFLAGS -m32"  fi],[
 ],[      RPLCAS=-URPLCAS
     CFLAGS="$CFLAGS -m32"      LIBRPLCAS=
     FFLAGS="$FFLAGS -m32"  
     FCFLAGS="$FCFLAGS -m32"  
     ]      ]
 )  )
   
   AC_SUBST(ABI)
   AC_SUBST(RPLCAS)
   AC_SUBST(LIBRPLCAS)
   
 dnl Options  dnl Options
 AC_ARG_ENABLE(optimization,  AC_ARG_ENABLE(optimization,
 [  --enable-optimization   set compiler flags [[default=environment variables -O3]]], [  [  --enable-optimization   set compiler flags [[default=environment variables -O3]]], [
Line 916  if test $(uname) = "OS/2"; then Line 939  if test $(uname) = "OS/2"; then
     bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd"      bash -c "cd tools/$OPENSSL && os2/OS2-EMX.cmd"
 else  else
     if test "x$with_openssl_arch" = xnone; then      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      elif test "x$with_openssl_arch" = xyes -o "x$with_openssl_arch" = xno; then
         (cd tools/$OPENSSL && ./Configure)          (cd tools/$OPENSSL && ./Configure)
         AC_MSG_ERROR([OS/COMP informations are required!])          AC_MSG_ERROR([OS/COMP informations are required!])
Line 924  else Line 947  else
         (cd tools/$OPENSSL && ./Configure)          (cd tools/$OPENSSL && ./Configure)
         AC_MSG_ERROR([Please specify OS and Architecture])          AC_MSG_ERROR([Please specify OS and Architecture])
     else      else
         (cd tools/$OPENSSL && ./Configure $with_openssl_arch)          (cd tools/$OPENSSL && ./Configure no-asm $with_openssl_arch)
     fi      fi
 fi  fi
   
Removed from v.1.66  
changed lines
  Added in v.1.70

CVSweb interface <joel.bertrand@systella.fr>