--- rpl/configure.ac 2015/06/04 19:28:21 1.121 +++ rpl/configure.ac 2018/01/01 10:34:06 1.205 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.21]) +AC_INIT([rpl],[4.1.28]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -8,27 +8,28 @@ AC_SUBST(target_cpu) AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries -NCURSES=ncurses-5.9 -READLINE=readline-6.3 -UNITS=units-2.11 -GSL=gsl-1.16 +NCURSES=ncurses-6.0 +READLINE=readline-7.0 +UNITS=units-2.14 +GSL=gsl-2.4 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.0.0 -FILE=file-5.11 -ICONV=libiconv-1.14 -SQLITE=sqlite-3.8.10.2 -OPENSSL=openssl-1.0.2a -OPENMOTIF=openmotif-2.3.4 -LIBXPM=libXpm-3.5.9 +GNUPLOT=gnuplot-5.0.6 +FILE=file-5.31 +ICONV=libiconv-1.15 +SQLITE=sqlite-3.19.3 +OPENSSL=openssl-1.1.0g +OPENMOTIF=openmotif-2.3.7 +LIBXPM=libXpm-3.5.12 SIGSEGV=libsigsegv-2.11 ZLIB=zlib-1.2.8 -GMP=gmp-6.0.0 -MPFR=mpfr-3.1.2 -NTL=ntl-5.5.2 -COCOA=CoCoALib-0.9950 -PARI=pari-2.5.4 -GIAC=giac-1.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.99542 +PARI=pari-2.7.6 +GIAC=giac-1.2.2 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -157,6 +158,20 @@ fi],[ ] ) +AC_ARG_ENABLE(native, +[ --enable-native enable gcc native compiler option (default=no)],[ +if test "$enableval" = "yes"; then + CFLAGS="$CFLAGS -mtune=native -march=native" + FFLAGS="$FFLAGS -mtune=native -march=native" + CXXFLAGS="$CXXFLAGS -mtune=native -march=native" + FCFLAGS="$FCFLAGS -mtune=native -march=native" +else + NATIVE= +fi],[ + NATIVE= + ] +) + AC_ARG_WITH(rpltools, [ --with-rpltools specify rpltools path used for cross compilation],[ if test "$with_rpltools" = "no" -o "$with_rpltools" = "yes"; then @@ -196,22 +211,22 @@ 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 CXXFLAGS=$ABI FCFLAGS=$ABI else - CFLAGS="$CFLAGS $ABI $enable_optimization" - FFLAGS="$FFLAGS $ABI $enable_optimization" - CXXFLAGS="$CXXFLAGS $ABI $enable_optimization" - FCFLAGS="$FCFLAGS $ABI $enable_optimization" -fi],[ CFLAGS="$CFLAGS $ABI $OPTIMISATION_C" FFLAGS="$FFLAGS $ABI $OPTIMISATION_F" CXXFLAGS="$CXXFLAGS $ABI $OPTIMISATION_CXX" FCFLAGS="$FCFLAGS $ABI $OPTIMISATION_F" +fi],[ + CFLAGS="$CFLAGS $ABI -O2" + FFLAGS="$FFLAGS $ABI -O2" + CXXFLAGS="$CXXFLAGS $ABI -O2" + FCFLAGS="$FCFLAGS $ABI -O2" ] ) @@ -234,27 +249,6 @@ if test "$ac_cv_c_inline" != no ; then AC_SUBST(HAVE_INLINE) fi -AC_MSG_CHECKING([for pselect]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include - #include - #include - #include - ], - [ - struct timespec tv; - fd_set s1, s2, s3; - tv.tv_sec=1; - tv.tv_nsec=0; - FD_SET(1, &s1); FD_SET(2, &s2); FD_SET(3, &s3); - pselect(5, &s1, &s2, &s3, &tv, NULL); - return(0); - ])], -[PSELECT=-DPSELECT; AC_MSG_RESULT(yes)], -[PSELECT=-UPSELECT; AC_MSG_RESULT(no)] - ) -AC_SUBST(PSELECT) - AC_ARG_ENABLE(sysv-ipcs, [ --enable-sysv-ipcs use SystemV IPC functions [[default=guessed]]], [ if test "$enableval" = "no"; then @@ -384,6 +378,7 @@ libX="" LIBMOTIF="" INCMOTIF="" BUILD_OPENMOTIF="" +MODULE_MOTIF="" AC_ARG_ENABLE(motif, [ --enable-motif provide the Motif support [[default=guessed]]], [ @@ -399,8 +394,8 @@ else fi) if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then - libX="$X_LIBS -lXt -lX11 -lXext" - LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/lib/Xm/.libs/libXm.a \ + libX="$X_LIBS -lXt -lX11 -lXext -lXinerama" + LIBMOTIF="\$(top_builddir)/tools/$OPENMOTIF/install/lib/libXm.a \ \$(top_builddir)/tools/$LIBXPM/src/.libs/libXpm.a" INCMOTIF="-I\$(top_srcdir)/tools/$OPENMOTIF/lib \ -I\$(top_builddir)/tools/$OPENMOTIF/lib \ @@ -411,6 +406,8 @@ if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPP AC_CONFIG_SUBDIRS(tools/$LIBXPM) AC_CONFIG_SUBDIRS(tools/$OPENMOTIF) fi; + + MODULE_MOTIF="modules/motif" fi AC_ARG_ENABLE(experimental, @@ -446,6 +443,12 @@ if test "$UUENCODE" = no; then AC_MSG_ERROR([Can not find uuencode !]) fi +dnl Checks for patch +AC_CHECK_PROG(PATCH, patch, yes, no) +if test "$PATCH" = no; then + AC_MSG_ERROR([Can not find patch !]) +fi + if test ! -d tools; then mkdir tools fi @@ -453,17 +456,14 @@ 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 && \ - if test $i = "../ncurses-5.9-20140607.patch.gz" ; then \ - rm -f Ada95/src/library.gpr; \ - fi && \ gunzip -c $i | patch -p1; done); fi @@ -536,6 +536,10 @@ if test ! -d "$srcdir"/rplcas/$MPFR; the gunzip -c "$srcdir"/rplcas/$MPFR.tar.gz | \ (cd "$srcdir/rplcas" && tar -xf -) fi +if test ! -d "$srcdir"/rplcas/$MPFI; then + gunzip -c "$srcdir"/rplcas/$MPFI.tar.gz | \ + (cd "$srcdir/rplcas" && tar -xf -) +fi if test ! -d rplcas/$NTL; then gunzip -c "$srcdir"/rplcas/$NTL.tar.gz | \ (cd rplcas && tar -xf -) @@ -702,14 +706,23 @@ AC_SUBST(libX) AC_SUBST(includeX) dnl Date -DATE=$(LANG=C date +"%A, %e %B %Y %T %z") +DATE=$(env LC_ALL=C date +"%A, %e %B %Y %T %z") +DATE_FR=$(env LC_ALL=fr_FR date +"%A, %e %B %Y %T %z") AC_SUBST(DATE) +AC_SUBST(DATE_FR) dnl Checks for libraries AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can not find libm !])) AC_CHECK_LIB(c, pthread_mutex_init,, [AC_CHECK_LIB(pthread, main,, AC_MSG_ERROR([Can not find libpthread !]))]) +if test "$MOTIF_SUPPORT" = "-DMOTIF_SUPPORT"; then + AC_CHECK_LIB(Xinerama, XineramaIsActive,, + AC_MSG_ERROR([Can not find libXinerama !])) +fi +AC_CHECK_LIB(gomp, omp_get_num_procs,, AC_MSG_ERROR([Can not find libgomp !])) +OPENMP=-lgomp +AC_SUBST(OPENMP) dnl Check for union semun AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[ @@ -748,7 +761,7 @@ AC_ARG_WITH(mysql, [ --with-mysql=PATH specify directory for installed mysql], [], [with_mysql=check]) -if test "x$with_mysql" = xcheck -o "x$with_mysql" = yes; then +if test "x$with_mysql" = xcheck -o "x$with_mysql" = xyes; then libMySQLinc="-I/usr/include" libMySQLlib="/usr/lib" @@ -1177,8 +1190,8 @@ esac AC_SUBST(OS) -DATE=$(env LC_ALL=C date +'%A %x, %X %Z') MALLOC= +NO_EXPORT_DYNAMIC=-Wl,--no-export-dynamic case $OS in Darwin) @@ -1309,6 +1322,9 @@ esac dnl Correction d'un problème de compilation pour GNUplot 5.0.0 ac_configure_args="$ac_configure_args --disable-wxwidgets" +dnl Correction d'un problème d'ABI avec readline +ac_configure_args="$ac_configure_args \ + --with-abi-version=5.9 --with-rel-version=5.9" case $OS in OS2) @@ -1324,6 +1340,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 @@ -1341,17 +1367,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) @@ -1382,13 +1422,17 @@ AC_SUBST(EXT_SQL) AC_SUBST(MALLOC) AC_SUBST(GMP) AC_SUBST(MPFR) +AC_SUBST(MPFI) AC_SUBST(NTL) AC_SUBST(COCOA) AC_SUBST(PARI) AC_SUBST(GIAC) AC_SUBST(INCMOTIF) AC_SUBST(LIBMOTIF) +AC_SUBST(MODULE_MOTIF) AC_SUBST(ZLIB) +AC_SUBST(BUILD_SIGSEGV) +AC_SUBST(BROKEN_SIGSEGV) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) @@ -1411,7 +1455,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) @@ -1432,6 +1478,8 @@ AC_CONFIG_FILES(rplcas/Makefile) AC_CONFIG_FILES(rplawk/Makefile) AC_CONFIG_FILES(lapack/lapack/Makefile) AC_CONFIG_FILES(lapack/blas/Makefile) +AC_CONFIG_FILES(modules/motif/Makefile) +AC_CONFIG_FILES(modules/sets/Makefile) AC_CONFIG_FILES(man/rpl.1) AC_CONFIG_FILES(man/rplcc.1)