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

Diff for /rpl/Attic/configure.in between versions 1.9 and 1.16

version 1.9, 2010/03/04 10:09:30 version 1.16, 2010/04/07 07:16:10
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.0.11])  AC_INIT([rpl],[4.0.13])
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AC_CANONICAL_TARGET  AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE  AM_INIT_AUTOMAKE
Line 10  dnl Libraries Line 10  dnl Libraries
 NCURSES=ncurses-5.7-20100206  NCURSES=ncurses-5.7-20100206
 READLINE=readline-6.1  READLINE=readline-6.1
 UNITS=units-1.87  UNITS=units-1.87
 GSL=gsl-1.13  GSL=gsl-1.14
 GPP=gpp-2.24  GPP=gpp-2.24
 GNUPLOT=gnuplot-4.2.6  GNUPLOT=gnuplot-4.4.0
 FILE=file-5.03  FILE=file-5.03
 ICONV=libiconv-1.13.1  ICONV=libiconv-1.13.1
   SQLITE=sqlite-3.6.23.1
   OPENSSL=openssl-1.0.0
   
 dnl Checks for C compiler  dnl Checks for C compiler
 AC_PROG_CC(gcc-4.4 gcc)  AC_PROG_CC(gcc-4.4 gcc)
Line 117  AC_ARG_ENABLE(final-encoding, Line 119  AC_ARG_ENABLE(final-encoding,
 [  --enable-final-encoding force final encoding [[default=guessed]]], [  [  --enable-final-encoding force final encoding [[default=guessed]]], [
 if test "$enableval" = "no"; then  if test "$enableval" = "no"; then
     FINAL_ENCODING="\$(shell locale charmap | \      FINAL_ENCODING="\$(shell locale charmap | \
         awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')"          \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')"
 else  else
     FINAL_ENCODING="$enable_final_encoding"      FINAL_ENCODING="$enable_final_encoding"
 fi],  fi],
 FINAL_ENCODING="\$(shell locale charmap | \  FINAL_ENCODING="\$(shell locale charmap | \
     awk '/=/ { print \$\$3;} !/=/ { print \$\$1;}')")      \$(AWK) '/\=/ { print \$\$3;} !/\=/ { print \$\$1;}')")
   
 AC_ARG_ENABLE(tex,  AC_ARG_ENABLE(tex,
 [  --enable-tex            provide the TeX support [[default=guessed]]], [  [  --enable-tex            provide the TeX support [[default=guessed]]], [
Line 258  if test ! -d "$srcdir"/tools/$ICONV; the Line 260  if test ! -d "$srcdir"/tools/$ICONV; the
     gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \      gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \
             (cd "$srcdir/tools" && tar -xf -)              (cd "$srcdir/tools" && tar -xf -)
 fi  fi
   if test ! -d "$srcdir"/tools/$SQLITE; then
       gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \
               (cd "$srcdir/tools" && tar -xf -)
   fi
   if test ! -d tools/$OPENSSL; then
       gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \
               (cd tools && tar -xf -)
   fi
   
 AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no)  AC_CHECK_PROG(LIBTOOLIZE, libtoolize, yes, no)
 if test "$LIBTOOLIZE" = "no"; then  if test "$LIBTOOLIZE" = "no"; then
Line 302  AC_PROG_LN_S Line 312  AC_PROG_LN_S
 AC_PROG_MAKE_SET  AC_PROG_MAKE_SET
 AC_PROG_RANLIB  AC_PROG_RANLIB
   
 dnl Checks for awk  dnl Checks for nawk
 AC_CHECK_PROG(AWK, awk, yes, no)  AC_CHECK_PROG(AWK, nawk, yes, no)
 if test "$AWK" = no; then  if test "$AWK" = no; then
     AC_MSG_ERROR([Can not find awk !])      AC_MSG_ERROR([Can not find nawk !])
 fi  fi
   
 dnl Checks for sed  dnl Checks for sed
Line 759  AC_CONFIG_SUBDIRS(tools/$GSL) Line 769  AC_CONFIG_SUBDIRS(tools/$GSL)
 AC_CONFIG_SUBDIRS(tools/$GPP)  AC_CONFIG_SUBDIRS(tools/$GPP)
 AC_CONFIG_SUBDIRS(tools/$FILE)  AC_CONFIG_SUBDIRS(tools/$FILE)
 AC_CONFIG_SUBDIRS(tools/$ICONV)  AC_CONFIG_SUBDIRS(tools/$ICONV)
   AC_CONFIG_SUBDIRS(tools/$SQLITE)
   
   dnl Check for OpenSSL os/comp
   AC_ARG_WITH(openssl_arch,
   [  --with-openssl-arch=ARCH  specify os and compiler for openssl (ARCH or list)],
   [], [with_openssl_arch=none])
   
   if test "x$with_openssl_arch" = xnone; then
       (cd tools/$OPENSSL && ./config)
   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!])
   elif test "x$with_openssl_arch" = xlist; then
       (cd tools/$OPENSSL && ./Configure)
       AC_MSG_ERROR([Please specify OS and Architecture])
   else
       (cd tools/$OPENSSL && ./Configure $with_openssl_arch)
   fi
   
 if test "$MYGNUPLOT" = "yes"; then  if test "$MYGNUPLOT" = "yes"; then
     if test ! -d "$srcdir"/tools/$GNUPLOT; then      if test ! -d "$srcdir"/tools/$GNUPLOT; then
Line 808  esac Line 836  esac
 case $host_os in  case $host_os in
   
     cygwin*)      cygwin*)
         LIBICONV=libiconv.dll.a  
         OS=Cygwin          OS=Cygwin
     break ;;      break ;;
   
     interix*)      interix*)
         LIBICONV=libiconv.dll.a  
         OS=Interix          OS=Interix
     break ;;      break ;;
   
     *)      *)
         LIBICONV=libiconv.a  
         OS=$(uname)          OS=$(uname)
     break ;;      break ;;
   
 esac  esac
   
 AC_SUBST(LIBICONV)  
 AC_SUBST(OS)  AC_SUBST(OS)
   
 DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z')  DATE_FR=$(env LC_ALL=fr_FR date +'%A %x, %X %Z')
