Commit 0985325d authored by Iustin Pop's avatar Iustin Pop
Browse files

Only build hconfd if --enable-confd was passed



A later, more complete patch, will allow selecting between either the
Python version or the Haskell version. This is just a temporary
solution to help building without all the needed Haskell libraries.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent 3096524e
...@@ -354,7 +354,10 @@ docrst = \ ...@@ -354,7 +354,10 @@ docrst = \
doc/upgrade.rst \ doc/upgrade.rst \
doc/walkthrough.rst doc/walkthrough.rst
HS_PROGS = htools/htools htools/hconfd HS_PROGS = htools/htools
if WANT_CONFD
HS_PROGS += htools/hconfd
endif
HS_BIN_ROLES = hbal hscan hspace hinfo HS_BIN_ROLES = hbal hscan hspace hinfo
HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools HS_ALL_PROGS = $(HS_PROGS) htools/test htools/hpc-htools
...@@ -538,7 +541,6 @@ $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile ...@@ -538,7 +541,6 @@ $(HS_ALL_PROGS): %: %.hs $(HS_LIB_SRCS) $(HS_BUILT_SRCS) Makefile
$(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \ $(HTOOLS_NOCURL) $(HTOOLS_PARALLEL3) \
-osuf $$BINARY.o -hisuf $$BINARY.hi \ -osuf $$BINARY.o -hisuf $$BINARY.hi \
$(HEXTRA) $(HEXTRA_INT) $@ $(HEXTRA) $(HEXTRA_INT) $@
# for the htools/test binary, we need to enable profiling/coverage # for the htools/test binary, we need to enable profiling/coverage
htools/test: HEXTRA_INT=-fhpc -Wwarn -fno-warn-missing-signatures \ htools/test: HEXTRA_INT=-fhpc -Wwarn -fno-warn-missing-signatures \
-fno-warn-monomorphism-restriction -fno-warn-orphans \ -fno-warn-monomorphism-restriction -fno-warn-orphans \
......
...@@ -287,6 +287,8 @@ AC_ARG_ENABLE([confd], ...@@ -287,6 +287,8 @@ AC_ARG_ENABLE([confd],
[enable_confd=True]) [enable_confd=True])
AC_SUBST(ENABLE_CONFD, $enable_confd) AC_SUBST(ENABLE_CONFD, $enable_confd)
AM_CONDITIONAL([WANT_CONFD], [test x$enable_confd = xTrue])
# --with-disk-separator=... # --with-disk-separator=...
AC_ARG_WITH([disk-separator], AC_ARG_WITH([disk-separator],
[AS_HELP_STRING([--with-disk-separator=STRING], [AS_HELP_STRING([--with-disk-separator=STRING],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment