--- rpl/configure.ac 2017/06/20 15:39:11 1.188 +++ rpl/configure.ac 2018/12/21 10:56:02 1.228 @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([rpl],[4.1.26]) +AC_INIT([rpl],[4.1.29]) AC_CANONICAL_TARGET AC_CANONICAL_TARGET AM_INIT_AUTOMAKE(silent-rules) @@ -10,26 +10,26 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-6.0 READLINE=readline-7.0 -UNITS=units-2.13 -GSL=gsl-2.4 +UNITS=units-2.16 +GSL=gsl-2.5 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.0.5 -FILE=file-5.29 -ICONV=libiconv-1.14 -SQLITE=sqlite-3.16.2 -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.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 +GNUPLOT=gnuplot-5.2.5 +FILE=file-5.33 +ICONV=libiconv-1.15 +SQLITE=sqlite-3.26.0 +OPENSSL=openssl-1.1.1a +OPENMOTIF=motif-2.3.8 +LIBXPM=libXpm-3.5.12 +SIGSEGV=libsigsegv-2.12 +ZLIB=zlib-1.2.11 + +GMP=gmp-6.1.2 +MPFR=mpfr-4.0.1 +MPFI=mpfi-1.5.3 +NTL=ntl-11.0.0 +COCOA=CoCoALib-0.99563 +PARI=pari-2.9.5 +GIAC=giac-1.4.9 dnl 32 bits ABI AC_ARG_WITH(gcc_version, @@ -194,7 +194,8 @@ if test "$enableval" = "no"; then INCRPLCAS= else RPLCAS=-DRPLCAS - LIBRPLCAS=\$\(top_builddir\)/rplcas/lib/librplcas.a + LIBRPLCAS="\$(top_builddir)/rplcas/lib/librplcas.a" + LIBS+="-lcurl" INCRPLCAS="-I\$(top_builddir)/rplcas/include/giac \ -I\$(top_builddir)/rplcas/include" fi],[ @@ -298,7 +299,7 @@ AC_LINK_IFELSE( [SEMAPHORES_NOMMES=-DSEMAPHORES_NOMMES; AC_MSG_RESULT(no)] ) LDFLAGS=$LIBS -REG="" +LIBS=$REG else SEMAPHORES_NOMMES=-USEMAPHORES_NOMMES fi @@ -378,6 +379,7 @@ libX="" LIBMOTIF="" INCMOTIF="" BUILD_OPENMOTIF="" +MODULE_MOTIF="" AC_ARG_ENABLE(motif, [ --enable-motif provide the Motif support [[default=guessed]]], [ @@ -393,8 +395,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 \ @@ -405,6 +407,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, @@ -440,6 +444,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 @@ -447,13 +457,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); @@ -707,6 +717,13 @@ AC_CHECK_LIB(m, main,, AC_MSG_ERROR([Can 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, [[ @@ -1139,11 +1156,11 @@ AC_MSG_CHECKING([whether CC supports -ma AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -malign-double"], [AC_MSG_RESULT([no])]) -CFLAGS=-mieee-fp -AC_MSG_CHECKING([whether CC supports -mieee-fp]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], - [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -mieee-fp"], - [AC_MSG_RESULT([no])]) +#CFLAGS=-mieee-fp +#AC_MSG_CHECKING([whether CC supports -mieee-fp]) +#AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], +# [AC_MSG_RESULT([yes]); FPCFLAGS="$FPCFLAGS -mieee-fp"], +# [AC_MSG_RESULT([no])]) CFLAGS=-mieee AC_MSG_CHECKING([whether CC supports -mieee]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], @@ -1413,6 +1430,7 @@ 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) @@ -1461,6 +1479,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)