--- rpl/configure.ac	2016/09/26 14:02:36	1.165
+++ rpl/configure.ac	2017/08/21 09:11:23	1.202
@@ -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.28])
 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
-LIBXPM=libXpm-3.5.11
+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.12
 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"
 	]
 )
 
@@ -378,6 +378,7 @@ libX=""
 LIBMOTIF=""
 INCMOTIF=""
 BUILD_OPENMOTIF=""
+MODULE_MOTIF=""
 
 AC_ARG_ENABLE(motif,
 [  --enable-motif          provide the Motif support [[default=guessed]]], [
@@ -393,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 \
@@ -405,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,
@@ -440,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
@@ -447,13 +456,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 +716,10 @@ 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
 
 dnl Check for union semun
 AC_CHECK_TYPE([union semun], SEMUN=-DUNION_SEMUN, SEMUN=-UUNION_SEMUN, [[
@@ -1175,6 +1188,7 @@ esac
 AC_SUBST(OS)
 
 MALLOC=
+NO_EXPORT_DYNAMIC=-Wl,--no-export-dynamic
 
 case $OS in
     Darwin)
@@ -1323,6 +1337,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 +1364,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)
@@ -1388,7 +1426,10 @@ 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 +1452,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 +1475,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)