Revision 0e627824 configure.ac
b/configure.ac | ||
---|---|---|
526 | 526 |
AC_GHC_PKG_REQUIRE(utf8-string) |
527 | 527 |
AC_GHC_PKG_REQUIRE(hslogger) |
528 | 528 |
|
529 |
# extra modules for confd functionality |
|
529 |
# extra modules for confd functionality; also needed for tests |
|
530 |
HS_NODEV= |
|
531 |
CONFD_PKG= |
|
532 |
AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1; CONFD_PKG="$CONFD_PKG vector"]) |
|
533 |
|
|
530 | 534 |
HS_REGEX_PCRE=-DNO_REGEX_PCRE |
535 |
AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=], |
|
536 |
[HS_NODEV=1; CONFD_PKG="$CONFD_PKG regex-pcre"]) |
|
537 |
AC_GHC_PKG_CHECK([text], [], [HS_NODEV=1; CONFD_PKG="$CONFD_PKG text"]) |
|
538 |
AC_GHC_PKG_CHECK([hinotify], [], [HS_NODEV=1; CONFD_PKG="$CONFD_PKG hinotify"]) |
|
539 |
AC_GHC_PKG_CHECK([Crypto], [], [HS_NODEV=1; CONFD_PKG="$CONFD_PKG Crypto"]) |
|
540 |
|
|
531 | 541 |
has_confd=False |
532 | 542 |
if test "$enable_confd" != no; then |
533 |
CONFD_PKG= |
|
534 |
AC_GHC_PKG_CHECK([regex-pcre], [HS_REGEX_PCRE=], |
|
535 |
[CONFD_PKG="$CONFD_PKG regex-pcre"]) |
|
536 |
AC_GHC_PKG_CHECK([Crypto], [], [CONFD_PKG="$CONFD_PKG Crypto"]) |
|
537 |
AC_GHC_PKG_CHECK([text], [], [CONFD_PKG="$CONFD_PKG text"]) |
|
538 |
AC_GHC_PKG_CHECK([hinotify], [], [CONFD_PKG="$CONFD_PKG hinotify"]) |
|
539 |
AC_GHC_PKG_CHECK([vector], [], [CONFD_PKG="$CONFD_PKG vector"]) |
|
540 | 543 |
if test -z "$CONFD_PKG"; then |
541 | 544 |
has_confd=True |
542 | 545 |
elif test "$enable_confd" = check; then |
... | ... | |
555 | 558 |
AC_SUBST(ENABLE_CONFD, $has_confd) |
556 | 559 |
AM_CONDITIONAL([ENABLE_CONFD], [test x$has_confd = xTrue]) |
557 | 560 |
|
558 |
#extra modules for monitoring daemon functionality |
|
561 |
#extra modules for monitoring daemon functionality; also needed for tests |
|
562 |
MONITORING_PKG= |
|
563 |
AC_GHC_PKG_CHECK([attoparsec], [], |
|
564 |
[HS_NODEV=1; MONITORING_PKG="$MONITORING_PKG attoparsec"]) |
|
565 |
AC_GHC_PKG_CHECK([snap-server], [], |
|
566 |
[NS_NODEV=1; MONITORING_PKG="$MONITORING_PKG snap-server"]) |
|
567 |
AC_GHC_PKG_CHECK([process], [], |
|
568 |
[HS_NODEV=1; MONITORING_PKG="$MONITORING_PKG process"]) |
|
569 |
|
|
559 | 570 |
has_monitoring=False |
560 | 571 |
if test "$enable_monitoring" != no; then |
561 |
MONITORING_PKG= |
|
562 |
AC_GHC_PKG_CHECK([attoparsec], [], |
|
563 |
[MONITORING_PKG="$MONITORING_PKG attoparsec"]) |
|
564 |
AC_GHC_PKG_CHECK([snap-server], [], |
|
565 |
[MONITORING_PKG="$MONITORING_PKG snap-server"]) |
|
566 |
AC_GHC_PKG_CHECK([process], [], |
|
567 |
[MONITORING_PKG="$MONITORING_PKG process"]) |
|
568 | 572 |
MONITORING_DEP= |
569 | 573 |
if test "$has_confd" = False; then |
570 | 574 |
MONITORING_DEP="$MONITORING_DEP confd" |
... | ... | |
603 | 607 |
AM_CONDITIONAL([ENABLE_MOND], [test "$has_monitoring" = True]) |
604 | 608 |
|
605 | 609 |
# development modules |
606 |
HS_NODEV= |
|
607 | 610 |
AC_GHC_PKG_CHECK([QuickCheck-2.*], [], [HS_NODEV=1], t) |
608 | 611 |
AC_GHC_PKG_CHECK([test-framework-0.6*], [], [HS_NODEV=1], t) |
609 | 612 |
AC_GHC_PKG_CHECK([test-framework-hunit], [], [HS_NODEV=1]) |
610 | 613 |
AC_GHC_PKG_CHECK([test-framework-quickcheck2], [], [HS_NODEV=1]) |
611 | 614 |
AC_GHC_PKG_CHECK([temporary], [], [HS_NODEV=1]) |
612 |
# FIXME: unify checks for non-test libraries (attoparsec, hinotify, ...) |
|
613 |
# that are needed to execute the tests, avoiding the duplication |
|
614 |
# of the checks. |
|
615 |
AC_GHC_PKG_CHECK([attoparsec], [], [HS_NODEV=1]) |
|
616 |
AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1]) |
|
617 |
AC_GHC_PKG_CHECK([process], [], [HS_NODEV=1]) |
|
618 |
AC_GHC_PKG_CHECK([snap-server], [], [HS_NODEV=1]) |
|
619 |
AC_GHC_PKG_CHECK([regex-pcre], [], [HS_NODEV=1]) |
|
620 |
AC_GHC_PKG_CHECK([Crypto], [], [HS_NODEV=1]) |
|
621 |
AC_GHC_PKG_CHECK([text], [], [HS_NODEV=1]) |
|
622 |
AC_GHC_PKG_CHECK([hinotify], [], [HS_NODEV=1]) |
|
623 | 615 |
if test -n "$HS_NODEV"; then |
624 | 616 |
AC_MSG_WARN(m4_normalize([Required development modules were not found, |
625 | 617 |
you won't be able to run Haskell unittests])) |
Also available in: Unified diff