[SNIP]
Now I found time to prepare the patch.
- for $(ABS_SRCDIR) i select $(as abs_top_srcdir) because
PRECHECK_COMMANDS go in $(top_srcdir)
- for $(ABS_BUILDDIR) i select $(abs_builddir), i.e. the current build dir.
Regards,
Roumen
diff --git a/Makefile.am b/Makefile.am
index 778bc45..67ecf92 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,9 @@ SUBDIRS = include src apps man docs
TEST_APP = apps/xmlsec1
DEFAULT_CRYPTO = @XMLSEC_CRYPTO@
+abs_builddir = @abs_builddir@
+abs_top_srcdir = @abs_srcdir@
+
bin_SCRIPTS = xmlsec1-config
pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
pkgconfigdir = $(libdir)/pkgconfig
@@ -48,10 +51,8 @@ EXTRA_CLEAN = \
examples \
$(NULL)
-ABS_BUILDDIR=$(shell pwd)
if XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING
PRECHECK_COMMANDS = \
- ABS_BUILDDIR=$(ABS_BUILDDIR) && \
cd $(top_srcdir) \
$(NULL)
CHECK_CRYPTO_LIST = \
@@ -59,9 +60,8 @@ CHECK_CRYPTO_LIST = \
$(NULL)
else
PRECHECK_COMMANDS= \
- ABS_BUILDDIR=$(ABS_BUILDDIR) && \
for i in $(XMLSEC_CRYPTO_LIST) ; do \
- export LD_LIBRARY_PATH="$(ABS_BUILDDIR)/src/$$i/.libs:$$LD_LIBRARY_PATH" ; \
+ export LD_LIBRARY_PATH="$(abs_builddir)/src/$$i/.libs:$$LD_LIBRARY_PATH" ; \
done && \
cd $(top_srcdir) \
$(NULL)
@@ -69,7 +69,6 @@ CHECK_CRYPTO_LIST = \
$(XMLSEC_CRYPTO_LIST) \
$(NULL)
endif
-ABS_SRCDIR=$(shell pwd)
docs: docs-man
@(cd docs && $(MAKE) docs)
@@ -86,9 +85,9 @@ check-all: $(TEST_APP)
@($(PRECHECK_COMMANDS) && \
for i in $(CHECK_CRYPTO_LIST) ; do \
echo "=================== Checking xmlsec-$$i =================================" && \
- $(SHELL) ./tests/testKeys.sh $$i $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der && \
- $(SHELL) ./tests/testDSig.sh $$i $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der && \
- $(SHELL) ./tests/testEnc.sh $$i $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der ; \
+ $(SHELL) ./tests/testKeys.sh $$i $(abs_top_srcdir)/tests $(abs_builddir)/$(TEST_APP) der && \
+ $(SHELL) ./tests/testDSig.sh $$i $(abs_top_srcdir)/tests $(abs_builddir)/$(TEST_APP) der && \
+ $(SHELL) ./tests/testEnc.sh $$i $(abs_top_srcdir)/tests $(abs_builddir)/$(TEST_APP) der ; \
done; )
check-info:
@@ -103,19 +102,19 @@ check-info:
check-km: $(TEST_APP)
@($(PRECHECK_COMMANDS) && \
- $(SHELL) ./tests/testKeys.sh default $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der)
+ $(SHELL) ./tests/testKeys.sh default $(abs_top_srcdir)/tests $(abs_builddir)/$(TEST_APP) der)
check-dsig: $(TEST_APP)
@($(PRECHECK_COMMANDS) && \
- $(SHELL) ./tests/testDSig.sh default $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der)
+ $(SHELL) ./tests/testDSig.sh default $(abs_top_srcdir)/tests $(abs_builddir)/$(TEST_APP) der)
check-xkms: $(TEST_APP)
@($(PRECHECK_COMMANDS) && \
- $(SHELL) ./tests/testXKMS.sh default $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der)
+ $(SHELL) ./tests/testXKMS.sh default $(abs_top_srcdir)/tests $(abs_builddir)/$(TEST_APP) der)
check-enc: $(TEST_APP)
@($(PRECHECK_COMMANDS) && \
- $(SHELL) ./tests/testEnc.sh default $(ABS_SRCDIR)/tests $(ABS_BUILDDIR)/$(TEST_APP) der)
+ $(SHELL) ./tests/testEnc.sh default $(abs_top_srcdir)/tests $(abs_builddir)/$(TEST_APP) der)
memcheck-res:
@grep -i lost /tmp/*.log | sed 's/==.*== *//' | sort -u
diff --git a/configure.in b/configure.in
index f892fd7..edd426b 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ XMLSEC_VERSION="$XMLSEC_VERSION_MAJOR.$XMLSEC_VERSION_MINOR.$XMLSEC_VERSION_SUBM
XMLSEC_VERSION_INFO=`echo $XMLSEC_VERSION | awk -F. '{ printf "%d:%d:%d", $1+$2, $3, $2 }'`
XMLSEC_VERSION_SAFE=`echo $XMLSEC_VERSION | sed 's/\./_/g'`
-AC_PREREQ(2.2)
+AC_PREREQ([2.52g])
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
_______________________________________________
xmlsec mailing list
[email protected]
http://www.aleksey.com/mailman/listinfo/xmlsec
