Don't assume `guile-config' is named that.

diff --git ./configure.ac ./configure.ac
index 6ededec7f..25a87c32d 100644
--- ./configure.ac
+++ ./configure.ac
@@ -1191,9 +1191,9 @@ AC_SUBST([MU_GUILE_SIEVE_MOD_DIR])
 GINT_INIT([gint],[2.2.0 with-guile],
 	  [useguile=yes
  	   AC_DEFINE([WITH_GUILE],1,[Enable Guile support])
-           GUILE_BINDIR=`guile-config info bindir`
+           GUILE_BINDIR=`$GUILE_CONFIG info bindir`
 	   if test -z "$GUILE_BINDIR"; then
-	       GUILE_BINDIR="`guile-config info prefix`/bin"
+	       GUILE_BINDIR="`$GUILE_CONFIG info prefix`/bin"
 	   fi
            LIBMU_SCM='${top_builddir}/libmu_scm/libmu_scm.la'
            LIBMU_SCM_DEPS='${MU_LIB_MAILBOX} ${MU_LIB_MAILER}'

diff --git ./gint/guile.m4 ./gint/guile.m4
index d791987..4a8c7da 100644
--- ./gint/guile.m4
+++ ./gint/guile.m4
@@ -21,7 +21,7 @@ m4_define([_gint_eval_version],
 
 m4_define([_gint_mangle_version],[_gint_eval_version(m4_bpatsubst($1,\.,[,]))])
 
-m4_define([_gint_site_dir],[`guile -c '(display (%site-dir)) (newline)'`])
+m4_define([_gint_site_dir],[`$GUILE -c '(display (%site-dir)) (newline)'`])
 
 dnl GINT_CHECK_GUILE(minversion, [act-if-found], [act-if-not-found])
 dnl                      $1            $2               $3
@@ -66,12 +66,13 @@ AC_DEFUN([GINT_CHECK_GUILE],
     if test "$GUILE_CONFIG" = no; then
       m4_if([$3],,[AC_MSG_ERROR(cannot find Guile)], [$3])
     else
+      AC_PATH_PROG(GUILE,       guile)
       AC_PATH_PROG(GUILE_SNARF, guile-snarf)
       AC_PATH_PROG(GUILE_TOOLS, guile-tools)
   
       GUILE_INCLUDES=`$GUILE_CONFIG compile`
       GUILE_LIBS=`$GUILE_CONFIG link`
-      GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|sed 's/guile-config [[^0-9]]* \([[0-9]][[0-9.]]*\)$/\1/'`
+      GUILE_VERSION=`($GUILE_CONFIG --version 2>&1; echo '')|cut -d' ' -f5`
       VEX=`echo $GUILE_VERSION | sed 's/\./ \\\\* 1000 + /;s/\./ \\\\* 100 + /'`
       GUILE_VERSION_NUMBER=`eval expr "$VEX"`
 
