Rename libraries.

Rename libmuauth to libmu_auth, libargp to libmu_argp,
libcfg to libmu_cfg, and libsieve to libmu_sieve.

* auth/*: Move to libmu_auth/*
* libargp/*: Move to libmu_argp/*
* libcfg/*: Move to libmu_cfg/*
* libsieve/*: Move to libmu_sieve/*
* libmu_sieve/sieve.h: Rename to sieve-priv.h
* include/mailutils/libsieve.h: Rename to sieve.h
* configure.ac: Update, bump to 2.0.90.

 ## Process this file with GNU Automake to create Makefile.in
 
-##   Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008
+##   Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
 ##   Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
@@ -27,14 +27,14 @@ SUBDIRS = \
  testsuite\
  mailbox\
  sql\
- auth\
+ libmu_auth\
  libproto\
  lib\
- libsieve\
+ libmu_argp\
+ libmu_cfg\
  libmu_cpp\
  libmu_scm\
- libargp\
- libcfg\
+ libmu_sieve\
  doc\
  config\
  examples\

 dnl Configuration for GNU Mailutils -- a suite of utilities for electronic mail
 dnl
 dnl Copyright (C) 1999,2000,2001,2002,2003,2004,2005,
-dnl 2006,2007,2008 Free Software Foundation, Inc.
+dnl 2006,2007,2008,2009 Free Software Foundation, Inc.
 dnl
 dnl GNU Mailutils is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License along
 dnl with GNU Mailutils; if not, write to the Free Software Foundation,
 dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-AC_INIT([GNU Mailutils], [2.0], [bug-mailutils@gnu.org], [mailutils])
+AC_INIT([GNU Mailutils], [2.0.90], [bug-mailutils@gnu.org], [mailutils])
 AC_CONFIG_SRCDIR([mailbox/mailbox.c])
 AC_CONFIG_AUX_DIR([scripts])
 AM_INIT_AUTOMAKE
@@ -34,7 +34,7 @@ AC_SUBST(VI_REVISION, 2)
 AC_SUBST(VI_AGE,      1)
 
 dnl Library paths
-AC_SUBST(MU_LIB_AUTH,'${top_builddir}/auth/libmuauth.la')
+AC_SUBST(MU_LIB_AUTH,'${top_builddir}/libmu_auth/libmu_auth.la')
 AC_SUBST(MU_LIB_MAILUTILS,'${top_builddir}/mailbox/libmailutils.la')
 AC_SUBST(MU_LIB_SQL,'${top_builddir}/sql/libsql.la')
 AC_SUBST(MU_LIB_IMAP,'${top_builddir}/libproto/imap/libmu_imap.la')
@@ -45,18 +45,18 @@ AC_SUBST(MU_LIB_MH,'${top_builddir}/libproto/mh/libmu_mh.la')
 AC_SUBST(MU_LIB_NNTP,'${top_builddir}/libproto/nntp/libmu_nntp.la')
 AC_SUBST(MU_LIB_POP,'${top_builddir}/libproto/pop/libmu_pop.la')
 AC_SUBST(MU_LIB_REMOTE,'${top_builddir}/libproto/remote/libmu_remotembox.la')
-AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libsieve/libsieve.la')
+AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libmu_sieve/libmu_sieve.la')
 AC_SUBST(MU_LIB_SCM,'${top_builddir}/libmu_scm/libmu_scm.la')
 AC_SUBST(MU_LIB_CPP,'${top_builddir}/libmu_cpp/libmu_cpp.la')
-AC_SUBST(MU_LIB_ARGP,'${top_builddir}/libargp/libargp.la')
+AC_SUBST(MU_LIB_ARGP,'${top_builddir}/libmu_argp/libmu_argp.la')
 
 dnl Other variables
 AC_SUBST(SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
 
 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
-AC_SUBST(MU_APP_LIBRARIES,'../libargp/libmuargp.a ../libcfg/libmucfg.la ../lib/libmuaux.la')
+AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ../lib/libmuaux.la')
 
-AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libargp -I${top_srcdir}/libcfg')
+AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
 
 dnl Check for programs
 AC_PROG_CC
@@ -144,7 +144,7 @@ AC_SUBST(MU_AUTHLIBS_DEPENDENCY)
 AC_SUBST(MU_AUTHINCS)
 
 MU_AUTHLIBS=
-MU_AUTHLIBS_DEPENDENCY=../auth/libmuauth.la
+MU_AUTHLIBS_DEPENDENCY=../libmu_auth/libmu_auth.la
 
 dnl Check for arguments
 AC_ARG_ENABLE([pam],
@@ -1216,7 +1216,6 @@ status_sendmail=$mu_cv_enable_sendmail
 dnl Output Makefiles
 AC_CONFIG_FILES([Makefile
  sql/Makefile
- auth/Makefile
  comsat/Makefile
  config/Makefile
  doc/Makefile
@@ -1238,8 +1237,13 @@ AC_CONFIG_FILES([Makefile
  include/mailutils/Makefile
  include/mailutils/sys/Makefile
  lib/Makefile
+ libmu_argp/Makefile
+ libmu_auth/Makefile
+ libmu_cfg/Makefile
  libmu_cpp/Makefile
  libmu_scm/Makefile
+ libmu_sieve/Makefile
+ libmu_sieve/extensions/Makefile
  libproto/Makefile
  libproto/mbox/Makefile
  libproto/mh/Makefile
@@ -1250,10 +1254,6 @@ AC_CONFIG_FILES([Makefile
  libproto/imap/Makefile
  libproto/include/Makefile
  libproto/remote/Makefile
- libsieve/Makefile
- libsieve/extensions/Makefile
- libargp/Makefile
- libcfg/Makefile
  maidag/Makefile
  mail/Makefile
  mail/testsuite/Makefile

@@ -40,7 +40,7 @@
 #endif  
 
 #include <stdlib.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 
 struct val_ctr {  /* Data passed to the counter function */
   mu_header_t hdr;   /* Headers of the current message */

