mirror of https://github.com/djcb/mu.git
build: Bump version to 1.5.14
This commit is contained in:
Dirk-Jan C. Binnema
parent
10c1aafa4c
commit
cc890d8688
28
configure.ac
28
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.5.13],[https://github.com/djcb/mu/issues],[mu])
|
||||
AC_INIT([mu],[1.5.14],[https://github.com/djcb/mu/issues],[mu])
|
||||
AC_COPYRIGHT([Copyright (C) 2008-2020 Dirk-Jan C. Binnema])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_SRCDIR([mu/mu.cc])
|
||||
|
|
@ -43,10 +43,10 @@ AC_PROG_INSTALL
|
|||
AC_HEADER_STDC
|
||||
|
||||
extra_flags="-Wformat-security \
|
||||
-Wstack-protector \
|
||||
-Wstack-protector-all \
|
||||
-Wno-cast-function-type \
|
||||
-Wno-bad-function-cast"
|
||||
-Wstack-protector \
|
||||
-Wstack-protector-all \
|
||||
-Wno-cast-function-type \
|
||||
-Wno-bad-function-cast"
|
||||
|
||||
AX_CXX_COMPILE_STDCXX_14
|
||||
AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])
|
||||
|
|
@ -68,7 +68,7 @@ AC_SYS_LARGEFILE
|
|||
# asan is somewhat similar to valgrind, but has low enough overhead so it
|
||||
# can be used during normal operation.
|
||||
AC_ARG_ENABLE([asan],[AS_HELP_STRING([--enable-asan],
|
||||
[Enable Address Sanitizer])], [use_asan=$enableval], [use_asan=no])
|
||||
[Enable Address Sanitizer])], [use_asan=$enableval], [use_asan=no])
|
||||
AS_IF([test "x$use_asan" = "xyes"],[
|
||||
AC_SUBST(ASAN_CFLAGS, "-fsanitize=address -static-libasan -fno-omit-frame-pointer")
|
||||
AC_SUBST(ASAN_CXXFLAGS,"-fsanitize=address -static-libasan -fno-omit-frame-pointer")
|
||||
|
|
@ -107,11 +107,11 @@ AM_CONDITIONAL(BUILD_MU4E, test "x$build_mu4e" = "xyes")
|
|||
# testing purposes only
|
||||
AC_ARG_ENABLE([dirent-d-type],
|
||||
AC_HELP_STRING([--disable-dirent-d-type],
|
||||
[Don't use dirent->d_type, even if you have it]),
|
||||
[Don't use dirent->d_type, even if you have it]),
|
||||
[], [AC_STRUCT_DIRENT_D_TYPE]
|
||||
)
|
||||
AS_IF([test "x$ac_cv_member_struct_dirent_d_type" != "xyes"],
|
||||
[use_dirent_d_type="no"], [use_dirent_d_type="yes"])
|
||||
[use_dirent_d_type="no"], [use_dirent_d_type="yes"])
|
||||
|
||||
# support for d_ino (inode) in struct dirent is optional; if it's
|
||||
# available we can sort direntries by inode and access them in that
|
||||
|
|
@ -119,11 +119,11 @@ AS_IF([test "x$ac_cv_member_struct_dirent_d_type" != "xyes"],
|
|||
# Explicitly disabling it is for testing purposes only.
|
||||
AC_ARG_ENABLE([dirent-d-ino],
|
||||
AC_HELP_STRING([--disable-dirent-d-ino],
|
||||
[Don't use dirent->d_ino, even if you have it]),
|
||||
[Don't use dirent->d_ino, even if you have it]),
|
||||
[], [AC_STRUCT_DIRENT_D_INO]
|
||||
)
|
||||
AS_IF([test "x$ac_cv_member_struct_dirent_d_ino" != "xyes"],
|
||||
[use_dirent_d_ino="no"], [use_dirent_d_ino="yes"])
|
||||
[use_dirent_d_ino="no"], [use_dirent_d_ino="yes"])
|
||||
|
||||
AC_CHECK_FUNCS([memset memcpy realpath setlocale strerror getpass setsid])
|
||||
AC_CHECK_FUNCS([vasprintf strptime])
|
||||
|
|
@ -171,8 +171,8 @@ PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
|
|||
|
||||
AS_CASE([$xapian_version],
|
||||
[1.[[4-9]].[[0-9]]*],
|
||||
[AC_MSG_NOTICE([xapian $xapian_version found.])],
|
||||
[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
|
||||
[AC_MSG_NOTICE([xapian $xapian_version found.])],
|
||||
[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
|
||||
|
||||
XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
|
||||
XAPIAN_LIBS="$($XAPIAN_CONFIG --libs)"
|
||||
|
|
@ -210,7 +210,7 @@ AC_ARG_ENABLE([webkit],AS_HELP_STRING([--disable-webkit],[Disable webkit]))
|
|||
AS_IF([test "x$enable_webkit" != "xno"],[
|
||||
PKG_CHECK_MODULES(WEBKIT,webkit2gtk-4.0 >= 2.0, [have_webkit=yes],[have_webkit=no])
|
||||
AS_IF([test "x$have_webkit" = "xyes"],[
|
||||
webkit_version="$($PKG_CONFIG --modversion webkit2gtk-4.0)"])
|
||||
webkit_version="$($PKG_CONFIG --modversion webkit2gtk-4.0)"])
|
||||
])
|
||||
AM_CONDITIONAL(HAVE_WEBKIT, [test "x$have_webkit" = "xyes"])
|
||||
AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"])
|
||||
|
|
@ -244,7 +244,7 @@ AS_IF([test "x$enable_guile" != "xno"],[
|
|||
])
|
||||
|
||||
AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes" -a \
|
||||
"x$ac_cv_prog_GUILE_SNARF" != "xno"])
|
||||
"x$ac_cv_prog_GUILE_SNARF" != "xno"])
|
||||
AM_COND_IF([BUILD_GUILE],[AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])])
|
||||
###############################################################################
|
||||
|
||||
|
|
|
|||
22
meson.build
22
meson.build
|
|
@ -18,15 +18,15 @@
|
|||
# project setup
|
||||
#
|
||||
project('mu', ['c', 'cpp'],
|
||||
version: '1.5.13',
|
||||
meson_version: '>= 0.52.0', # debian 10
|
||||
license: 'GPL-3.0-or-later',
|
||||
default_options : [
|
||||
'buildtype=debugoptimized',
|
||||
'warning_level=1',
|
||||
'c_std=c11',
|
||||
'cpp_std=c++14'
|
||||
]
|
||||
version: '1.5.14',
|
||||
meson_version: '>= 0.52.0', # debian 10
|
||||
license: 'GPL-3.0-or-later',
|
||||
default_options : [
|
||||
'buildtype=debugoptimized',
|
||||
'warning_level=1',
|
||||
'c_std=c11',
|
||||
'cpp_std=c++14'
|
||||
]
|
||||
)
|
||||
|
||||
# installation paths
|
||||
|
|
@ -168,8 +168,8 @@ version_texi_data.set('UPDATED', run_command('date', '+%d %B %Y').stdout().strip
|
|||
version_texi_data.set('UPDATEDMONTH', run_command('date', '+%B %Y').stdout().strip())
|
||||
|
||||
configure_file(input: 'version.texi.in',
|
||||
output: 'version.texi',
|
||||
configuration: version_texi_data)
|
||||
output: 'version.texi',
|
||||
configuration: version_texi_data)
|
||||
################################################################################
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue