--- rpl/configure.ac 2014/05/17 14:28:46 1.94 +++ rpl/configure.ac 2014/07/17 08:07:15 1.99 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.18]) +AC_INIT([rpl],[4.1.19]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -16,8 +16,8 @@ GPP=gpp-3.0 GNUPLOT=gnuplot-4.6.5 FILE=file-5.11 ICONV=libiconv-1.14 -SQLITE=sqlite-3.8.4.3 -OPENSSL=openssl-1.0.1g +SQLITE=sqlite-3.8.5 +OPENSSL=openssl-1.0.1h OPENMOTIF=openmotif-2.3.4 LIBXPM=libXpm-3.5.9 SIGSEGV=libsigsegv-2.11 @@ -174,18 +174,23 @@ AC_ARG_ENABLE(rplcas, if test "$enableval" = "no"; then RPLCAS=-URPLCAS LIBRPLCAS= + INCRPLCAS= else RPLCAS=-DRPLCAS LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a + INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \ + -I\$(top_builddir)/rplcas/include" fi],[ RPLCAS=-URPLCAS LIBRPLCAS= + INCRPLCAS= ] ) AC_SUBST(ABI) AC_SUBST(RPLCAS) AC_SUBST(LIBRPLCAS) +AC_SUBST(INCRPLCAS) dnl Options AC_ARG_ENABLE(optimization, @@ -446,7 +451,11 @@ if test ! -d "$srcdir"/tools/$NCURSES; t do echo Applying script $i && chmod 775 $i && ./$i; done; for i in ../$NCURSES*.patch.gz; - do echo Applying patch $i && gunzip -c $i | patch -p1; + do echo Applying patch $i && \ + if test $i = "../ncurses-5.9-20140607.patch.gz" ; then \ + rm -f Ada95/src/library.gpr; \ + fi && \ + gunzip -c $i | patch -p1; done); fi if test ! -d "$srcdir"/tools/$READLINE; then