Module: ppl/ppl Branch: master Commit: f0cd7dc9899fc7dac2580a97da69e6282bfc0576 URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=f0cd7dc9899fc...
Author: Roberto Bagnara bagnara@cs.unipr.it Date: Wed Feb 17 11:55:16 2010 +0100
Build the PWL unless not explicitly disabled at configuration time.
---
Watchdog/configure.ac | 21 +++++++-------------- configure.ac | 16 ++-------------- 2 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/Watchdog/configure.ac b/Watchdog/configure.ac index b0d2f4b..d4e2b86 100644 --- a/Watchdog/configure.ac +++ b/Watchdog/configure.ac @@ -332,26 +332,14 @@ no) esac AM_CONDITIONAL(VALGRIND_TESTS_ENABLED, test x"$enable_valgrind_tests" = xyes)
-# setitimer() is a strong requisite for the PWL. -AC_CHECK_FUNCS([setitimer], [have_setitimer=yes], [have_setitimer=no]) - -enableval=default +enableval=yes AC_MSG_CHECKING([whether to build the Parma Watchdog Library]) AC_ARG_ENABLE(watchdog, AS_HELP_STRING([--enable-watchdog], [build also the Parma Watchdog Library])) case "${enableval}" in yes) - if test x"$have_setitimer" = xyes - then - build_watchdog_library=yes - else - AC_MSG_ERROR([CANNOT BUILD THE WATCHDOG LIBRARY -*** THE SYSTEM DOES NOT PROVIDE THE SETITIMER FUNCTION.]) - fi - ;; -default) - build_watchdog_library=$have_setitimer + build_watchdog_library=yes ;; no) build_watchdog_library=no @@ -371,6 +359,11 @@ then
# Checks for the availability of C library functions in C++. AC_CHECK_DECLS([getenv], , , [#include <cstdlib>]) + AC_CHECK_DECLS([setitimer], [], [], [[ +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif + ]]) AC_CHECK_DECLS([sigaction], , , [#include <csignal>])
# Checks for typedefs, structures, and compiler characteristics. diff --git a/configure.ac b/configure.ac index d67f0ff..13fc9e8 100644 --- a/configure.ac +++ b/configure.ac @@ -762,26 +762,14 @@ fi extra_includes="${extra_includes}${extra_includes:+ }${gmp_includes_option}" extra_libraries="${extra_libraries}${extra_libraries:+ }${gmp_library_option}"
-# setitimer() is a strong requisite for the PWL. -AC_CHECK_FUNCS([setitimer], [have_setitimer=yes], [have_setitimer=no]) - -enableval=default +enableval=yes AC_MSG_CHECKING([whether to build the Parma Watchdog Library]) AC_ARG_ENABLE(watchdog, AS_HELP_STRING([--enable-watchdog], [build also the Parma Watchdog Library])) case "${enableval}" in yes) - if test x"$have_setitimer" = xyes - then - build_watchdog_library=yes - else - AC_MSG_ERROR([CANNOT BUILD THE WATCHDOG LIBRARY -*** THE SYSTEM DOES NOT PROVIDE THE SETITIMER FUNCTION.]) - fi - ;; -default) - build_watchdog_library=$have_setitimer + build_watchdog_library=yes ;; no) build_watchdog_library=no