--- rpl/configure.ac 2013/02/27 17:11:39 1.57 +++ rpl/configure.ac 2013/03/23 17:57:55 1.63 @@ -13,14 +13,15 @@ READLINE=readline-6.2 UNITS=units-2.01 GSL=gsl-1.15 GPP=gpp-3.0 -GNUPLOT=gnuplot-4.6.1 +GNUPLOT=gnuplot-4.6.2 FILE=file-5.11 -ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.15.2 +ICONV=libiconv-1.14 +SQLITE=sqlite-3.7.16 OPENSSL=openssl-1.0.1e OPENMOTIF=openmotif-2.3.4 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.11 +ZLIB=zlib-1.2.7 GMP=gmp-5.1.1 MPFR=mpfr-3.1.1 @@ -500,6 +501,10 @@ if test ! -d tools/$OPENSSL; then gunzip -c "$srcdir"/tools/$OPENSSL.tar.gz | \ (cd tools && tar -xf -) fi +if test ! -d tools/$ZLIB; then + gunzip -c "$srcdir"/tools/$ZLIB.tar.gz | \ + (cd tools && tar -xf - && cd $ZLIB && ./configure --static) +fi if test ! -d rplcas; then mkdir rplcas fi @@ -1304,7 +1309,7 @@ case $HOST in ARCH=armel break;; - mips*el-*-linux-gnu) + mips*el-unknown-linux-gnu) ARCH=mipsel break;; @@ -1356,6 +1361,7 @@ AC_SUBST(PARI) AC_SUBST(GIAC) AC_SUBST(INCMOTIF) AC_SUBST(LIBMOTIF) +AC_SUBST(ZLIB) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) @@ -1381,16 +1387,8 @@ if test $RECURSIVE = yes; then AC_CONFIG_SUBDIRS(tools/$SIGSEGV) fi -if test x$MYSQL_LIB = x"yes" -o x$POSTGRESQL_LIB = x"yes"; then - ZLIB=-lz -else - ZLIB= -fi - -AC_SUBST(ZLIB) - AC_CONFIG_FILES(Makefile) -AC_CONFIG_FILES(COPYING) +AC_CONFIG_FILES(HEADER) AC_CONFIG_FILES(tools/Makefile) AC_CONFIG_FILES(src/Makefile) AC_CONFIG_FILES(man/Makefile)