--- rpl/configure.ac 2016/09/28 12:55:55 1.170 +++ rpl/configure.ac 2016/10/11 09:27:46 1.175 @@ -9,11 +9,11 @@ AC_CONFIG_HEADERS([rplconfig.h]) dnl Libraries NCURSES=ncurses-6.0 -READLINE=readline-6.3 +READLINE=readline-7.0 UNITS=units-2.13 GSL=gsl-2.2.1 GPP=gpp-3.0 -GNUPLOT=gnuplot-5.0.3 +GNUPLOT=gnuplot-5.0.4 FILE=file-5.28 ICONV=libiconv-1.14 SQLITE=sqlite-3.14.2 @@ -1324,6 +1324,11 @@ case $OS in break ;; esac +BROKEN_SIGSEGV=-UBROKEN_SIGSEGV +BUILD_SIGSEGV=$SIGSEGV +LIBSIGSEGV=\$\(top_builddir\)/tools/$SIGSEGV/src/.libs/@LIB_PREFIX@sigsegv.a +INCSIGSEGV="-I\$(top_builddir)/tools/$SIGSEGV/src" + case $HOST in x86_64-*-linux-gnu) ARCH=amd64 @@ -1341,11 +1346,21 @@ case $HOST in ARCH=mipsel break;; + x86_64-unknown-cygwin) + BROKEN_SIGSEGV=-DBROKEN_SIGSEGV + BUILD_SIGSEGV= + INCSIGSEGV= + LIBSIGSEGV= + ARCH=$(echo $HOST | cut -f1 -d-) + 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) @@ -1391,6 +1406,8 @@ AC_SUBST(GIAC) AC_SUBST(INCMOTIF) AC_SUBST(LIBMOTIF) AC_SUBST(ZLIB) +AC_SUBST(BUILD_SIGSEGV) +AC_SUBST(BROKEN_SIGSEGV) AC_SUBST(CFLAGS) AC_SUBST(CXXFLAGS) @@ -1413,7 +1430,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)