From 17863701d9f15331de9d6caa98fff15d194f3949 Mon Sep 17 00:00:00 2001 From: djcb Date: Sun, 20 Jan 2019 07:47:37 +0200 Subject: [PATCH] configure.ac: define BUILD_GUILE for config.h ... so we can find 'mu script'. --- configure.ac | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 2aeb8df7..be190220 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,6 @@ 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 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"], [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 # order; this is much faster on some file systems (such as extfs3). @@ -163,7 +161,6 @@ AC_SUBST(GMIME_CFLAGS) AC_SUBST(GMIME_LIBS) gmime_version="`$PKG_CONFIG --modversion gmime-3.0`" - # 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]) 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"]) - # xapian checking - we need 1.2.x at least AC_CHECK_PROG(XAPIAN_CONFIG,xapian-config,xapian-config,no) 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]) ############################################################################### - ############################################################################### # we need GTK+3 for some of the graphical tools # 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"]) ############################################################################### - ############################################################################### # build with guile2.2 when available and not disabled. 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_FLAGS 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"]) ############################################################################### - ############################################################################### # check for makeinfo AC_CHECK_PROG(have_makeinfo,makeinfo,yes,no) AM_CONDITIONAL(HAVE_MAKEINFO, [test "x$have_makeinfo" = "xyes"]) ############################################################################### - - ############################################################################### # docdir, so we can use it in mu4e-meta.el.in AC_SUBST(MU_DOC_DIR, "${prefix}/share/doc/mu") ############################################################################### - - ############################################################################### # check for pmccabe AC_PATH_PROG([PMCCABE],[pmccabe],[no]) @@ -342,7 +332,6 @@ AM_COND_IF([BUILD_GUILE],[ echo "Guile version : $GUILE_EFFECTIVE_VERSION" ]) - if test "x$build_mu4e" = "xyes"; then echo "Emacs version : $emacs_version" fi