1
0
mirror of https://github.com/djcb/mu.git synced 2024-07-22 11:27:57 +02:00

autotools: improve build

*almost* works (except for guile/, which does work yet anyway).
This commit is contained in:
Dirk-Jan C. Binnema 2022-05-19 23:36:57 +03:00
parent cea3167f3e
commit cc63eca8ad
7 changed files with 9 additions and 42 deletions

View File

@ -16,11 +16,11 @@
include $(top_srcdir)/gtest.mk
#if BUILD_GUILE
#guile=guile
#else
if BUILD_GUILE
guile=guile
else
guile=
#endif
endif
if BUILD_MU4E
mu4e=mu4e

View File

@ -252,6 +252,7 @@ Makefile
mu/Makefile
lib/Makefile
lib/doxyfile
lib/thirdparty/Makefile
lib/utils/Makefile
lib/message/Makefile
lib/index/Makefile

View File

@ -18,7 +18,7 @@
# before descending into tests/
include $(top_srcdir)/gtest.mk
SUBDIRS= utils message index
SUBDIRS= thirdparty utils message index
TESTDEFS= \
-DMU_TESTMAILDIR=\"${abs_srcdir}/testdir\" \

View File

@ -63,7 +63,8 @@ libmu_utils_la_SOURCES= \
mu-util.h \
mu-utils.cc \
mu-utils.hh \
mu-xapian-utils.h
mu-utils-format.hh \
mu-xapian-utils.hh
libmu_utils_la_LIBADD= \
$(GLIB_LIBS) \

View File

@ -1,4 +1,4 @@
## Copyright (C) 2008-2021 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
## Copyright (C) 2008-2022 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
@ -35,7 +35,6 @@ EXTRA_DIST= \
ax_compiler_flags_gir.m4 \
ax_compiler_flags_ldflags.m4 \
ax_cxx_compile_stdcxx.m4 \
ax_cxx_compile_stdcxx_14.m4 \
ax_cxx_compile_stdcxx_17.m4 \
ax_file_escapes.m4 \
ax_is_release.m4 \

View File

@ -1,34 +0,0 @@
# =============================================================================
# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_14.html
# =============================================================================
#
# SYNOPSIS
#
# AX_CXX_COMPILE_STDCXX_14([ext|noext], [mandatory|optional])
#
# DESCRIPTION
#
# Check for baseline language coverage in the compiler for the C++14
# standard; if necessary, add switches to CXX and CXXCPP to enable
# support.
#
# This macro is a convenience alias for calling the AX_CXX_COMPILE_STDCXX
# macro with the version set to C++14. The two optional arguments are
# forwarded literally as the second and third argument respectively.
# Please see the documentation for the AX_CXX_COMPILE_STDCXX macro for
# more information. If you want to use this macro, you also need to
# download the ax_cxx_compile_stdcxx.m4 file.
#
# LICENSE
#
# Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu>
#
# Copying and distribution of this file, with or without modification, are
# permitted in any medium without royalty provided the copyright notice
# and this notice are preserved. This file is offered as-is, without any
# warranty.
#serial 5
AX_REQUIRE_DEFINED([AX_CXX_COMPILE_STDCXX])
AC_DEFUN([AX_CXX_COMPILE_STDCXX_14], [AX_CXX_COMPILE_STDCXX([14], [$1], [$2])])