summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac12
-rw-r--r--mu4e/Makefile.am13
3 files changed, 15 insertions, 12 deletions
diff --git a/autogen.sh b/autogen.sh
index b437ba7..e623f4f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,4 +31,4 @@ else
echo "# Configure with parameters $*"
fi
-./configure --config-cache --enable-shared --disable-static $@
+./configure --config-cache $@
diff --git a/configure.ac b/configure.ac
index 1b00347..597966d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
AC_PREREQ([2.68])
-AC_INIT([mu],[1.3.3],[https://github.com/djcb/mu/issues],[mu])
+AC_INIT([mu],[1.3.4],[https://github.com/djcb/mu/issues],[mu])
AC_COPYRIGHT([Copyright (C) 2008-2019 Dirk-Jan C. Binnema])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([mu/mu.cc])
@@ -53,7 +53,7 @@ AX_CXX_COMPILE_STDCXX_14
m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
AX_VALGRIND_CHECK
-LT_INIT([disable-shared])
+LT_INIT
AC_PROG_AWK
AC_CHECK_PROG(SORT,sort,sort)
@@ -179,10 +179,10 @@ AC_SUBST(XAPIAN_LIBS)
# here; it will become part of the db name, so we can automatically
# recreate the database when we have incompatible changes.
#
-# note that MU_STORE_SCHEMA_VERSION does not necessarily follow MU
-# versioning, as we hopefully don't have updates for each version;
-# also, this has nothing to do with Xapian's software version
-AC_DEFINE(MU_STORE_SCHEMA_VERSION,["1.3.1"], ['Schema' version of the database])
+# note that MU_STORE_SCHEMA_VERSION does not follow mu versioning, as we
+# hopefully don't have updates for each version; also, this has nothing to do
+# with Xapian's software version
+AC_DEFINE(MU_STORE_SCHEMA_VERSION,["450"],['Schema' version of the database])
###############################################################################
###############################################################################
diff --git a/mu4e/Makefile.am b/mu4e/Makefile.am
index b84bb48..5033cef 100644
--- a/mu4e/Makefile.am
+++ b/mu4e/Makefile.am
@@ -40,12 +40,15 @@ dist_lisp_LISP= \
mu4e-vars.el \
mu4e-view.el \
mu4e.el \
- org-mu4e.el
+ org-mu4e.el \
+ org-old-mu4e.el
-EXTRA_DIST=$(elisp_DATA) mu4e-about.org
+EXTRA_DIST= \
+ mu4e-about.org \
+ org-old-mu4e.el
-CLEANFILES=*.elc ${BUILT_SOURCES}
+CLEANFILES= \
+ *.elc
doc_DATA = \
- mu4e-about.org \
- org-old-mu4e.el
+ mu4e-about.org