fix autotools files for installation and distribution

Makefile.am

@@ -45,8 +45,8 @@ AM_SCM_LOG_DRIVER_FLAGS = --brief=yes
 
 AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)"
 
-EXTRA_DIST += README.md                        \
-              pre-inst-env.in                  \
-              tests/utils.scm                  \
-              build-aux/test-driver.scm        \
-              $(TESTS)
+EXTRA_DIST = README.md                        \
+             pre-inst-env.in                  \
+             tests/utils.scm                  \
+             build-aux/test-driver.scm        \
+             $(TESTS)

configure.ac

@@ -1,11 +1,16 @@
 
 AC_INIT([guile-commonmark], [0.2])
-AC_CONFIG_SRCDIR(commonmark)
+AC_CONFIG_SRCDIR([commonmark.scm])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 
+GUILE_PKG([2.2 2.0])
 GUILE_PROGS([2.0.11])
+if test "x$GUILD" = "x"; then
+   AC_MSG_ERROR(['guild' binary not found; please check your guile-2.x installation.])
+fi
+
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([pre-inst-env], [chmod +x pre-inst-env])

guile.am

@@ -1,17 +1,21 @@
-moddir=$(datadir)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
+moddir=$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)
 godir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
 
 GOBJECTS = $(SOURCES:%.scm=%.go)
 
-nobase_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
+nobase_dist_mod_DATA = $(SOURCES) $(NOCOMP_SOURCES)
 nobase_go_DATA = $(GOBJECTS)
 
+# Make sure source files are installed first, so that the mtime of
+# installed compiled files is greater than that of installed source
+# files.  See
+# <http://lists.gnu.org/archive/html/guile-devel/2010-07/msg00125.html>
+# for details.
 guile_install_go_files = install-nobase_goDATA
-$(guile_install_go_files): install-nobase_modDATA
+$(guile_install_go_files): install-nobase_dist_modDATA
 
 CLEANFILES = $(GOBJECTS)
-EXTRA_DIST = $(SOURCES) $(NOCOMP_SOURCES)
 GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
 SUFFIXES = .scm .go
 .scm.go:
-	$(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILE_TOOLS) compile $(GUILE_WARNINGS) -o "$@" "$<"
+	$(AM_V_GEN)$(top_builddir)/pre-inst-env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"