Bugfixes

* configure.ac: Fallback to guile installation prefix, if
'guile-config info bindir' returns empty string.
* doc/texinfo/programs.texi: Minor fix.
* mail/mailline.c (ml_readline_init): Don't use obsolete
CPPFunction type.
* mu/shell.c (mutool_initialize_readline): Likewise.
* scheme/sieve2scm.scmi: Fix typo.
* sieve/sieve.c (main): Fix initialization of Sieve environment
variables "location" and "post".

@@ -1159,6 +1159,9 @@ GINT_INIT([gint],[1.8 with-guile],
 	  [useguile=yes
 	  [useguile=yes
  	   AC_DEFINE([WITH_GUILE],1,[Enable Guile support])
  	   AC_DEFINE([WITH_GUILE],1,[Enable Guile support])
            GUILE_BINDIR=`guile-config info bindir`
            GUILE_BINDIR=`guile-config info bindir`
+	   if [ -z "$GUILE_BINDIR" ]; then
+	       GUILE_BINDIR="`guile-config info prefix`/bin"
+	   fi
            LIBMU_SCM=../libmu_scm/libmu_scm.la
            LIBMU_SCM=../libmu_scm/libmu_scm.la
            LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}'
            LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} ${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}'
            MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules'
            MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules'

@@ -5659,7 +5659,7 @@ Keep on going if execution fails on a message.  See also
 @ref{Sieve Configuration, keep-going}.
 @ref{Sieve Configuration, keep-going}.
 
 
 @item -L @var{dir}
 @item -L @var{dir}
-@item --libdir=@var{dir}
+@itemx --libdir=@var{dir}
 Append directory @var{dir} to the list of directories searched for
 Append directory @var{dir} to the list of directories searched for
 library files.  See also @ref{Sieve Configuration, library-path}.
 library files.  See also @ref{Sieve Configuration, library-path}.
 
 

@@ -93,7 +93,8 @@ ml_readline_init ()
 
 
 #ifdef WITH_READLINE
 #ifdef WITH_READLINE
   rl_readline_name = "mail";
   rl_readline_name = "mail";
-  rl_attempted_completion_function = (CPPFunction*)ml_command_completion;
+  rl_attempted_completion_function =
+    (rl_completion_func_t*) ml_command_completion;
   rl_getc_function = ml_getc;
   rl_getc_function = ml_getc;
 #endif
 #endif
 #ifdef HAVE_SIGACTION
 #ifdef HAVE_SIGACTION

@@ -332,7 +332,8 @@ mutool_initialize_readline (const char *name)
 {
 {
   /* Allow conditional parsing of the ~/.inputrc file. */
   /* Allow conditional parsing of the ~/.inputrc file. */
   rl_readline_name = (char *) name;
   rl_readline_name = (char *) name;
-  rl_attempted_completion_function = (CPPFunction *) shell_completion;
+  rl_attempted_completion_function =
+    (rl_completion_func_t*) shell_completion;
   rl_getc_function = _shell_getc;
   rl_getc_function = _shell_getc;
   read_history (get_history_file_name ());
   read_history (get_history_file_name ());
 }
 }

@@ -981,7 +981,7 @@ exec ${GUILE-guile} -l $0 -c '(mailutils-main)'\n")
 (define output #f)
 (define output #f)
 
 
 (define (sieve-usage)
 (define (sieve-usage)
-  (display "usage: sieve2scm [OPTIONS][mailbox]\n")
+  (display "usage: sieve2scm [OPTIONS] [mailbox]\n")
   (display "GNU sieve2scm -- compile a Sieve program into Scheme code\n\n")
   (display "GNU sieve2scm -- compile a Sieve program into Scheme code\n\n")
   (display "   -f, --file FILENAME      Set input file name\n")
   (display "   -f, --file FILENAME      Set input file name\n")
   (display "   -o, --output FILENAME    Set output file name\n")
   (display "   -o, --output FILENAME    Set output file name\n")

@@ -485,8 +485,9 @@ main (int argc, char *argv[])
       return EX_SOFTWARE;
       return EX_SOFTWARE;
     }
     }
 
 
-  sieve_setenv ("location=MS", mach);
-  sieve_setenv ("phase=post", mach);
+  mu_sieve_set_environ (mach, "location", "MS");
+  mu_sieve_set_environ (mach, "phase", "post");
+
   mu_list_foreach (env_list, sieve_setenv, mach);
   mu_list_foreach (env_list, sieve_setenv, mach);
   mu_list_destroy (&env_list);
   mu_list_destroy (&env_list);