summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am16
1 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 3453c011..c23370ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,16 @@
NULL =
SAFE_VERSION = @XMLSEC_VERSION_SAFE@
-SUBDIRS = include src apps man docs
+SUBDIRS = include src
+if XMLSEC_APPS
+SUBDIRS += apps
+endif
+if XMLSEC_MANS
+SUBDIRS += man
+endif
+if XMLSEC_DOCS
+SUBDIRS += docs
+endif
TEST_APP = apps/xmlsec1$(EXEEXT)
DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@
@@ -66,8 +75,9 @@ PRECHECK_COMMANDS = \
$(NULL)
else
PRECHECK_COMMANDS= \
+ export LD_LIBRARY_PATH="$(ABS_BUILDDIR)/src/.libs:$$LD_LIBRARY_PATH" ; \
for i in $(XMLSEC_CRYPTO_LIST) ; do \
- export LD_LIBRARY_PATH="$(ABS_BUILDDIR)/src/$$i/.libs:$$LD_LIBRARY_PATH" ; \
+ export LTDL_LIBRARY_PATH="$(ABS_BUILDDIR)/src/$$i/.libs:$$LTDL_LIBRARY_PATH" ; \
done && \
cd $(ABS_SRCDIR) \
$(NULL)
@@ -89,7 +99,7 @@ check: check-all check-info
check-all: $(TEST_APP)
for crypto in $(CHECK_CRYPTO_LIST) ; do \
- make check-crypto-$$crypto ; \
+ make check-crypto-$$crypto || exit 1 ; \
done
check-crypto-%: $(TEST_APP)