@@ -58,7 +58,6 @@ pkginclude_HEADERS = \
  ldap.h\
  libargp.h\
  libcfg.h\
- libsieve.h\
  list.h\
  locker.h\
  mailbox.h\
@@ -85,6 +84,7 @@ pkginclude_HEADERS = \
  registrar.h\
  sha1.h\
  server.h\
+ sieve.h\
  stream.h\
  syslog.h\
  sql.h\

@@ -34,7 +34,7 @@
 #include <mailutils/header.h>
 #include <mailutils/iterator.h>
 #include <mailutils/kwd.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 #include <mailutils/list.h>
 #include <mailutils/locker.h>
 #include <mailutils/mailbox.h>

 # This file is part of GNU Mailutils
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 #
 # GNU Mailutils is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -22,9 +22,9 @@ AM_CPPFLAGS = \
  -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
  -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
 
-lib_LIBRARIES = libmuargp.a
+lib_LIBRARIES = libmu_argp.a
 
-libmuargp_a_SOURCES =\
+libmu_argp_a_SOURCES =\
  auth.c\
  cmdline.c\
  cmdline.h\

@@ -31,7 +31,7 @@
 #ifdef WITH_GSASL
 # include "mailutils/gsasl.h"
 #endif
-#include "mailutils/libsieve.h"
+#include "mailutils/sieve.h"
 
 #ifndef MU_COMPAT_CONFIG_FILE
 # define MU_COMPAT_CONFIG_FILE SYSCONFDIR "/mailutils.rc"

@@ -21,7 +21,7 @@
 # include <config.h>
 #endif  
 #include "cmdline.h"
