diff --git a/configure.ac b/configure.ac
index e5d117e9..86792aa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,11 +213,11 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"
 
 ################################################################################
 # should we try to build an emacs dynamic module?
-AC_CHECK_HEADER([emacs-module.h],[
-  AC_DEFINE([HAVE_EMACS_MODULE_H],[1], [Whether we have the emacs-module header])],
-  AC_MSG_NOTICE([emacs-module.h not found; not building module])
-)
-AM_CONDITIONAL([BUILD_EMACS_MODULE],[test "x$ac_cv_header_emacs_module_h" != "x"])
+#AC_CHECK_HEADER([emacs-module.h],[
+#  AC_DEFINE([HAVE_EMACS_MODULE_H],[1], [Whether we have the emacs-module header])],
+#  AC_MSG_NOTICE([emacs-module.h not found; not building module])
+#)
+#AM_CONDITIONAL([BUILD_EMACS_MODULE],[test "x$ac_cv_header_emacs_module_h" != "x"])
 ################################################################################
 
 ###############################################################################
@@ -227,22 +227,20 @@ AS_IF([test "x$enable_guile" != "xno"],[
 
   PKG_CHECK_MODULES(GUILE, [guile-3.0], [have_guile=yes],[
     PKG_CHECK_MODULES(GUILE, [guile-2.2], [have_guile=yes], [have_guile=no])])
-
     AS_IF([test "x$have_guile" = "xyes"],[
       GUILE_PKG([3.0 2.2])
       GUILE_PROGS
       GUILE_FLAGS
       AC_DEFINE_UNQUOTED([GUILE_BINARY],"$GUILE",[guile binary])
-      AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
-
-      snarf=guile-snarf${GUILE_EFFECTIVE_VERSION}
-      AC_CHECK_PROG(GUILE_SNARF,[${snarf}],[${snarf}], [no])
+      vsnarf=guile-snarf${GUILE_EFFECTIVE_VERSION}
+      AC_CHECK_PROGS(GUILE_SNARF,[${vsnarf} guile-snarf], [no])
       guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion)
    ])
 ])
 
 AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes" -a \
                                  "x$ac_cv_prog_GUILE_SNARF" != "xno"])
+AM_COND_IF([BUILD_GUILE],[AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])])
 ###############################################################################
 
 ###############################################################################
@@ -314,10 +312,10 @@ echo "Guile version                        : $guile_version"
 AS_IF([test "x$build_mu4e" = "xyes"],[
 echo "Build mu4e                           : yes"
 echo "Emacs version                        : $emacs_version"
-AM_COND_IF([BUILD_EMACS_MODULE],[
-echo "Build emacs module                   : yes"],[
-echo "Build emacs module                   : no"
-])])
+#AM_COND_IF([BUILD_EMACS_MODULE],[
+#echo "Build emacs module                   : yes"],[
+#echo "Build emacs module                   : no"
+#])])
 
 AM_COND_IF([BUILD_GUI],[
 echo "Build 'mug' toy-ui (gtk+/webkit)     : yes"],[