--- rpl/configure.ac 2016/09/26 14:02:36 1.165 +++ rpl/configure.ac 2017/06/26 21:31:02 1.193 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.25]) +AC_INIT([rpl],[4.1.26]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -9,25 +9,25 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-6.0 -READLINE=readline-6.3 -UNITS=units-2.13 -GSL=gsl-2.2.1 +READLINE=readline-7.0 +UNITS=units-2.14 +GSL=gsl-2.4 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.0.3 -FILE=file-5.28 -ICONV=libiconv-1.14 -SQLITE=sqlite-3.14.2 -OPENSSL=openssl-1.0.2h -OPENMOTIF=openmotif-2.3.4 +GNUPLOT=gnuplot-5.0.6 +FILE=file-5.31 +ICONV=libiconv-1.15 +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 -GMP=gmp-6.1.1 -MPFR=mpfr-3.1.4 +GMP=gmp-6.1.2 +MPFR=mpfr-3.1.5 MPFI=mpfi-1.5.1 NTL=ntl-9.11.0 -COCOA=CoCoALib-0.9950 +COCOA=CoCoALib-0.99542 PARI=pari-2.7.6 GIAC=giac-1.2.2 @@ -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); @@ -1175,6 +1175,7 @@ esac AC_SUBST(OS) MALLOC= +NO_EXPORT_DYNAMIC=-Wl,--no-export-dynamic case $OS in Darwin) @@ -1323,6 +1324,16 @@ case $OS in break ;; esac +BROKEN_SIGSEGV=-UBROKEN_SIGSEGV +BUILD_SIGSEGV=$SIGSEGV +if test x"$LIB_PREFIX" = x"lib"; then + LIBSIGSEGV=\$\(top_builddir\)/tools/$SIGSEGV/src/.libs/libsigsegv.a +else + LIBSIGSEGV=\$\(top_builddir\)/tools/$SIGSEGV/src/.libs/sigsegv.a +fi +INCSIGSEGV="-I\$(top_builddir)/tools/$SIGSEGV/src" +CYGWIN_LDFLAGS= + case $HOST in x86_64-*-linux-gnu) ARCH=amd64 @@ -1340,17 +1351,31 @@ case $HOST in ARCH=mipsel break;; + x86_64-*-cygwin) + BROKEN_SIGSEGV=-DBROKEN_SIGSEGV + BUILD_SIGSEGV= + INCSIGSEGV= + LIBSIGSEGV= + ARCH=$(echo $HOST | cut -f1 -d-) + CYGWIN_LDFLAGS=-Wl,--allow-multiple-definition \ + -Wl,--out-implib,rpl.exe.a + break;; + *) ARCH=$(echo $HOST | cut -f1 -d-) break ;; esac +AC_SUBST(INCSIGSEGV) +AC_SUBST(LIBSIGSEGV) AC_SUBST(WHOLE_LIB1) AC_SUBST(WHOLE_LIB2) AC_SUBST(LIB_PREFIX) +AC_SUBST(CYGWIN_LDFLAGS) AC_SUBST(C_STANDARD) AC_SUBST(EXPORT_DYNAMIC) +AC_SUBST(NO_EXPORT_DYNAMIC) AC_SUBST(NESTED_FUNCTIONS) AC_SUBST(SEMAPHORES_NOMMES) AC_SUBST(IPCS_SYSV) @@ -1389,6 +1414,8 @@ AC_SUBST(GIAC) AC_SUBST(INCMOTIF) AC_SUBST(LIBMOTIF) AC_SUBST(ZLIB) +AC_SUBST(BUILD_SIGSEGV) +AC_SUBST(BROKEN_SIGSEGV) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) @@ -1411,7 +1438,9 @@ if test $RECURSIVE = yes; then AC_CONFIG_SUBDIRS(tools/$ICONV) AC_CONFIG_SUBDIRS(tools/$SQLITE) AC_CONFIG_SUBDIRS(tools/$UNITS) - AC_CONFIG_SUBDIRS(tools/$SIGSEGV) + if test x$BUILD_SIGSEGV = x$SIGSEGV; then + AC_CONFIG_SUBDIRS(tools/$SIGSEGV) + fi fi AC_CONFIG_FILES(Makefile)