[xmlsec] fix out-of-source tests (based on patch from Roumen)
- From: Aleksey Sanin <aleksey src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [xmlsec] fix out-of-source tests (based on patch from Roumen)
- Date: Sat, 7 Nov 2009 16:22:36 +0000 (UTC)
commit f7a0be7011dcc4723781c2df82a67a762242debb
Author: Aleksey Sanin <aleksey aleksey com>
Date: Sat Nov 7 08:22:18 2009 -0800
fix out-of-source tests (based on patch from Roumen)
Makefile.am | 10 ++++------
configure.in | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 25ae5f2..64f227d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,28 +51,26 @@ EXTRA_CLEAN = \
examples \
$(NULL)
-ABS_BUILDDIR=$(shell pwd)
+ABS_SRCDIR= abs_srcdir@
+ABS_BUILDDIR= abs_builddir@
if XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING
PRECHECK_COMMANDS = \
- ABS_BUILDDIR=$(ABS_BUILDDIR) && \
- cd $(top_srcdir) \
+ cd $(ABS_SRCDIR) \
$(NULL)
CHECK_CRYPTO_LIST = \
"default" \
$(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" ; \
done && \
- cd $(top_srcdir) \
+ cd $(ABS_SRCDIR) \
$(NULL)
CHECK_CRYPTO_LIST = \
$(XMLSEC_CRYPTO_LIST) \
$(NULL)
endif
-ABS_SRCDIR=$(shell pwd)
docs: docs-man
@(cd docs && $(MAKE) docs)
diff --git a/configure.in b/configure.in
index 9bd9cdf..fd9ea75 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.64)
+AC_PREREQ([2.52g])
AC_CANONICAL_HOST
AC_SUBST(XMLSEC_VERSION)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]