--- rpl/configure.ac 2012/07/03 08:23:29 1.36 +++ rpl/configure.ac 2012/10/17 14:27:06 1.47 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.9]) +AC_INIT([rpl],[4.1.11]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -10,13 +10,13 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-5.9 READLINE=readline-6.2 -UNITS=units-1.88 +UNITS=units-1.89e GSL=gsl-1.15 GPP=gpp-3.0 GNUPLOT=gnuplot-4.6.0 FILE=file-5.11 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.12.1 +SQLITE=sqlite-3.7.14.1 OPENSSL=openssl-1.0.1c OPENMOTIF=openmotif-2.3.3 LIBXPM=libXpm-3.5.9 @@ -27,7 +27,7 @@ MPFR=mpfr-3.1.0 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9950 PARI=pari-2.5.1 -GIAC=giac-0.9.6 +GIAC=giac-0.9.8 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -36,8 +36,21 @@ CC=gcc-$with_gcc_version CXX=g++-$with_gcc_version CF=gfortran-$with_gcc_version F77=gfortran-$with_gcc_version +AC_SUBST(CC) +AC_SUBST(CXX) +AC_SUBST(CF) +AC_SUBST(F77) ],[]) +dnl Checks for Bash +BASH=$(which bash | sed 's/\//\\\//g') + +if test x$BASH = x; then + AC_MSG_ERROR([Cannot find bash! You have to install it.]) +fi + +AC_SUBST(BASH) + dnl Checks for C compiler AC_PROG_CC(gcc) @@ -467,7 +480,7 @@ fi if test ! -d "$srcdir"/tools/$ICONV; then gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) - (cd "$srcdir"/tools/$ICONV && ln -sf ../$SIGSEGV/gnulib gnulib) + (cd "$srcdir"/tools/$ICONV && ln -sf ../$SIGSEGV/gnulib gnulib) fi if test ! -d "$srcdir"/tools/$OPENMOTIF; then gunzip -c "$srcdir"/tools/$OPENMOTIF.tar.gz | \ @@ -1178,6 +1191,7 @@ case $OS in OS/2) if test $FORCED_FINAL_ENCODING -eq 0; then \ FINAL_ENCODING=CP850; \ + FORCED_FINAL_ENCODING=1;\ fi; OS=OS2 NESTED_FUNCTIONS= @@ -1195,6 +1209,7 @@ case $OS in OpenBSD) if test $FORCED_FINAL_ENCODING -eq 0; then \ FINAL_ENCODING=UTF-8; \ + FORCED_FINAL_ENCODING=1;\ fi; EXPORT_DYNAMIC=-Wl,--export-dynamic NESTED_FUNCTIONS= @@ -1312,6 +1327,7 @@ AC_SUBST(OPENMOTIF) AC_SUBST(BUILD_OPENMOTIF) AC_SUBST(SIGSEGV) AC_SUBST(FINAL_ENCODING) +AC_SUBST(FORCED_FINAL_ENCODING) AC_SUBST(DATE) AC_SUBST(DATE_FR) AC_SUBST(EXT_SQL)