Line 846  AC_SUBST(GPP) Line 870  AC_SUBST(GPP)
 AC_SUBST(GNUPLOT)  AC_SUBST(GNUPLOT)
 AC_SUBST(FILE)  AC_SUBST(FILE)
 AC_SUBST(ICONV)  AC_SUBST(ICONV)
   AC_SUBST(SQLITE)
   AC_SUBST(OPENSSL)
 AC_SUBST(FINAL_ENCODING)  AC_SUBST(FINAL_ENCODING)
 AC_SUBST(DATE)  AC_SUBST(DATE)
 AC_SUBST(DATE_FR)  AC_SUBST(DATE_FR)
Line 868  AC_CONFIG_FILES(scripts/rplcc) Line 894  AC_CONFIG_FILES(scripts/rplcc)
 AC_CONFIG_FILES(scripts/rpllink)  AC_CONFIG_FILES(scripts/rpllink)
 AC_CONFIG_FILES(rpltags/Makefile)  AC_CONFIG_FILES(rpltags/Makefile)
 AC_CONFIG_FILES(rpliconv/Makefile)  AC_CONFIG_FILES(rpliconv/Makefile)
   AC_CONFIG_FILES(rplsums/Makefile)
 AC_CONFIG_FILES(lapack/lapack/Makefile)  AC_CONFIG_FILES(lapack/lapack/Makefile)
 AC_CONFIG_FILES(lapack/blas/Makefile)  AC_CONFIG_FILES(lapack/blas/Makefile)
   
Removed from v.1.9  
changed lines
  Added in v.1.16

CVSweb interface <joel.bertrand@systella.fr>