--- rpl/configure.ac 2016/10/11 09:27:46 1.175 +++ rpl/configure.ac 2017/01/18 15:21:50 1.182 @@ -11,13 +11,13 @@ dnl Libraries NCURSES=ncurses-6.0 READLINE=readline-7.0 UNITS=units-2.13 -GSL=gsl-2.2.1 +GSL=gsl-2.3 GPP=gpp-3.0 GNUPLOT=gnuplot-5.0.4 -FILE=file-5.28 +FILE=file-5.29 ICONV=libiconv-1.14 -SQLITE=sqlite-3.14.2 -OPENSSL=openssl-1.1.0b +SQLITE=sqlite-3.15.2 +OPENSSL=openssl-1.1.0c OPENMOTIF=openmotif-2.3.4 LIBXPM=libXpm-3.5.11 SIGSEGV=libsigsegv-2.11 @@ -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)