[gnutls-devel] [PATCH 7/8] guile: Install modules in versioned directory by default.

[Ludovic Courtès]

* configure.ac: Change default 'GUILE_SITE' value to include
$guile_effective_version.
---
 configure.ac | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8440def..478c161 100644
--- a/configure.ac
+++ b/configure.ac
@@ -751,6 +751,10 @@ if test "$opt_guile_bindings" = "yes"; then
       CFLAGS="$save_CFLAGS"
       LIBS="$save_LIBS"
 
+      AC_MSG_CHECKING([the Guile effective version])
+      guile_effective_version="`$GUILE -c '(display (effective-version))'`"
+      AC_MSG_RESULT([$guile_effective_version])
+
       if test "$opt_guile_bindings" = "yes"; then
         AC_MSG_RESULT([yes])
 	case "x$with_guile_site_dir" in 
@@ -762,7 +766,7 @@ if test "$opt_guile_bindings" = "yes"; then
 		# Automatically derive $(GUILE_SITE) from $(pkgdatadir).  This
 		# hack is used to allow `distcheck' to work (see
 		# `DISTCHECK_CONFIGURE_FLAGS' in the top-level `Makefile.am').
-		GUILE_SITE="\$(datadir)/guile/site"
+		GUILE_SITE="\$(datadir)/guile/site/$guile_effective_version"
 		AC_SUBST(GUILE_SITE)
 		;;
 	     *)
@@ -789,9 +793,6 @@ if test "$opt_guile_bindings" = "yes"; then
 	LIBS="$save_LIBS"
 
 	# The place where guile-gnutls.la will go.
-	AC_MSG_CHECKING([the Guile effective version])
-	guile_effective_version="`$GUILE -c '(display (effective-version))'`"
-	AC_MSG_RESULT([$guile_effective_version])
 	guileextensiondir="$libdir/guile/$guile_effective_version"
 	AC_SUBST([guileextensiondir])
 
-- 
2.6.3