-#include "mailutils/libsieve.h"
+#include "mailutils/sieve.h"
 
 enum {
   OPT_CLEAR_INCLUDE_PATH = 256,

@@ -21,9 +21,9 @@ INCLUDES = @MU_COMMON_INCLUDES@
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
             -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
 
-lib_LTLIBRARIES = libmuauth.la
+lib_LTLIBRARIES = libmu_auth.la
 
-libmuauth_la_SOURCES = \
+libmu_auth_la_SOURCES = \
  gsasl.c\
  lbuf.c\
  lbuf.h\
@@ -35,6 +35,6 @@ libmuauth_la_SOURCES = \
  tls.c\
  virtual.c 
 
-libmuauth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
-libmuauth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
-libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ 
+libmu_auth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
+libmu_auth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
+libmu_auth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ 

 # This file is part of GNU Mailutils
-# Copyright (C) 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009 Free Software Foundation, Inc.
 #
 # GNU Mailutils is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -20,8 +20,8 @@ INCLUDES = @MU_COMMON_INCLUDES@
 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
             -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
 
-lib_LTLIBRARIES = libmucfg.la
-libmucfg_la_SOURCES=\
+lib_LTLIBRARIES = libmu_cfg.la
+libmu_cfg_la_SOURCES=\
  acl.c\
  auth.c\
  common.c\

@@ -20,7 +20,7 @@
 #endif
 #include <stdlib.h>
 #include "mailutils/libcfg.h"
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 
 static struct mu_gocs_sieve sieve_settings;
 

 ;;;; -*- scheme -*-
 ;;;; GNU Mailutils -- a suite of utilities for electronic mail
-;;;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+;;;; Copyright (C) 2002,2003,2004,2006,2007,2009 Free Software Foundation, Inc.
 ;;;;
 ;;;; GNU Mailutils is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ changequote([,])dnl
                                   (list "SITEDIR/guile-procedures.txt")))
 
 (define mu-libs (list "libmailutils"
-		      "libmuauth"
+		      "libmu_auth"
 		      "libmu_mbox"
 		      "libmu_mh"
 		      "libmu_maildir"

 ## Process this file with GNU Automake to create Makefile.in
 
-##   Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc.
+##   Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009
+##   Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
 ##   modify it under the terms of the GNU General Public License as
@@ -25,9 +26,9 @@ AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\"
 
 SUBDIRS = . extensions
 
-lib_LTLIBRARIES = libsieve.la
+lib_LTLIBRARIES = libmu_sieve.la
 
-libsieve_la_SOURCES = \
+libmu_sieve_la_SOURCES = \
  actions.c\
  conf.c\
  comparator.c\
@@ -42,10 +43,10 @@ libsieve_la_SOURCES = \
  sieve-lex.c\
  tests.c\
  util.c
-libsieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@
-libsieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
+libmu_sieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@
+libmu_sieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
 
-noinst_HEADERS = sieve.h
+noinst_HEADERS = sieve-priv.h
 
 BUILT_SOURCES = \
   sieve-gram.c sieve-gram.h \
@@ -67,9 +68,9 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y
 
 
 CFLOW_FLAGS=-i^s --brief -v
-libsieve_CFLOW_INPUT=$(libsieve_la_OBJECTS:.lo=.c)
-libsieve.cflow: $(libsieve_CFLOW_INPUT) Makefile
+libmu_sieve_CFLOW_INPUT=$(libmu_sieve_la_OBJECTS:.lo=.c)
+libmu_sieve.cflow: $(libmu_sieve_CFLOW_INPUT) Makefile
 	cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
 		$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 		$(CPPFLAGS) \
-	$(libsieve_CFLOW_INPUT)
+	$(libmu_sieve_CFLOW_INPUT)

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>  
 #include <string.h>  
-#include <sieve.h>
+#include <sieve-priv.h>
 
 static int
 sieve_mark_deleted (mu_message_t msg, int deleted)

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>  
 #include <string.h>  
-#include <sieve.h>
+#include <sieve-priv.h>
 #include <fnmatch.h>
 #include <regex.h>
 #include <ctype.h>

@@ -20,7 +20,7 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif  
-#include <sieve.h>
+#include <sieve-priv.h>
 #include <string.h>
 
 mu_list_t mu_sieve_include_path = NULL;

 ## Process this file with GNU Automake to create Makefile.in
 
-##   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+##   Copyright (C) 2004, 2005, 2006, 2007, 2009
+##   Free Software Foundation, Inc.
 ##
 ##   GNU Mailutils is free software; you can redistribute it and/or
 ##   modify it under the terms of the GNU General Public License as
@@ -31,25 +32,25 @@ INCLUDES = @MU_COMMON_INCLUDES@
 AM_LDFLAGS = ../../lib/libmuaux.la ${MU_LIB_MAILUTILS} 
 
 list_la_SOURCES = list.c
-list_la_LIBADD = ../libsieve.la 
+list_la_LIBADD = ../libmu_sieve.la 
 list_la_LDFLAGS = -module -avoid-version -no-undefined 
 
 moderator_la_SOURCES = moderator.c
-moderator_la_LIBADD = ../libsieve.la 
+moderator_la_LIBADD = ../libmu_sieve.la 
 moderator_la_LDFLAGS = -module -avoid-version -no-undefined 
 
 spamd_la_SOURCES = spamd.c
-spamd_la_LIBADD = ../libsieve.la 
+spamd_la_LIBADD = ../libmu_sieve.la 
 spamd_la_LDFLAGS = -module -avoid-version -no-undefined 
 
 timestamp_la_SOURCES = timestamp.c
-timestamp_la_LIBADD = ../libsieve.la 
+timestamp_la_LIBADD = ../libmu_sieve.la 
 timestamp_la_LDFLAGS = -module -avoid-version -no-undefined 
 
 vacation_la_SOURCES = vacation.c
-vacation_la_LIBADD = ../libsieve.la 
+vacation_la_LIBADD = ../libmu_sieve.la 
 vacation_la_LDFLAGS = -module -avoid-version -no-undefined 
 
 pipe_la_SOURCES = pipe.c
-pipe_la_LIBADD = ../libsieve.la 
+pipe_la_LIBADD = ../libmu_sieve.la 
 pipe_la_LDFLAGS = -module -avoid-version -no-undefined 

@@ -26,7 +26,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 
 
 

@@ -63,7 +63,7 @@
 #endif  
 
 #include <unistd.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 #include <stdlib.h>
 
 static int

@@ -40,7 +40,7 @@
 #include <signal.h>
 #include <regex.h>
 #include <mu_dbm.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 
 #define ASSERT(expr, diag, ec)                                                \
  if (!(expr))                                                                 \

@@ -30,7 +30,7 @@
 #include <sys/un.h>
 #include <string.h>
 #include <signal.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 #include <mailutils/mu_auth.h>
 #include <mailutils/nls.h>
 

@@ -44,7 +44,7 @@
 #endif  
 
 #include <stdlib.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 
 /* Handler for the timestamp test */
 static int

@@ -37,7 +37,7 @@
 #include <signal.h>
 #include <regex.h>
 #include <mu_dbm.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 #include <mailutils/mu_auth.h>
 
 /* Build a mime response message from original message MSG. TEXT

@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <unistd.h>  
 #include <string.h>
-#include <sieve.h>
+#include <sieve-priv.h>
 #include <ltdl.h>
 #include <ctype.h>
 
@@ -153,7 +153,7 @@ mu_sv_load_add_dir (mu_sieve_machine_t mach, const char *name)
 }
 
 #else
-#include <sieve.h>
+#include <sieve-priv.h>
 
 int
 mu_sieve_load_ext (mu_sieve_machine_t mach, const char *name)

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <sieve.h>
+#include <sieve-priv.h>
 
 int
 mu_sv_code (sieve_op_t *op)

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>  
 #include <string.h>  
-#include <sieve.h>
+#include <sieve-priv.h>
 
 static mu_sieve_register_t *
 reg_lookup (mu_list_t list, const char *name)

@@ -22,7 +22,7 @@
 
 #include <unistd.h>  
 #include <string.h>  
-#include <sieve.h>
+#include <sieve-priv.h>
 
 #define CAT2(a,b) a##b
 #define CAT3(a,b,c) a##b##c

@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <unistd.h>  
 #include <string.h>  
-#include <sieve.h>
+#include <sieve-priv.h>
 
 void
 mu_sieve_require (mu_list_t slist)

@@ -23,7 +23,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <sieve.h>
+#include <sieve-priv.h>
 
 #define SIEVE_ARG(m,n,t) ((m)->prog[(m)->pc+(n)].t)
 #define SIEVE_ADJUST(m,n) (m)->pc+=(n)

@@ -17,7 +17,7 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301 USA */
 
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 #include <mu_asprintf.h>
 #include <setjmp.h>
 #include <string.h>

@@ -31,7 +31,7 @@
 #include <string.h>
 #include <ctype.h>
 #include <mailutils/argcv.h>
-#include <sieve.h>
+#include <sieve-priv.h>
 #include <sieve-gram.h>
   
 mu_sieve_locus_t mu_sieve_locus;

@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <sieve.h>
+#include <sieve-priv.h>
 
 mu_sieve_machine_t mu_sieve_machine;
 int mu_sieve_error_count;

@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>  
-#include <sieve.h>
+#include <sieve-priv.h>
 
 typedef int (*address_aget_t) (mu_address_t addr, size_t no, char **buf);
 

@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <sieve.h>
+#include <sieve-priv.h>
 
 void *
 mu_sieve_alloc (size_t size)

@@ -80,7 +80,7 @@
 #include <mailutils/stream.h>
 #include <mailutils/url.h>
 #include <mailutils/mu_auth.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 #include <mailutils/nls.h>
 #include <mailutils/daemon.h>
 #include <mailutils/acl.h>

@@ -145,8 +145,8 @@ dbm_retrieve_quota (char *name, mu_off_t *quota)
 #ifdef USE_SQL
 #include <mailutils/sql.h>
 
-/* FIXME: defined in auth/sql.c */
-#include <auth/sql.h>
+/* FIXME: defined in libmu_auth/sql.c */
+#include <libmu_auth/sql.h>
 
 int
 sql_retrieve_quota (char *name, mu_off_t *quota)

@@ -81,7 +81,7 @@
 #include <mailutils/stream.h>
 #include <mailutils/url.h>
 #include <mailutils/mu_auth.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 #include <mailutils/nls.h>
 
 #include <mu_dbm.h>

@@ -145,8 +145,8 @@ dbm_retrieve_quota (char *name, mu_off_t *quota)
 #ifdef USE_SQL
 #include <mailutils/sql.h>
 
-/* FIXME: defined in auth/sql.c */
-#include <auth/sql.h>
+/* FIXME: defined in libmu_auth/sql.c */
+#include <libmu_auth/sql.h>
 
 int
 sql_retrieve_quota (char *name, mu_off_t *quota)

@@ -34,7 +34,7 @@
 
 #include <mu_asprintf.h>
 #include <mailutils/argcv.h>
-#include <mailutils/libsieve.h>
+#include <mailutils/sieve.h>
 #include <mailutils/auth.h>
 #include <mailutils/errno.h>
 #include <mailutils/folder.h>