Revision 50ed57c1
| b/Makefile.am | ||
|---|---|---|
| 409 | 409 |
iallocators_SCRIPTS += $(filter htools/hail,$(HPROGS)) |
| 410 | 410 |
endif |
| 411 | 411 |
|
| 412 |
$(HALLPROGS): %: %.hs $(HSRCS) $(HSRCS2) |
|
| 412 |
$(HALLPROGS): %: %.hs $(HSRCS) $(HSRCS2) Makefile
|
|
| 413 | 413 |
cd htools && $(GHC) --make $(HFLAGS) $(HEXTRA) $(HTOOLS_NOCURL) \ |
| 414 | 414 |
$(patsubst htools/%,%,$@) |
| 415 | 415 |
|
| b/configure.ac | ||
|---|---|---|
| 248 | 248 |
[], |
| 249 | 249 |
[enable_htools=check]) |
| 250 | 250 |
|
| 251 |
# --enable-htools-rapi |
|
| 252 |
HTOOLS_RAPI= |
|
| 253 |
AC_ARG_ENABLE([htools-rapi], |
|
| 254 |
[AS_HELP_STRING([--enable-htools-rapi], |
|
| 255 |
[enable use of RAPI in htools (needs curl, default: no)])], |
|
| 256 |
[], |
|
| 257 |
[enable_htools_rapi=no]) |
|
| 258 |
|
|
| 251 | 259 |
# --with-disk-separator=... |
| 252 | 260 |
AC_ARG_WITH([disk-separator], |
| 253 | 261 |
[AS_HELP_STRING([--with-disk-separator=STRING], |
| ... | ... | |
| 323 | 331 |
else |
| 324 | 332 |
# check for modules |
| 325 | 333 |
AC_MSG_NOTICE([checking for required haskell modules]) |
| 326 |
AC_MSG_CHECKING([curl]) |
|
| 327 |
GHC_PKG_CURL=$($GHC_PKG latest curl) |
|
| 328 |
if test -z "$GHC_PKG_CURL"; then |
|
| 329 |
AC_MSG_WARN([The curl library not found, htools will be compiled |
|
| 330 |
without RAPI support]) |
|
| 331 |
AC_SUBST(HTOOLS_NOCURL, [-DNO_CURL]) |
|
| 334 |
HTOOLS_NOCURL=-DNO_CURL |
|
| 335 |
if test "$enable_htools_rapi" != "no"; then |
|
| 336 |
AC_MSG_CHECKING([curl]) |
|
| 337 |
GHC_PKG_CURL=$($GHC_PKG latest curl) |
|
| 338 |
if test -z "$GHC_PKG_CURL"; then |
|
| 339 |
if test "$enable_htools_rapi" = "check"; then |
|
| 340 |
AC_MSG_WARN([The curl library not found, htools will be compiled |
|
| 341 |
without RAPI support]) |
|
| 342 |
else |
|
| 343 |
AC_MSG_FAILURE([The curl library was not found, but it has |
|
| 344 |
been requested]) |
|
| 345 |
fi |
|
| 346 |
else |
|
| 347 |
HTOOLS_NOCURL= |
|
| 348 |
fi |
|
| 349 |
AC_MSG_RESULT($GHC_PKG_CURL) |
|
| 332 | 350 |
fi |
| 333 |
AC_MSG_RESULT($GHC_PKG_CURL) |
|
| 334 | 351 |
AC_SUBST(GHC_PKG_CURL) |
| 352 |
AC_SUBST(HTOOLS_NOCURL) |
|
| 335 | 353 |
AC_MSG_CHECKING([parallel]) |
| 336 | 354 |
GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-2.*') |
| 337 | 355 |
if test -z "$GHC_PKG_PARALLEL" |
Also available in: Unified diff