From 0446ec3d83ffa731a1cbb67b34dcaec2b1c9986d Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Wed, 14 Dec 2011 09:12:46 +0200
Subject: [PATCH] * add some documentation infrastructure

---
 Makefile.am       |  2 +-
 configure.ac      | 22 +++++++++++++++++++++-
 emacs/Makefile.am |  6 +++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 91d272d6..88d4e728 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ else
 guile=
 endif
 
-SUBDIRS=m4 man src $(widgets) $(guile) contrib toys
+SUBDIRS=m4 man src $(widgets) $(guile) emacs contrib toys
 
 ACLOCAL_AMFLAGS=-I m4
 
diff --git a/configure.ac b/configure.ac
index f1f85ace..7171a5f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,6 +139,7 @@ AS_IF([test "x$XAPIAN" = "xno"],[
 AC_SUBST(XAPIAN_CXXFLAGS)
 AC_SUBST(XAPIAN_LIBS)
 
+###############################################################################
 # we set the set the version of the MuStore (Xapian database) layout
 # here; it will become part of the db name, so we can automatically
 # recreate the database when we incompatible have changes.
@@ -147,9 +148,10 @@ AC_SUBST(XAPIAN_LIBS)
 # versioning, as we hopefully don't have updates for each version;
 # also, this has nothing to do with Xapian's software version
 AC_DEFINE(MU_STORE_SCHEMA_VERSION,["9.8"], ['Schema' version of the database])
+###############################################################################
 
 
-#
+###############################################################################
 # we need gtk (2 or 3) for some of the graphical tools
 #
 AC_ARG_WITH([gui],
@@ -209,6 +211,10 @@ AM_CONDITIONAL(HAVE_GIO, [test "x$have_gio" = "xyes"])
 
 # should we build the widgets/ dir?
 AM_CONDITIONAL(BUILD_WIDGETS, [test "x$have_webkit" = "xyes" -a "x$have_gio" = "xyes"])
+###############################################################################
+
+
+
 
 
 ###############################################################################
@@ -244,10 +250,19 @@ AM_CONDITIONAL(HAVE_GUILE,[test "$xGUILE_CONFIG" != "x" \
 AS_IF([test "x$GUILE_MAJOR_VERSION" = "x0" -o "x$GUILE_MAJOR_VERSION" = "x1"],
       [AC_MSG_WARN([Only guile >= 2.x is supported]);
        guile_too_old="yes"])
+
+
+
+###############################################################################
+# check for makeinfo
+AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
+AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)
 ###############################################################################
 
+       
 
 
+###############################################################################
 # check for xdg-open
 AS_IF([test "x$buildgui"="xyes"],[
   AC_PATH_PROG(XDGOPEN, [xdg-open], [], [$PATH])
@@ -255,7 +270,10 @@ AS_IF([test "x$buildgui"="xyes"],[
     AC_DEFINE_UNQUOTED([XDGOPEN], ["$XDGOPEN"],[Path to xdg-open])],[
     AC_MSG_WARN([xdg-open not found, mu cannot open attachments])])
 ])
+###############################################################################
 
+
+###############################################################################
 # check for pmccabe
 AC_PATH_PROG([PMCCABE],[pmccabe],[pmccabe],[no])
 AS_IF([test "x$PMCCABE" = "xno"],[
@@ -264,6 +282,7 @@ AS_IF([test "x$PMCCABE" = "xno"],[
    *** Developers: you do not seem to have the pmccabe tool installed.
    *** Please install it if you want to run the automated code checks])
 ],[have_pmccabe="yes"])
+###############################################################################
 
 
 
@@ -275,6 +294,7 @@ widgets/Makefile
 emacs/Makefile
 guile/Makefile
 guile/mu/Makefile
+guile/examples/Makefile
 toys/Makefile
 toys/mug/Makefile
 toys/mug2/Makefile
diff --git a/emacs/Makefile.am b/emacs/Makefile.am
index ff423d0c..bc2ceb63 100644
--- a/emacs/Makefile.am
+++ b/emacs/Makefile.am
@@ -25,7 +25,11 @@ mu4e-version.el:
 (defconst mu4e-mu-version \"$(VERSION)\" \"Required mu binary version.\")\n\
 (provide 'mu4e-version)\n" >$@
 
-EXTRA_DIST=			\
+info_TEXINFOS=mu4e.texi
+mu4e_TEXINFOS=fdl.texi
+
+elispdir= ${prefix}/share/emacs/site-lisp/mu4e/
+elisp_DATA=			\
 	mu4e.el			\
 	mu4e-hdrs.el		\
 	mu4e-view.el		\