--- rpl/configure.ac 2012/05/30 12:24:25 1.33 +++ rpl/configure.ac 2013/02/27 17:11:39 1.57 @@ -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.13]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -10,24 +10,24 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-5.9 READLINE=readline-6.2 -UNITS=units-1.88 +UNITS=units-2.01 GSL=gsl-1.15 GPP=gpp-3.0 -GNUPLOT=gnuplot-4.6.0 +GNUPLOT=gnuplot-4.6.1 FILE=file-5.11 ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.11 -OPENSSL=openssl-1.0.1c -OPENMOTIF=openmotif-2.3.3 +SQLITE=sqlite-3.7.15.2 +OPENSSL=openssl-1.0.1e +OPENMOTIF=openmotif-2.3.4 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.11 -GMP=gmp-5.0.5 -MPFR=mpfr-3.1.0 +GMP=gmp-5.1.1 +MPFR=mpfr-3.1.1 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9950 PARI=pari-2.5.1 -GIAC=giac-0.9.6 +GIAC=giac-1.1.0 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) @@ -410,6 +423,12 @@ fi], [PROFILAGE=""]) AC_SUBST(PROFILAGE) +dnl Checks for uuencode +AC_CHECK_PROG(UUENCODE, uuencode, yes, no) +if test "$UUENCODE" = no; then + AC_MSG_ERROR([Can not find uuencode !]) +fi + if test ! -d tools; then mkdir tools fi @@ -455,10 +474,6 @@ if test ! -d "$srcdir"/tools/$FILE; then (cd "$srcdir/tools"/$FILE && gunzip -c ../$FILE.diff.gz | patch -p1 && \ autoreconf) fi -if test ! -d "$srcdir"/tools/$ICONV; then - gunzip -c "$srcdir"/tools/$ICONV.tar.gz | \ - (cd "$srcdir/tools" && tar -xf -) -fi if test ! -d "$srcdir"/tools/$SQLITE; then gunzip -c "$srcdir"/tools/$SQLITE.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) @@ -468,6 +483,11 @@ if test ! -d "$srcdir"/tools/$SIGSEGV; t (cd "$srcdir/tools" && tar -xf -) (cd "$srcdir/tools/$SIGSEGV" && ./autogen.sh --skip-gnulib) 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) +fi if test ! -d "$srcdir"/tools/$OPENMOTIF; then gunzip -c "$srcdir"/tools/$OPENMOTIF.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) @@ -548,6 +568,12 @@ if test "$SED" = no; then AC_MSG_ERROR([Can not find sed !]) fi +dnl Checks for yacc +AC_CHECK_PROG(YACC, yacc, yes, no) +if test "$YACC" = no; then + AC_MSG_ERROR([Can not find yacc !]) +fi + dnl Checks for TeX, LaTeX, dvips, gs, gv, vim and gnuplot if test "$TEX_SUPPORT" = guessed; then POSTSCRIPT_SUPPORT="-DPOSTSCRIPT_SUPPORT" @@ -1177,6 +1203,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= @@ -1194,6 +1221,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= @@ -1276,6 +1304,10 @@ case $HOST in ARCH=armel break;; + mips*el-*-linux-gnu) + ARCH=mipsel + break;; + *) ARCH=unknown break ;; @@ -1311,6 +1343,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) @@ -1348,7 +1381,7 @@ if test $RECURSIVE = yes; then AC_CONFIG_SUBDIRS(tools/$SIGSEGV) fi -if test $MYSQL_LIB = "yes" -o $POSTGRESQL_LIB = "yes"; then +if test x$MYSQL_LIB = x"yes" -o x$POSTGRESQL_LIB = x"yes"; then ZLIB=-lz else ZLIB=