On Tuesday 10 June 2008, Michael Halcrow wrote:
> On Tue, Jun 10, 2008 at 12:02:19AM +0300, Alon Bar-Lev wrote:
> > I am going over all projects I help to allow libtool-2 migration and
> > cleanups.
> >
> > Please review.
> > If you like I can split this into smaller parts.
>
> Merged; in release 47. It worked okay for me on Gentoo and Fedora;
> please test on your own systems.
I had one mistake:
diff --git a/configure.ac b/configure.ac
index 41f2526..b85d98d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -296,7 +296,7 @@ AM_CONDITIONAL([BUILD_PAM], [test "${enable_pam}" = "yes"])
AM_CONDITIONAL([BUILD_GUI], [test "${enable_gui}" = "yes"])
AM_CONDITIONAL([BUILD_DOCS], [test "${enable_docs}" = "yes"])
AM_CONDITIONAL([BUILD_DOCS_GEN], [test "${enable_docs_gen}" = "yes"])
-AM_CONDITIONAL([ENABLE_TESTS], [test -n "${DISTCHECK_HACK}"])
+AM_CONDITIONAL([ENABLE_TESTS], [test -z "${DISTCHECK_HACK}"])
# workaround for <autoconf-2.60
if test -z "${docdir}"; then
> For now, I changed the build targets so that the extra docs will not
> break the build if the dependencies aren't installed. They will just
> not be included. As you suggest, I will probably rip them out of the
> source package sometime in the future.
I thought something like this... :)
Now:
DISTCHECK_HACK=1 make distcheck
is working!
Maybe it is better to add --enable-tests, as I if I understand correctly "make
check"
will not work if ecryptfs is not active.
Alon.
---
diff --git a/configure.ac b/configure.ac
index 41f2526..b85d98d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,8 +313,6 @@ fi
AC_CONFIG_FILES([
Makefile
doc/Makefile
- doc/design_doc/Makefile
- doc/beginners_guide/Makefile
src/Makefile
src/libecryptfs/Makefile
src/utils/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 0bd1426..8afc46e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
-SUBDIRS = manpage design_doc beginners_guide
+SUBDIRS = manpage
dist_doc_DATA =
dist_noinst_DATA =
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
eCryptfs-devel mailing list
eCryptfs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ecryptfs-devel
