configure.ac: bump version to 1.3.1, cleanups

Bump the version to 1.3.1, the new development version.
This commit is contained in:
djcb 2019-04-13 12:07:54 +03:00
parent f62b4e534a
commit db4029e792
1 changed files with 28 additions and 55 deletions

View File

@ -1,4 +1,4 @@
## Copyright (C) 2008-2018 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
## Copyright (C) 2008-2019 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
##
## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published by
@ -15,8 +15,8 @@
## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
AC_PREREQ([2.68])
AC_INIT([mu],[1.2.0],[https://github.com/djcb/mu/issues],[mu])
AC_COPYRIGHT([Copyright (C) 2008-2018 Dirk-Jan C. Binnema])
AC_INIT([mu],[1.3.1],[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])
# libtoolize wants to put some stuff in here; if you have an old
@ -53,8 +53,8 @@ AX_CXX_COMPILE_STDCXX_14
m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
AX_VALGRIND_CHECK
# for now, use AM_PROG_LIBTOOL, as we don't want to require
# a too new setup for autotools/libtool
# for now, use AM_PROG_LIBTOOL, as we don't want to require too new
# an autotools setup
AM_PROG_LIBTOOL
#LT_INIT([disable-shared])
@ -98,20 +98,6 @@ AS_IF([test "x$enable_mu4e" != "xno"], [
])
AM_CONDITIONAL(BUILD_MU4E, test "x$build_mu4e" = "xyes")
# Perl interface requires Data::SExpression
dnl build_perl=no
dnl AC_ARG_ENABLE([perl],
dnl AS_HELP_STRING([--enable-perl],[Enable building the Perl interface]))
dnl AC_ARG_VAR([PERL], [the Perl interpreter command])
dnl AC_CHECK_PROGS([PERL], [perl], [no])
dnl AS_IF([test x"$enable_perl" = "xyes" -a x"$PERL" != "xno"], [
dnl AM_PERL_MODULE([Data::SExpression],[build_perl=yes])
dnl if test x"$build_perl" = "xyes"; then
dnl perl_version=`$PERL -Iperl/lib -Mmup -e 'print "$mup::VERSION\n";'`
dnl fi
dnl ])
dnl AM_CONDITIONAL(BUILD_PERL, test "x$build_perl" = "xyes")
# we need some special tricks for filesystems that don't have d_type;
# e.g. Solaris. See mu-maildir.c. Explicitly disabling it is for
# testing purposes only
@ -295,23 +281,10 @@ contrib/Makefile
])
AC_OUTPUT
dnl if test x"$build_perl" != "xno"; then
dnl echo "Configuring Perl interface..."
dnl cd perl
dnl $PERL Makefile.PL
dnl cd ..
dnl fi
echo
echo "mu configuration is complete."
echo "------------------------------------------------"
if test -e ~/.mu/xapian-0.6; then
echo "Note: since version 0.7, the Xapian database is no longer stored as "
echo "~/.mu/xapian-0.6 but instead simply as ~/.mu/xapian. You can "
echo "remove the old <muhome>/xapian-0.6 directory to save some disk space"
fi
echo "mu version : $VERSION"
echo
echo "Xapian version : $xapian_version"
@ -369,20 +342,20 @@ if test "x$have_makeinfo" != "xyes"; then
fi
# gui
if test "x$buildgui" = "xyes"; then
AS_IF([test "x$buildgui" = "xyes"],[
echo "* The demo UI will be built in toys/mug"
echo
fi
])
# wordexp
if test "x$ac_cv_header_wordexp_h" != "xyes"; then
AS_IF([test "x$ac_cv_header_wordexp_h" != "xyes"],[
echo "* Your system does not seem to have the 'wordexp' function."
echo " This means that you cannot use shell-like expansion in options and "
echo " some other places. So, for example, instead of"
echo " --maildir=~/Maildir"
echo " you should use the complete path, something like:"
echo " --maildir=/home/user/Maildir"
fi
])
echo
echo "Now, type 'make' (or 'gmake') to build mu"