Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 89d40411 89d404113a5e79d5a2f8215140b54897ac0b3d11 by Wojciech Polak
Options

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.
1 parent 8ad5ecbc
Inline Side-by-side
Showing 80 changed files with 83 additions and 81 deletions
1 ## Process this file with GNU Automake to create Makefile.in 1 ## Process this file with GNU Automake to create Makefile.in
2 2
3 ## Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008 3 ## Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007,2008,2009
4 ## Free Software Foundation, Inc. 4 ## Free Software Foundation, Inc.
5 ## 5 ##
6 ## GNU Mailutils is free software; you can redistribute it and/or 6 ## GNU Mailutils is free software; you can redistribute it and/or
...@@ -27,14 +27,14 @@ SUBDIRS = \ ...@@ -27,14 +27,14 @@ SUBDIRS = \
27 testsuite\ 27 testsuite\
28 mailbox\ 28 mailbox\
29 sql\ 29 sql\
30 auth\ 30 libmu_auth\
31 libproto\ 31 libproto\
32 lib\ 32 lib\
33 libsieve\ 33 libmu_argp\
34 libmu_cfg\
34 libmu_cpp\ 35 libmu_cpp\
35 libmu_scm\ 36 libmu_scm\
36 libargp\ 37 libmu_sieve\
37 libcfg\
38 doc\ 38 doc\
39 config\ 39 config\
40 examples\ 40 examples\
......
1 dnl Configuration for GNU Mailutils -- a suite of utilities for electronic mail 1 dnl Configuration for GNU Mailutils -- a suite of utilities for electronic mail
2 dnl 2 dnl
3 dnl Copyright (C) 1999,2000,2001,2002,2003,2004,2005, 3 dnl Copyright (C) 1999,2000,2001,2002,2003,2004,2005,
4 dnl 2006,2007,2008 Free Software Foundation, Inc. 4 dnl 2006,2007,2008,2009 Free Software Foundation, Inc.
5 dnl 5 dnl
6 dnl GNU Mailutils is free software; you can redistribute it and/or modify 6 dnl GNU Mailutils is free software; you can redistribute it and/or modify
7 dnl it under the terms of the GNU General Public License as published by 7 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 ...@@ -17,7 +17,7 @@ dnl You should have received a copy of the GNU General Public License along
17 dnl with GNU Mailutils; if not, write to the Free Software Foundation, 17 dnl with GNU Mailutils; if not, write to the Free Software Foundation,
18 dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18 dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19 19
20 AC_INIT([GNU Mailutils], [2.0], [bug-mailutils@gnu.org], [mailutils]) 20 AC_INIT([GNU Mailutils], [2.0.90], [bug-mailutils@gnu.org], [mailutils])
21 AC_CONFIG_SRCDIR([mailbox/mailbox.c]) 21 AC_CONFIG_SRCDIR([mailbox/mailbox.c])
22 AC_CONFIG_AUX_DIR([scripts]) 22 AC_CONFIG_AUX_DIR([scripts])
23 AM_INIT_AUTOMAKE 23 AM_INIT_AUTOMAKE
...@@ -34,7 +34,7 @@ AC_SUBST(VI_REVISION, 2) ...@@ -34,7 +34,7 @@ AC_SUBST(VI_REVISION, 2)
34 AC_SUBST(VI_AGE, 1) 34 AC_SUBST(VI_AGE, 1)
35 35
36 dnl Library paths 36 dnl Library paths
37 AC_SUBST(MU_LIB_AUTH,'${top_builddir}/auth/libmuauth.la') 37 AC_SUBST(MU_LIB_AUTH,'${top_builddir}/libmu_auth/libmu_auth.la')
38 AC_SUBST(MU_LIB_MAILUTILS,'${top_builddir}/mailbox/libmailutils.la') 38 AC_SUBST(MU_LIB_MAILUTILS,'${top_builddir}/mailbox/libmailutils.la')
39 AC_SUBST(MU_LIB_SQL,'${top_builddir}/sql/libsql.la') 39 AC_SUBST(MU_LIB_SQL,'${top_builddir}/sql/libsql.la')
40 AC_SUBST(MU_LIB_IMAP,'${top_builddir}/libproto/imap/libmu_imap.la') 40 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') ...@@ -45,18 +45,18 @@ AC_SUBST(MU_LIB_MH,'${top_builddir}/libproto/mh/libmu_mh.la')
45 AC_SUBST(MU_LIB_NNTP,'${top_builddir}/libproto/nntp/libmu_nntp.la') 45 AC_SUBST(MU_LIB_NNTP,'${top_builddir}/libproto/nntp/libmu_nntp.la')
46 AC_SUBST(MU_LIB_POP,'${top_builddir}/libproto/pop/libmu_pop.la') 46 AC_SUBST(MU_LIB_POP,'${top_builddir}/libproto/pop/libmu_pop.la')
47 AC_SUBST(MU_LIB_REMOTE,'${top_builddir}/libproto/remote/libmu_remotembox.la') 47 AC_SUBST(MU_LIB_REMOTE,'${top_builddir}/libproto/remote/libmu_remotembox.la')
48 AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libsieve/libsieve.la') 48 AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libmu_sieve/libmu_sieve.la')
49 AC_SUBST(MU_LIB_SCM,'${top_builddir}/libmu_scm/libmu_scm.la') 49 AC_SUBST(MU_LIB_SCM,'${top_builddir}/libmu_scm/libmu_scm.la')
50 AC_SUBST(MU_LIB_CPP,'${top_builddir}/libmu_cpp/libmu_cpp.la') 50 AC_SUBST(MU_LIB_CPP,'${top_builddir}/libmu_cpp/libmu_cpp.la')
51 AC_SUBST(MU_LIB_ARGP,'${top_builddir}/libargp/libargp.la') 51 AC_SUBST(MU_LIB_ARGP,'${top_builddir}/libmu_argp/libmu_argp.la')
52 52
53 dnl Other variables 53 dnl Other variables
54 AC_SUBST(SIEVE_MODDIR,'$(libdir)/$(PACKAGE)') 54 AC_SUBST(SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
55 55
56 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)') 56 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
57 AC_SUBST(MU_APP_LIBRARIES,'../libargp/libmuargp.a ../libcfg/libmucfg.la ../lib/libmuaux.la') 57 AC_SUBST(MU_APP_LIBRARIES,'../libmu_argp/libmu_argp.a ../libmu_cfg/libmu_cfg.la ../lib/libmuaux.la')
58 58
59 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') 59 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')
60 60
61 dnl Check for programs 61 dnl Check for programs
62 AC_PROG_CC 62 AC_PROG_CC
...@@ -144,7 +144,7 @@ AC_SUBST(MU_AUTHLIBS_DEPENDENCY) ...@@ -144,7 +144,7 @@ AC_SUBST(MU_AUTHLIBS_DEPENDENCY)
144 AC_SUBST(MU_AUTHINCS) 144 AC_SUBST(MU_AUTHINCS)
145 145
146 MU_AUTHLIBS= 146 MU_AUTHLIBS=
147 MU_AUTHLIBS_DEPENDENCY=../auth/libmuauth.la 147 MU_AUTHLIBS_DEPENDENCY=../libmu_auth/libmu_auth.la
148 148
149 dnl Check for arguments 149 dnl Check for arguments
150 AC_ARG_ENABLE([pam], 150 AC_ARG_ENABLE([pam],
...@@ -1216,7 +1216,6 @@ status_sendmail=$mu_cv_enable_sendmail ...@@ -1216,7 +1216,6 @@ status_sendmail=$mu_cv_enable_sendmail
1216 dnl Output Makefiles 1216 dnl Output Makefiles
1217 AC_CONFIG_FILES([Makefile 1217 AC_CONFIG_FILES([Makefile
1218 sql/Makefile 1218 sql/Makefile
1219 auth/Makefile
1220 comsat/Makefile 1219 comsat/Makefile
1221 config/Makefile 1220 config/Makefile
1222 doc/Makefile 1221 doc/Makefile
...@@ -1238,8 +1237,13 @@ AC_CONFIG_FILES([Makefile ...@@ -1238,8 +1237,13 @@ AC_CONFIG_FILES([Makefile
1238 include/mailutils/Makefile 1237 include/mailutils/Makefile
1239 include/mailutils/sys/Makefile 1238 include/mailutils/sys/Makefile
1240 lib/Makefile 1239 lib/Makefile
1240 libmu_argp/Makefile
1241 libmu_auth/Makefile
1242 libmu_cfg/Makefile
1241 libmu_cpp/Makefile 1243 libmu_cpp/Makefile
1242 libmu_scm/Makefile 1244 libmu_scm/Makefile
1245 libmu_sieve/Makefile
1246 libmu_sieve/extensions/Makefile
1243 libproto/Makefile 1247 libproto/Makefile
1244 libproto/mbox/Makefile 1248 libproto/mbox/Makefile
1245 libproto/mh/Makefile 1249 libproto/mh/Makefile
...@@ -1250,10 +1254,6 @@ AC_CONFIG_FILES([Makefile ...@@ -1250,10 +1254,6 @@ AC_CONFIG_FILES([Makefile
1250 libproto/imap/Makefile 1254 libproto/imap/Makefile
1251 libproto/include/Makefile 1255 libproto/include/Makefile
1252 libproto/remote/Makefile 1256 libproto/remote/Makefile
1253 libsieve/Makefile
1254 libsieve/extensions/Makefile
1255 libargp/Makefile
1256 libcfg/Makefile
1257 maidag/Makefile 1257 maidag/Makefile
1258 mail/Makefile 1258 mail/Makefile
1259 mail/testsuite/Makefile 1259 mail/testsuite/Makefile
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 #endif 40 #endif
41 41
42 #include <stdlib.h> 42 #include <stdlib.h>
43 #include <mailutils/libsieve.h> 43 #include <mailutils/sieve.h>
44 44
45 struct val_ctr { /* Data passed to the counter function */ 45 struct val_ctr { /* Data passed to the counter function */
46 mu_header_t hdr; /* Headers of the current message */ 46 mu_header_t hdr; /* Headers of the current message */
......
...@@ -58,7 +58,6 @@ pkginclude_HEADERS = \ ...@@ -58,7 +58,6 @@ pkginclude_HEADERS = \
58 ldap.h\ 58 ldap.h\
59 libargp.h\ 59 libargp.h\
60 libcfg.h\ 60 libcfg.h\
61 libsieve.h\
62 list.h\ 61 list.h\
63 locker.h\ 62 locker.h\
64 mailbox.h\ 63 mailbox.h\
...@@ -85,6 +84,7 @@ pkginclude_HEADERS = \ ...@@ -85,6 +84,7 @@ pkginclude_HEADERS = \
85 registrar.h\ 84 registrar.h\
86 sha1.h\ 85 sha1.h\
87 server.h\ 86 server.h\
87 sieve.h\
88 stream.h\ 88 stream.h\
89 syslog.h\ 89 syslog.h\
90 sql.h\ 90 sql.h\
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 #include <mailutils/header.h> 34 #include <mailutils/header.h>
35 #include <mailutils/iterator.h> 35 #include <mailutils/iterator.h>
36 #include <mailutils/kwd.h> 36 #include <mailutils/kwd.h>
37 #include <mailutils/libsieve.h> 37 #include <mailutils/sieve.h>
38 #include <mailutils/list.h> 38 #include <mailutils/list.h>
39 #include <mailutils/locker.h> 39 #include <mailutils/locker.h>
40 #include <mailutils/mailbox.h> 40 #include <mailutils/mailbox.h>
......
1 # This file is part of GNU Mailutils 1 # This file is part of GNU Mailutils
2 # Copyright (C) 2007 Free Software Foundation, Inc. 2 # Copyright (C) 2007, 2009 Free Software Foundation, Inc.
3 # 3 #
4 # GNU Mailutils is free software; you can redistribute it and/or 4 # GNU Mailutils is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License as 5 # modify it under the terms of the GNU General Public License as
...@@ -22,9 +22,9 @@ AM_CPPFLAGS = \ ...@@ -22,9 +22,9 @@ AM_CPPFLAGS = \
22 -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\ 22 -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
23 -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\" 23 -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
24 24
25 lib_LIBRARIES = libmuargp.a 25 lib_LIBRARIES = libmu_argp.a
26 26
27 libmuargp_a_SOURCES =\ 27 libmu_argp_a_SOURCES =\
28 auth.c\ 28 auth.c\
29 cmdline.c\ 29 cmdline.c\
30 cmdline.h\ 30 cmdline.h\
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 #ifdef WITH_GSASL 31 #ifdef WITH_GSASL
32 # include "mailutils/gsasl.h" 32 # include "mailutils/gsasl.h"
33 #endif 33 #endif
34 #include "mailutils/libsieve.h" 34 #include "mailutils/sieve.h"
35 35
36 #ifndef MU_COMPAT_CONFIG_FILE 36 #ifndef MU_COMPAT_CONFIG_FILE
37 # define MU_COMPAT_CONFIG_FILE SYSCONFDIR "/mailutils.rc" 37 # define MU_COMPAT_CONFIG_FILE SYSCONFDIR "/mailutils.rc"
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 # include <config.h> 21 # include <config.h>
22 #endif 22 #endif
23 #include "cmdline.h" 23 #include "cmdline.h"
24 #include "mailutils/libsieve.h" 24 #include "mailutils/sieve.h"
25 25
26 enum { 26 enum {
27 OPT_CLEAR_INCLUDE_PATH = 256, 27 OPT_CLEAR_INCLUDE_PATH = 256,
......
...@@ -21,9 +21,9 @@ INCLUDES = @MU_COMMON_INCLUDES@ ...@@ -21,9 +21,9 @@ INCLUDES = @MU_COMMON_INCLUDES@
21 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \ 21 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
22 -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\" 22 -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
23 23
24 lib_LTLIBRARIES = libmuauth.la 24 lib_LTLIBRARIES = libmu_auth.la
25 25
26 libmuauth_la_SOURCES = \ 26 libmu_auth_la_SOURCES = \
27 gsasl.c\ 27 gsasl.c\
28 lbuf.c\ 28 lbuf.c\
29 lbuf.h\ 29 lbuf.h\
...@@ -35,6 +35,6 @@ libmuauth_la_SOURCES = \ ...@@ -35,6 +35,6 @@ libmuauth_la_SOURCES = \
35 tls.c\ 35 tls.c\
36 virtual.c 36 virtual.c
37 37
38 libmuauth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@ 38 libmu_auth_la_LIBADD = ${MU_LIB_MAILUTILS} @MU_AUTHLIBS@ @SQLLIB@ @LTLIBINTL@
39 libmuauth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 39 libmu_auth_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
40 libmuauth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@ 40 libmu_auth_la_DEPENDENCIES = @SQLLIB_DEPENDENCY@
......
1 # This file is part of GNU Mailutils 1 # This file is part of GNU Mailutils
2 # Copyright (C) 2007 Free Software Foundation, Inc. 2 # Copyright (C) 2007, 2009 Free Software Foundation, Inc.
3 # 3 #
4 # GNU Mailutils is free software; you can redistribute it and/or 4 # GNU Mailutils is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License as 5 # modify it under the terms of the GNU General Public License as
...@@ -20,8 +20,8 @@ INCLUDES = @MU_COMMON_INCLUDES@ ...@@ -20,8 +20,8 @@ INCLUDES = @MU_COMMON_INCLUDES@
20 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \ 20 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" \
21 -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\" 21 -DSITE_CRAM_MD5_PWD=\"@SITE_CRAM_MD5_PWD@\"
22 22
23 lib_LTLIBRARIES = libmucfg.la 23 lib_LTLIBRARIES = libmu_cfg.la
24 libmucfg_la_SOURCES=\ 24 libmu_cfg_la_SOURCES=\
25 acl.c\ 25 acl.c\
26 auth.c\ 26 auth.c\
27 common.c\ 27 common.c\
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 #endif 20 #endif
21 #include <stdlib.h> 21 #include <stdlib.h>
22 #include "mailutils/libcfg.h" 22 #include "mailutils/libcfg.h"
23 #include <mailutils/libsieve.h> 23 #include <mailutils/sieve.h>
24 24
25 static struct mu_gocs_sieve sieve_settings; 25 static struct mu_gocs_sieve sieve_settings;
26 26
......
1 ;;;; -*- scheme -*- 1 ;;;; -*- scheme -*-
2 ;;;; GNU Mailutils -- a suite of utilities for electronic mail 2 ;;;; GNU Mailutils -- a suite of utilities for electronic mail
3 ;;;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. 3 ;;;; Copyright (C) 2002,2003,2004,2006,2007,2009 Free Software Foundation, Inc.
4 ;;;; 4 ;;;;
5 ;;;; GNU Mailutils is free software; you can redistribute it and/or modify 5 ;;;; GNU Mailutils is free software; you can redistribute it and/or modify
6 ;;;; it under the terms of the GNU General Public License as published by 6 ;;;; it under the terms of the GNU General Public License as published by
...@@ -25,7 +25,7 @@ changequote([,])dnl ...@@ -25,7 +25,7 @@ changequote([,])dnl
25 (list "SITEDIR/guile-procedures.txt"))) 25 (list "SITEDIR/guile-procedures.txt")))
26 26
27 (define mu-libs (list "libmailutils" 27 (define mu-libs (list "libmailutils"
28 "libmuauth" 28 "libmu_auth"
29 "libmu_mbox" 29 "libmu_mbox"
30 "libmu_mh" 30 "libmu_mh"
31 "libmu_maildir" 31 "libmu_maildir"
......
1 ## Process this file with GNU Automake to create Makefile.in 1 ## Process this file with GNU Automake to create Makefile.in
2 2
3 ## Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. 3 ## Copyright (C) 2002, 2003, 2004, 2005, 2007, 2009
4 ## Free Software Foundation, Inc.
4 ## 5 ##
5 ## GNU Mailutils is free software; you can redistribute it and/or 6 ## GNU Mailutils is free software; you can redistribute it and/or
6 ## modify it under the terms of the GNU General Public License as 7 ## modify it under the terms of the GNU General Public License as
...@@ -25,9 +26,9 @@ AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\" ...@@ -25,9 +26,9 @@ AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\"
25 26
26 SUBDIRS = . extensions 27 SUBDIRS = . extensions
27 28
28 lib_LTLIBRARIES = libsieve.la 29 lib_LTLIBRARIES = libmu_sieve.la
29 30
30 libsieve_la_SOURCES = \ 31 libmu_sieve_la_SOURCES = \
31 actions.c\ 32 actions.c\
32 conf.c\ 33 conf.c\
33 comparator.c\ 34 comparator.c\
...@@ -42,10 +43,10 @@ libsieve_la_SOURCES = \ ...@@ -42,10 +43,10 @@ libsieve_la_SOURCES = \
42 sieve-lex.c\ 43 sieve-lex.c\
43 tests.c\ 44 tests.c\
44 util.c 45 util.c
45 libsieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@ 46 libmu_sieve_la_LIBADD = ${MU_LIB_MAILUTILS} @LTDL_LIB@
46 libsieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 47 libmu_sieve_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
47 48
48 noinst_HEADERS = sieve.h 49 noinst_HEADERS = sieve-priv.h
49 50
50 BUILT_SOURCES = \ 51 BUILT_SOURCES = \
51 sieve-gram.c sieve-gram.h \ 52 sieve-gram.c sieve-gram.h \
...@@ -67,9 +68,9 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y ...@@ -67,9 +68,9 @@ sieve-gram.c sieve-gram.h: $(srcdir)/sieve.y
67 68
68 69
69 CFLOW_FLAGS=-i^s --brief -v 70 CFLOW_FLAGS=-i^s --brief -v
70 libsieve_CFLOW_INPUT=$(libsieve_la_OBJECTS:.lo=.c) 71 libmu_sieve_CFLOW_INPUT=$(libmu_sieve_la_OBJECTS:.lo=.c)
71 libsieve.cflow: $(libsieve_CFLOW_INPUT) Makefile 72 libmu_sieve.cflow: $(libmu_sieve_CFLOW_INPUT) Makefile
72 cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \ 73 cflow -o$@ $(CFLOW_FLAGS) $(DEFS) \
73 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 74 $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
74 $(CPPFLAGS) \ 75 $(CPPFLAGS) \
75 $(libsieve_CFLOW_INPUT) 76 $(libmu_sieve_CFLOW_INPUT)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <unistd.h> 26 #include <unistd.h>
27 #include <string.h> 27 #include <string.h>
28 #include <sieve.h> 28 #include <sieve-priv.h>
29 29
30 static int 30 static int
31 sieve_mark_deleted (mu_message_t msg, int deleted) 31 sieve_mark_deleted (mu_message_t msg, int deleted)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <unistd.h> 26 #include <unistd.h>
27 #include <string.h> 27 #include <string.h>
28 #include <sieve.h> 28 #include <sieve-priv.h>
29 #include <fnmatch.h> 29 #include <fnmatch.h>
30 #include <regex.h> 30 #include <regex.h>
31 #include <ctype.h> 31 #include <ctype.h>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
20 #ifdef HAVE_CONFIG_H 20 #ifdef HAVE_CONFIG_H
21 # include <config.h> 21 # include <config.h>
22 #endif 22 #endif
23 #include <sieve.h> 23 #include <sieve-priv.h>
24 #include <string.h> 24 #include <string.h>
25 25
26 mu_list_t mu_sieve_include_path = NULL; 26 mu_list_t mu_sieve_include_path = NULL;
......
1 ## Process this file with GNU Automake to create Makefile.in 1 ## Process this file with GNU Automake to create Makefile.in
2 2
3 ## Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 3 ## Copyright (C) 2004, 2005, 2006, 2007, 2009
4 ## Free Software Foundation, Inc.
4 ## 5 ##
5 ## GNU Mailutils is free software; you can redistribute it and/or 6 ## GNU Mailutils is free software; you can redistribute it and/or
6 ## modify it under the terms of the GNU General Public License as 7 ## modify it under the terms of the GNU General Public License as
...@@ -31,25 +32,25 @@ INCLUDES = @MU_COMMON_INCLUDES@ ...@@ -31,25 +32,25 @@ INCLUDES = @MU_COMMON_INCLUDES@
31 AM_LDFLAGS = ../../lib/libmuaux.la ${MU_LIB_MAILUTILS} 32 AM_LDFLAGS = ../../lib/libmuaux.la ${MU_LIB_MAILUTILS}
32 33
33 list_la_SOURCES = list.c 34 list_la_SOURCES = list.c
34 list_la_LIBADD = ../libsieve.la 35 list_la_LIBADD = ../libmu_sieve.la
35 list_la_LDFLAGS = -module -avoid-version -no-undefined 36 list_la_LDFLAGS = -module -avoid-version -no-undefined
36 37
37 moderator_la_SOURCES = moderator.c 38 moderator_la_SOURCES = moderator.c
38 moderator_la_LIBADD = ../libsieve.la 39 moderator_la_LIBADD = ../libmu_sieve.la
39 moderator_la_LDFLAGS = -module -avoid-version -no-undefined 40 moderator_la_LDFLAGS = -module -avoid-version -no-undefined
40 41
41 spamd_la_SOURCES = spamd.c 42 spamd_la_SOURCES = spamd.c
42 spamd_la_LIBADD = ../libsieve.la 43 spamd_la_LIBADD = ../libmu_sieve.la
43 spamd_la_LDFLAGS = -module -avoid-version -no-undefined 44 spamd_la_LDFLAGS = -module -avoid-version -no-undefined
44 45
45 timestamp_la_SOURCES = timestamp.c 46 timestamp_la_SOURCES = timestamp.c
46 timestamp_la_LIBADD = ../libsieve.la 47 timestamp_la_LIBADD = ../libmu_sieve.la
47 timestamp_la_LDFLAGS = -module -avoid-version -no-undefined 48 timestamp_la_LDFLAGS = -module -avoid-version -no-undefined
48 49
49 vacation_la_SOURCES = vacation.c 50 vacation_la_SOURCES = vacation.c
50 vacation_la_LIBADD = ../libsieve.la 51 vacation_la_LIBADD = ../libmu_sieve.la
51 vacation_la_LDFLAGS = -module -avoid-version -no-undefined 52 vacation_la_LDFLAGS = -module -avoid-version -no-undefined
52 53
53 pipe_la_SOURCES = pipe.c 54 pipe_la_SOURCES = pipe.c
54 pipe_la_LIBADD = ../libsieve.la 55 pipe_la_LIBADD = ../libmu_sieve.la
55 pipe_la_LDFLAGS = -module -avoid-version -no-undefined 56 pipe_la_LDFLAGS = -module -avoid-version -no-undefined
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 #include <unistd.h> 26 #include <unistd.h>
27 #include <stdlib.h> 27 #include <stdlib.h>
28 #include <string.h> 28 #include <string.h>
29 #include <mailutils/libsieve.h> 29 #include <mailutils/sieve.h>
30 30
31 31
32 32
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
63 #endif 63 #endif
64 64
65 #include <unistd.h> 65 #include <unistd.h>
66 #include <mailutils/libsieve.h> 66 #include <mailutils/sieve.h>
67 #include <stdlib.h> 67 #include <stdlib.h>
68 68
69 static int 69 static int
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 #include <signal.h> 40 #include <signal.h>
41 #include <regex.h> 41 #include <regex.h>
42 #include <mu_dbm.h> 42 #include <mu_dbm.h>
43 #include <mailutils/libsieve.h> 43 #include <mailutils/sieve.h>
44 44
45 #define ASSERT(expr, diag, ec) \ 45 #define ASSERT(expr, diag, ec) \
46 if (!(expr)) \ 46 if (!(expr)) \
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
30 #include <sys/un.h> 30 #include <sys/un.h>
31 #include <string.h> 31 #include <string.h>
32 #include <signal.h> 32 #include <signal.h>
33 #include <mailutils/libsieve.h> 33 #include <mailutils/sieve.h>
34 #include <mailutils/mu_auth.h> 34 #include <mailutils/mu_auth.h>
35 #include <mailutils/nls.h> 35 #include <mailutils/nls.h>
36 36
......
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
44 #endif 44 #endif
45 45
46 #include <stdlib.h> 46 #include <stdlib.h>
47 #include <mailutils/libsieve.h> 47 #include <mailutils/sieve.h>
48 48
49 /* Handler for the timestamp test */ 49 /* Handler for the timestamp test */
50 static int 50 static int
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 #include <signal.h> 37 #include <signal.h>
38 #include <regex.h> 38 #include <regex.h>
39 #include <mu_dbm.h> 39 #include <mu_dbm.h>
40 #include <mailutils/libsieve.h> 40 #include <mailutils/sieve.h>
41 #include <mailutils/mu_auth.h> 41 #include <mailutils/mu_auth.h>
42 42
43 /* Build a mime response message from original message MSG. TEXT 43 /* Build a mime response message from original message MSG. TEXT
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 #include <stdlib.h> 26 #include <stdlib.h>
27 #include <unistd.h> 27 #include <unistd.h>
28 #include <string.h> 28 #include <string.h>
29 #include <sieve.h> 29 #include <sieve-priv.h>
30 #include <ltdl.h> 30 #include <ltdl.h>
31 #include <ctype.h> 31 #include <ctype.h>
32 32
...@@ -153,7 +153,7 @@ mu_sv_load_add_dir (mu_sieve_machine_t mach, const char *name) ...@@ -153,7 +153,7 @@ mu_sv_load_add_dir (mu_sieve_machine_t mach, const char *name)
153 } 153 }
154 154
155 #else 155 #else
156 #include <sieve.h> 156 #include <sieve-priv.h>
157 157
158 int 158 int
159 mu_sieve_load_ext (mu_sieve_machine_t mach, const char *name) 159 mu_sieve_load_ext (mu_sieve_machine_t mach, const char *name)
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 #include <stdio.h> 23 #include <stdio.h>
24 #include <stdlib.h> 24 #include <stdlib.h>
25 #include <assert.h> 25 #include <assert.h>
26 #include <sieve.h> 26 #include <sieve-priv.h>
27 27
28 int 28 int
29 mu_sv_code (sieve_op_t *op) 29 mu_sv_code (sieve_op_t *op)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <unistd.h> 26 #include <unistd.h>
27 #include <string.h> 27 #include <string.h>
28 #include <sieve.h> 28 #include <sieve-priv.h>
29 29
30 static mu_sieve_register_t * 30 static mu_sieve_register_t *
31 reg_lookup (mu_list_t list, const char *name) 31 reg_lookup (mu_list_t list, const char *name)
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 22
23 #include <unistd.h> 23 #include <unistd.h>
24 #include <string.h> 24 #include <string.h>
25 #include <sieve.h> 25 #include <sieve-priv.h>
26 26
27 #define CAT2(a,b) a##b 27 #define CAT2(a,b) a##b
28 #define CAT3(a,b,c) a##b##c 28 #define CAT3(a,b,c) a##b##c
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <unistd.h> 26 #include <unistd.h>
27 #include <string.h> 27 #include <string.h>
28 #include <sieve.h> 28 #include <sieve-priv.h>
29 29
30 void 30 void
31 mu_sieve_require (mu_list_t slist) 31 mu_sieve_require (mu_list_t slist)
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 #include <stdio.h> 23 #include <stdio.h>
24 #include <stdlib.h> 24 #include <stdlib.h>
25 #include <assert.h> 25 #include <assert.h>
26 #include <sieve.h> 26 #include <sieve-priv.h>
27 27
28 #define SIEVE_ARG(m,n,t) ((m)->prog[(m)->pc+(n)].t) 28 #define SIEVE_ARG(m,n,t) ((m)->prog[(m)->pc+(n)].t)
29 #define SIEVE_ADJUST(m,n) (m)->pc+=(n) 29 #define SIEVE_ADJUST(m,n) (m)->pc+=(n)
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 Boston, MA 02110-1301 USA */ 18 Boston, MA 02110-1301 USA */
19 19
20 #include <mailutils/libsieve.h> 20 #include <mailutils/sieve.h>
21 #include <mu_asprintf.h> 21 #include <mu_asprintf.h>
22 #include <setjmp.h> 22 #include <setjmp.h>
23 #include <string.h> 23 #include <string.h>
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
31 #include <string.h> 31 #include <string.h>
32 #include <ctype.h> 32 #include <ctype.h>
33 #include <mailutils/argcv.h> 33 #include <mailutils/argcv.h>
34 #include <sieve.h> 34 #include <sieve-priv.h>
35 #include <sieve-gram.h> 35 #include <sieve-gram.h>
36 36
37 mu_sieve_locus_t mu_sieve_locus; 37 mu_sieve_locus_t mu_sieve_locus;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 #include <stdio.h> 24 #include <stdio.h>
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <assert.h> 26 #include <assert.h>
27 #include <sieve.h> 27 #include <sieve-priv.h>
28 28
29 mu_sieve_machine_t mu_sieve_machine; 29 mu_sieve_machine_t mu_sieve_machine;
30 int mu_sieve_error_count; 30 int mu_sieve_error_count;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 #include <stdio.h> 24 #include <stdio.h>
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <unistd.h> 26 #include <unistd.h>
27 #include <sieve.h> 27 #include <sieve-priv.h>
28 28
29 typedef int (*address_aget_t) (mu_address_t addr, size_t no, char **buf); 29 typedef int (*address_aget_t) (mu_address_t addr, size_t no, char **buf);
30 30
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 #include <stdio.h> 24 #include <stdio.h>
25 #include <stdlib.h> 25 #include <stdlib.h>
26 #include <stdarg.h> 26 #include <stdarg.h>
27 #include <sieve.h> 27 #include <sieve-priv.h>
28 28
29 void * 29 void *
30 mu_sieve_alloc (size_t size) 30 mu_sieve_alloc (size_t size)
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
80 #include <mailutils/stream.h> 80 #include <mailutils/stream.h>
81 #include <mailutils/url.h> 81 #include <mailutils/url.h>
82 #include <mailutils/mu_auth.h> 82 #include <mailutils/mu_auth.h>
83 #include <mailutils/libsieve.h> 83 #include <mailutils/sieve.h>
84 #include <mailutils/nls.h> 84 #include <mailutils/nls.h>
85 #include <mailutils/daemon.h> 85 #include <mailutils/daemon.h>
86 #include <mailutils/acl.h> 86 #include <mailutils/acl.h>
......
...@@ -145,8 +145,8 @@ dbm_retrieve_quota (char *name, mu_off_t *quota) ...@@ -145,8 +145,8 @@ dbm_retrieve_quota (char *name, mu_off_t *quota)
145 #ifdef USE_SQL 145 #ifdef USE_SQL
146 #include <mailutils/sql.h> 146 #include <mailutils/sql.h>
147 147
148 /* FIXME: defined in auth/sql.c */ 148 /* FIXME: defined in libmu_auth/sql.c */
149 #include <auth/sql.h> 149 #include <libmu_auth/sql.h>
150 150
151 int 151 int
152 sql_retrieve_quota (char *name, mu_off_t *quota) 152 sql_retrieve_quota (char *name, mu_off_t *quota)
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
81 #include <mailutils/stream.h> 81 #include <mailutils/stream.h>
82 #include <mailutils/url.h> 82 #include <mailutils/url.h>
83 #include <mailutils/mu_auth.h> 83 #include <mailutils/mu_auth.h>
84 #include <mailutils/libsieve.h> 84 #include <mailutils/sieve.h>
85 #include <mailutils/nls.h> 85 #include <mailutils/nls.h>
86 86
87 #include <mu_dbm.h> 87 #include <mu_dbm.h>
......
...@@ -145,8 +145,8 @@ dbm_retrieve_quota (char *name, mu_off_t *quota) ...@@ -145,8 +145,8 @@ dbm_retrieve_quota (char *name, mu_off_t *quota)
145 #ifdef USE_SQL 145 #ifdef USE_SQL
146 #include <mailutils/sql.h> 146 #include <mailutils/sql.h>
147 147
148 /* FIXME: defined in auth/sql.c */ 148 /* FIXME: defined in libmu_auth/sql.c */
149 #include <auth/sql.h> 149 #include <libmu_auth/sql.h>
150 150
151 int 151 int
152 sql_retrieve_quota (char *name, mu_off_t *quota) 152 sql_retrieve_quota (char *name, mu_off_t *quota)
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 34
35 #include <mu_asprintf.h> 35 #include <mu_asprintf.h>
36 #include <mailutils/argcv.h> 36 #include <mailutils/argcv.h>
37 #include <mailutils/libsieve.h> 37 #include <mailutils/sieve.h>
38 #include <mailutils/auth.h> 38 #include <mailutils/auth.h>
39 #include <mailutils/errno.h> 39 #include <mailutils/errno.h>
40 #include <mailutils/folder.h> 40 #include <mailutils/folder.h>
......