--- rpl/configure.ac 2012/05/30 12:24:25 1.33 +++ rpl/configure.ac 2013/10/05 18:31:31 1.79 @@ -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.16]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -10,24 +10,25 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-5.9 READLINE=readline-6.2 -UNITS=units-1.88 -GSL=gsl-1.15 +UNITS=units-2.01 +GSL=gsl-1.16 GPP=gpp-3.0 -GNUPLOT=gnuplot-4.6.0 +GNUPLOT=gnuplot-4.6.3 FILE=file-5.11 -ICONV=libiconv-1.13.1 -SQLITE=sqlite-3.7.11 -OPENSSL=openssl-1.0.1c -OPENMOTIF=openmotif-2.3.3 +ICONV=libiconv-1.14 +SQLITE=sqlite-3.8.0.2 +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.0.5 -MPFR=mpfr-3.1.0 +GMP=gmp-5.1.2 +MPFR=mpfr-3.1.2 NTL=ntl-5.5.2 COCOA=CoCoALib-0.9950 -PARI=pari-2.5.1 -GIAC=giac-0.9.6 +PARI=pari-2.5.4 +GIAC=giac-1.1.0 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -36,8 +37,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) @@ -236,7 +250,7 @@ else fi], REG=$LDFLAGS POSIX_IPCS=guessed -LDFLAGS=-lrt +LDFLAGS="-lrt -lpthread" [AC_MSG_CHECKING([for POSIX semaphores and shared objects]) AC_LINK_IFELSE( [AC_LANG_PROGRAM([#include @@ -410,6 +424,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 +475,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 +484,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 -) @@ -480,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 @@ -548,6 +573,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" @@ -681,6 +712,12 @@ dnl Do we need to use -lrt? AC_CHECK_LIB(rt, nanosleep, LIBS="$LIBS -lrt", AC_MSG_WARN([librt doesn't seem to be needed on this system.])) +AC_CHECK_LIB(rt, shm_open, LIBS="$LIBS -lrt", + AC_MSG_WARN([librt doesn't seem to be needed on this system.])) + +AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", + AC_MSG_WARN([libpthread doesn't seem to be needed on this system.])) + dnl Do we need to use -lsocket? AC_CHECK_LIB(socket, bind, LIBS="$LIBS -lsocket", AC_MSG_WARN([libsocket doesn't seem to be needed on this system.])) @@ -1177,6 +1214,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 +1232,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,8 +1315,12 @@ case $HOST in ARCH=armel break;; + mips*el-unknown-linux-gnu) + ARCH=mipsel + break;; + *) - ARCH=unknown + ARCH=$(echo $HOST | cut -f1 -d-) break ;; esac @@ -1311,6 +1354,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) @@ -1323,6 +1367,7 @@ AC_SUBST(PARI) AC_SUBST(GIAC) AC_SUBST(INCMOTIF) AC_SUBST(LIBMOTIF) +AC_SUBST(ZLIB) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) @@ -1348,16 +1393,8 @@ if test $RECURSIVE = yes; then AC_CONFIG_SUBDIRS(tools/$SIGSEGV) fi -if test $MYSQL_LIB = "yes" -o $POSTGRESQL_LIB = "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)