Please try again.

Geo Carncross wrote:
Then it was applied incorrectly, got missed, corrupted, what have you.

Attached is a patch against trunk/rev1623.


On Tue, 2005-03-01 at 09:12 +0100, Paul J Stevens wrote:

Applied in SVN. I've changed the autotools setup to build convenience libs for all except the sql backend code. Those backend libs are now all called libsqldbmail.so

The shared libs setup is a mess. It anticipates a modular plugin architecture, but doesn't provide any of the expected advantages. I recommend building the svn trunk with --enable-shared=no



Geo Carncross wrote:

I haven't seen this patch applied. It's necessary for modern automake.



------------------------------------------------------------------------

diff -u -r1.33 Makefile.am
--- Makefile.am 2005/02/18 09:02:33     1.33
+++ Makefile.am 2005/02/23 21:43:07
@@ -69,25 +69,25 @@
TESTS=check_dbmail_common check_dbmail_server check_dbmail_deliver 
check_dbmail_imapd check_dbmail_message
noinst_PROGRAMS=$(TESTS)

-check_dbmail_common_SOURCES=$(COMMON) check_dbmail_common.c
-check_dbmail_common_LDADD=$(dbmail_users_LDADD) @CHECK_LIBS@
+check_dbmail_common_SOURCES=check_dbmail_common.c
[EMAIL PROTECTED]@ libdbmail.la
[EMAIL PROTECTED]@

-check_dbmail_server_SOURCES=$(COMMON) $(SERVER) check_dbmail_server.c
-check_dbmail_server_LDADD=$(dbmail_users_LDADD) @CHECK_LIBS@
+check_dbmail_server_SOURCES=check_dbmail_server.c
[EMAIL PROTECTED]@ libdbmail.la
[EMAIL PROTECTED]@

-check_dbmail_deliver_SOURCES=$(COMMON) $(DELIVER) check_dbmail_deliver.c
-check_dbmail_deliver_LDADD=$(dbmail_users_LDADD) @CHECK_LIBS@
+check_dbmail_deliver_SOURCES=check_dbmail_deliver.c
[EMAIL PROTECTED]@ libdbmail.la
[EMAIL PROTECTED]@

-check_dbmail_message_SOURCES=$(COMMON) $(DELIVER) check_dbmail_message.c
-check_dbmail_message_LDADD=$(dbmail_users_LDADD) @CHECK_LIBS@
+check_dbmail_message_SOURCES=check_dbmail_message.c
[EMAIL PROTECTED]@ libdbmail.la
[EMAIL PROTECTED]@

-check_dbmail_imapd_SOURCES=$(COMMON) $(SERVER) quota.c imap4.c imaputil.c 
imapcommands.c memblock.c rfcmsg.c dbsearch.c dbmsgbuf.c acl.c 
dbmail-imapsession.c check_dbmail_imapd.c
-check_dbmail_imapd_LDADD=$(dbmail_imapd_LDADD) @CHECK_LIBS@
-check_dbmail_imapd_INCLUDES= @CHECK_CFLAGS@
+check_dbmail_imapd_SOURCES=quota.c imap4.c imaputil.c imapcommands.c 
memblock.c rfcmsg.c dbsearch.c dbmsgbuf.c acl.c dbmail-imapsession.c 
check_dbmail_imapd.c
[EMAIL PROTECTED]@ libdbmail.la
[EMAIL PROTECTED]@

endif



------------------------------------------------------------------------

_______________________________________________
Dbmail-dev mailing list
Dbmail-dev@dbmail.org
http://twister.fastxs.net/mailman/listinfo/dbmail-dev



------------------------------------------------------------------------

Index: Makefile.am
===================================================================
--- Makefile.am (revision 1623)
+++ Makefile.am (working copy)
@@ -36,6 +36,7 @@
 dbmail_smtp_SOURCES = main.c
 dbmail_smtp_LDADD = libdbmail.la
+
 dbmail_pop3d_SOURCES = pop3.c pop3d.c
 dbmail_pop3d_LDADD = libdbmail.la
@@ -68,25 +69,25 @@
 TESTS=check_dbmail_common check_dbmail_server check_dbmail_deliver 
check_dbmail_imapd check_dbmail_message
 noinst_PROGRAMS=$(TESTS)
-check_dbmail_common_SOURCES=$(COMMON) check_dbmail_common.c
+check_dbmail_common_SOURCES=check_dbmail_common.c
 [EMAIL PROTECTED]@ libdbmail.la
 [EMAIL PROTECTED]@
-check_dbmail_server_SOURCES=$(COMMON) $(SERVER) check_dbmail_server.c
+check_dbmail_server_SOURCES=check_dbmail_server.c
 [EMAIL PROTECTED]@ libdbmail.la
 [EMAIL PROTECTED]@
-check_dbmail_deliver_SOURCES=$(COMMON) $(DELIVER) check_dbmail_deliver.c
+check_dbmail_deliver_SOURCES=check_dbmail_deliver.c
 [EMAIL PROTECTED]@ libdbmail.la
 [EMAIL PROTECTED]@
-check_dbmail_message_SOURCES=$(COMMON) $(DELIVER) check_dbmail_message.c
+check_dbmail_message_SOURCES=check_dbmail_message.c
 [EMAIL PROTECTED]@ libdbmail.la
 [EMAIL PROTECTED]@
-check_dbmail_imapd_SOURCES=$(COMMON) $(SERVER) quota.c imap4.c imaputil.c imapcommands.c memblock.c rfcmsg.c dbsearch.c dbmsgbuf.c acl.c dbmail-imapsession.c check_dbmail_imapd.c
+check_dbmail_imapd_SOURCES=quota.c imap4.c imaputil.c imapcommands.c 
memblock.c rfcmsg.c dbsearch.c dbmsgbuf.c acl.c dbmail-imapsession.c 
check_dbmail_imapd.c
 [EMAIL PROTECTED]@ libdbmail.la
-check_dbmail_imapd_INCLUDES= @CHECK_CFLAGS@
[EMAIL PROTECTED]@
endif

------------------------------------------------------------------------

_______________________________________________
Dbmail-dev mailing list
Dbmail-dev@dbmail.org
http://twister.fastxs.net/mailman/listinfo/dbmail-dev


--
  ________________________________________________________________
  Paul Stevens                                  mailto:[EMAIL PROTECTED]
  NET FACILITIES GROUP                     PGP: finger [EMAIL PROTECTED]
  The Netherlands________________________________http://www.nfg.nl

Reply via email to