--- rpl/configure.ac 2016/12/13 21:39:00 1.181 +++ rpl/configure.ac 2017/06/22 08:56:42 1.192 @@ -11,14 +11,14 @@ dnl Libraries NCURSES=ncurses-6.0 READLINE=readline-7.0 UNITS=units-2.13 -GSL=gsl-2.3 +GSL=gsl-2.4 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.0.4 -FILE=file-5.29 +GNUPLOT=gnuplot-5.0.6 +FILE=file-5.31 ICONV=libiconv-1.14 -SQLITE=sqlite-3.15.2 -OPENSSL=openssl-1.1.0b -OPENMOTIF=openmotif-2.3.4 +SQLITE=sqlite-3.19.3 +OPENSSL=openssl-1.1.0f +OPENMOTIF=openmotif-2.3.7 LIBXPM=libXpm-3.5.11 SIGSEGV=libsigsegv-2.11 ZLIB=zlib-1.2.8 @@ -211,7 +211,7 @@ AC_SUBST(INCRPLCAS) dnl Options AC_ARG_ENABLE(optimization, -[ --enable-optimization set compiler flags [[default=environment variables -O3]]], [ +[ --enable-optimization set compiler flags [[default=environment variables -O2, enable=environment variables -O3]]], [ if test "$enableval" = "no"; then CFLAGS=$ABI FFLAGS=$ABI @@ -223,10 +223,10 @@ else CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX" FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F" fi],[ - CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" - FFLAGS="$FFLAGS $ABI $OPTIMISATION_F" - CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX" - FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F" + CFLAGS="$CFLAGS $ABI -O2" + FFLAGS="$FFLAGS $ABI -O2" + CXXFLAGS="$CXXFLAGS $ABI -O2" + FCFLAGS="$FCFLAGS $ABI -O2" ] ) @@ -447,13 +447,13 @@ if test ! -d "$srcdir"/tools/$NCURSES; t gunzip -c "$srcdir"/tools/$NCURSES.tar.gz | \ (cd "$srcdir/tools" && tar -xf -) (cd "$srcdir/tools/"$NCURSES && \ - for i in ../$NCURSES*.sh.gz; - do TMP=$i; gunzip -c $i > ${TMP%.*}; + for i in $(ls ../$NCURSES*.sh.gz); + do echo Uncompressing script $i; TMP=$i; gunzip -c $i > ${TMP%.*}; done; - for i in ../$NCURSES*.sh; + for i in $(ls ../$NCURSES*.sh); do echo Applying script $i && chmod 775 $i && ./$i; done; - for i in ../$NCURSES*.patch.gz; + for i in $(ls ../$NCURSES*.patch.gz); do echo Applying patch $i && \ gunzip -c $i | patch -p1; done);