--- rpl/configure.ac	2016/10/11 09:27:46	1.175
+++ rpl/configure.ac	2017/06/20 15:39:11	1.188
@@ -11,14 +11,14 @@ dnl Libraries
 NCURSES=ncurses-6.0
 READLINE=readline-7.0
 UNITS=units-2.13
-GSL=gsl-2.2.1
+GSL=gsl-2.4
 GPP=gpp-3.0
-GNUPLOT=gnuplot-5.0.4
-FILE=file-5.28
+GNUPLOT=gnuplot-5.0.5
+FILE=file-5.29
 ICONV=libiconv-1.14
-SQLITE=sqlite-3.14.2
-OPENSSL=openssl-1.1.0b
-OPENMOTIF=openmotif-2.3.4
+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
@@ -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"
 	]
 )
 
@@ -1326,8 +1326,13 @@ esac
 
 BROKEN_SIGSEGV=-UBROKEN_SIGSEGV
 BUILD_SIGSEGV=$SIGSEGV
-LIBSIGSEGV=\$\(top_builddir\)/tools/$SIGSEGV/src/.libs/@LIB_PREFIX@sigsegv.a
+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)
@@ -1346,12 +1351,14 @@ case $HOST in
 		ARCH=mipsel
 	break;;
 
-	x86_64-unknown-cygwin)
+	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;;
 
 	*)
@@ -1364,6 +1371,7 @@ 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)