--- rpl/configure.ac 2016/10/10 15:03:39 1.173 +++ rpl/configure.ac 2016/10/11 12:40:10 1.176 @@ -1326,8 +1326,9 @@ esac BROKEN_SIGSEGV=-UBROKEN_SIGSEGV BUILD_SIGSEGV=$SIGSEGV -INCSIGSEGV=\$\(top_builddir\)/tools/$SIGSEGV/src/.libs/@LIB_PREFIX@sigsegv.a -LIBSIGSEGV="-I\$(top_builddir)/tools/$SIGSEGV/src" +LIBSIGSEGV=\$\(top_builddir\)/tools/$SIGSEGV/src/.libs/@LIB_PREFIX@sigsegv.a +INCSIGSEGV="-I\$(top_builddir)/tools/$SIGSEGV/src" +CYGWIN_LDFLAGS= case $HOST in x86_64-*-linux-gnu) @@ -1346,12 +1347,13 @@ case $HOST in ARCH=mipsel break;; - x86_64-unknown-cygwin) + x86_64-*-cygwin) BROKEN_SIGSEGV=-DBROKEN_SIGSEGV - SIGSEGV_SOURCE= + BUILD_SIGSEGV= INCSIGSEGV= LIBSIGSEGV= ARCH=$(echo $HOST | cut -f1 -d-) + CYGWIN_LDFLAGS=-Wl,--allow-multiple-definition break;; *) @@ -1364,6 +1366,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) @@ -1430,7 +1433,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)