Hello, This patch detects the correct libtool version at runtime. It also adds requirement for m4 directory in source tree, "make dist" create this directory, but I could not find how to instruct git to create one... Maybe commit m4/.keep?
It also adds --enable-tests so that users that have ecryptfs working may enable it, but otherwise don't fail package default tests. Regards, Alon Bar-Lev. --- diff --git a/Makefile.am b/Makefile.am index 5eff052..1bd1edf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,6 +9,7 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. AUTOMAKE_OPTIONS=foreign dist-bzip2 +ACLOCAL_AMFLAGS = -I m4 MAINTAINERCLEANFILES = \ config.log config.status \ @@ -24,3 +25,6 @@ MAINTAINERCLEANFILES = \ SUBDIRS = doc src dist_doc_DATA = README + +dist-hook: + $(MKDIR_P) "$(distdir)/m4" diff --git a/configure.ac b/configure.ac index 41f2526..ea59880 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,13 @@ AC_ARG_ENABLE( test "${enable_docs_gen}" = "yes" && enable_docs="yes" AC_ARG_ENABLE( + [tests], + [AS_HELP_STRING([--enable-tests],[Enable system specific tests])], + , + [enable_tests="no"] +) + +AC_ARG_ENABLE( [mudflap], [AS_HELP_STRING([--enable-mudflap],[Build with -fmudflap gcc option])], [ @@ -131,9 +138,15 @@ AC_GNU_SOURCE AC_PROG_CC AC_MINIX -AC_PROG_LIBTOOL AM_PROG_CC_C_O PKG_PROG_PKG_CONFIG + +ifdef( + [LT_INIT], + [LT_INIT], + [AC_PROG_LIBTOOL] +) + AC_PATH_PROGS([POD2MAN], [pod2man]) test -z "${POD2MAN}" && AC_MSG_ERROR([I couldn't find pod2man; make sure it's installed and in your path]) @@ -296,7 +309,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 "${enable_tests}" = "yes"]) # workaround for <autoconf-2.60 if test -z "${docdir}"; then @@ -308,7 +321,12 @@ if test -z "${htmldir}"; then AC_SUBST([htmldir]) fi # end workaround - +# workaround for <automake-1.10 +if test -z "${MKDIR_P}"; then + MKDIR_P="\$(mkdir_p)" + AC_SUBST([MKDIR_P]) +fi +# end workaround AC_CONFIG_FILES([ Makefile ------------------------------------------------------------------------- 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