alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure.ac: define BUILD_GUILE for config.h

Browse Source 
... so we can find 'mu script'.
This commit is contained in:
djcb
2019-01-20 07:47:37 +02:00
parent d41242ff6c
commit 17863701d9
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -53,7 +53,6 @@ AX_CXX_COMPILE_STDCXX_14
m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})]) m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
AX_VALGRIND_CHECK AX_VALGRIND_CHECK
# for now, use AM_PROG_LIBTOOL, as we don't want to require # for now, use AM_PROG_LIBTOOL, as we don't want to require
# a too new setup for autotools/libtool # a too new setup for autotools/libtool
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
@ -124,7 +123,6 @@ AC_ARG_ENABLE([dirent-d-type],
AS_IF([test "x$ac_cv_member_struct_dirent_d_type" != "xyes"], 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 # 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 # available we can sort direntries by inode and access them in that
# order; this is much faster on some file systems (such as extfs3). # order; this is much faster on some file systems (such as extfs3).
@ -163,7 +161,6 @@ AC_SUBST(GMIME_CFLAGS)
AC_SUBST(GMIME_LIBS) AC_SUBST(GMIME_LIBS)
gmime_version="`$PKG_CONFIG --modversion gmime-3.0`" gmime_version="`$PKG_CONFIG --modversion gmime-3.0`"
# gmime, version 3.0 or higher # gmime, version 3.0 or higher
PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no]) PKG_CHECK_MODULES(JSON_GLIB,json-glib-1.0 >= 1.4,[have_json_glib=yes],[have_json_glib=no])
AS_IF([test "x$have_json_glib" = "xyes"],[ AS_IF([test "x$have_json_glib" = "xyes"],[
@ -174,7 +171,6 @@ AS_IF([test "x$have_json_glib" = "xyes"],[
]) ])
AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"]) AM_CONDITIONAL(HAVE_JSON_GLIB,[test "x$have_json_glib" = "xyes"])
# xapian checking - we need 1.2.x at least # xapian checking - we need 1.2.x at least
AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no)
AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno") AM_CONDITIONAL(HAVE_XAPIAN,test "x$XAPIAN_CONFIG" != "xno")
@ -211,7 +207,6 @@ AC_SUBST(XAPIAN_LIBS)
AC_DEFINE(MU_STORE_SCHEMA_VERSION,["0.99"], ['Schema' version of the database]) AC_DEFINE(MU_STORE_SCHEMA_VERSION,["0.99"], ['Schema' version of the database])
############################################################################### ###############################################################################
############################################################################### ###############################################################################
# we need GTK+3 for some of the graphical tools # we need GTK+3 for some of the graphical tools
# use --without-gtk to disable it # use --without-gtk to disable it
@ -237,7 +232,6 @@ AM_CONDITIONAL(HAVE_WEBKIT, [test "x$have_webkit" = "xyes"])
AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"]) AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"])
############################################################################### ###############################################################################
############################################################################### ###############################################################################
# build with guile2.2 when available and not disabled. # build with guile2.2 when available and not disabled.
AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile])) AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile]))
@ -249,27 +243,23 @@ AS_IF([test "x$enable_guile" != "xno"],[
GUILE_PROGS GUILE_PROGS
GUILE_FLAGS GUILE_FLAGS
AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary]) AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
]) ])
]) ])
AM_CONDITIONAL(BUILD_GUILE,[test -n "$GUILE_EFFECTIVE_VERSION"]) AM_CONDITIONAL(BUILD_GUILE,[test -n "$GUILE_EFFECTIVE_VERSION"])
############################################################################### ###############################################################################
############################################################################### ###############################################################################
# check for makeinfo # check for makeinfo
AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no) AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no)
AM_CONDITIONAL(HAVE_MAKEINFO, [test "x$have_makeinfo" = "xyes"]) AM_CONDITIONAL(HAVE_MAKEINFO, [test "x$have_makeinfo" = "xyes"])
############################################################################### ###############################################################################
############################################################################### ###############################################################################
# docdir, so we can use it in mu4e-meta.el.in # docdir, so we can use it in mu4e-meta.el.in
AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu") AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu")
############################################################################### ###############################################################################
############################################################################### ###############################################################################
# check for pmccabe # check for pmccabe
AC_PATH_PROG([PMCCABE],[pmccabe],[no]) AC_PATH_PROG([PMCCABE],[pmccabe],[no])
@ -342,7 +332,6 @@ AM_COND_IF([BUILD_GUILE],[
echo "Guile version : $GUILE_EFFECTIVE_VERSION" echo "Guile version : $GUILE_EFFECTIVE_VERSION"
]) ])
if test "x$build_mu4e" = "xyes"; then if test "x$build_mu4e" = "xyes"; then
echo "Emacs version : $emacs_version" echo "Emacs version : $emacs_version"
fi fi