diff options
| author | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-09-04 09:44:34 +0000 |
|---|---|---|
| committer | Benjamin Dauvergne <bdauvergne@entrouvert.com> | 2008-09-04 09:44:34 +0000 |
| commit | 24430806e6761766e6cd8a309a0c087dd90f178e (patch) | |
| tree | 60eae733db473ed68d38477df531a5e5d7a58a3c | |
| parent | dd0e7143ee7f16db21a9c7fe9abfef4d297e0697 (diff) | |
Fix regression when loading a LassoServer from dump.
Fix an error with -rpath setting in last commit, -rpath must always be absolute
paths.
| -rw-r--r-- | lasso/id-ff/provider.c | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lasso/id-ff/provider.c b/lasso/id-ff/provider.c index 2ee693e8..383c348f 100644 --- a/lasso/id-ff/provider.c +++ b/lasso/id-ff/provider.c @@ -723,7 +723,7 @@ lasso_provider_load_metadata(LassoProvider *provider, const gchar *path) if (doc == NULL) return FALSE; ret = lasso_provider_load_metadata_from_doc(provider, doc); - if (ret == 0) { + if (ret == TRUE) { lasso_assign_string(provider->metadata_filename, path); } lasso_release_doc(doc); diff --git a/tests/Makefile.am b/tests/Makefile.am index d2461ca8..c2785a49 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,11 +18,11 @@ tests_LDADD = \ $(top_builddir)/lasso/liblasso.la \ $(LASSO_LIBS) \ $(CHECK_LIBS) -tests_LDFLAGS = -rpath $(top_srcdir)/lasso/.libs/ +tests_LDFLAGS = -rpath `cd $(top_srcdir)/lasso/.libs/; pwd` perfs_SOURCES = perfs.c perfs_LDADD = $(top_builddir)/lasso/liblasso.la $(LASSO_LIBS) -perfs_LDFLAGS = -rpath $(top_srcdir)/lasso/.libs/ +perfs_LDFLAGS = -rpath `cd $(top_srcdir)/lasso/.libs/; pwd` endif |