Hello, Attached is a patch that allows the autoconf system and the original Makefiles to coexist easier.
Hardcoded path's have been removed fromt he mysql/*.c and pgsql/*.c files and a Makefile directive has been included in Makefile.mysql and Makefile.pgsql that defines the path. The autoconf system automatically generates the appropriate Makefiles with the paths. This means if you're using the old build system, rather than edit the path in the *.c files, just change DBINCLUDE_PATH to the correct value and then compile. No feature changes, so should be acceptable for 1.0 In addition all my pending patches can be found at: http://dbmail.adiis.net -- Ryan Butler <[EMAIL PROTECTED]> ADI Internet Solutions
diff -ur dbmail/INSTALL dbmail.working/INSTALL --- dbmail/INSTALL Sat Oct 12 17:37:30 2002 +++ dbmail.working/INSTALL Thu Nov 7 11:34:20 2002 @@ -39,7 +39,7 @@ with a user and password that can access the DBMAIL database. Do a find or a locate for mysql.h. Copy this path and set it in the - dbmysql.h in the #include "full path to mysql.h" + Makefile under the DBINCLUDE_PATH directive. If you want verbose debugging you can set the TRACE_LEVEL to 4 or 5. For normal messages the TRACE_LEVEL should be 2. If you experience any problems diff -ur dbmail/Makefile.mysql dbmail.working/Makefile.mysql --- dbmail/Makefile.mysql Sat Jun 1 08:29:47 2002 +++ dbmail.working/Makefile.mysql Thu Nov 7 11:31:49 2002 @@ -6,6 +6,8 @@ DBASETYPE = mysql DBASE_AUTHTYPE = mysql +DBINCLUDE_PATH = /usr/include/mysql + AUTHOBJECT = $(DBASETYPE)/dbauth$(DBASE_AUTHTYPE).o MSGBUFOBJECT = $(DBASETYPE)/dbmsgbuf$(DBASETYPE).o SEARCHOBJECT = $(DBASETYPE)/dbsearch$(DBASETYPE).o @@ -36,7 +38,7 @@ # from compiler about vsyslog function # Added the -D_SVID_SOURCE option because ipc.h asked me to. -CFLAGS = -Wall -O2 -D_BSD_SOURCE -D_SVID_SOURCE +CFLAGS = -Wall -O2 -D_BSD_SOURCE -D_SVID_SOURCE -I $(DBINCLUDE_PATH) .PHONY: clean install diff -ur dbmail/Makefile.pgsql dbmail.working/Makefile.pgsql --- dbmail/Makefile.pgsql Thu May 30 12:15:38 2002 +++ dbmail.working/Makefile.pgsql Thu Nov 7 11:40:02 2002 @@ -6,6 +6,8 @@ DBASETYPE = pgsql DBASE_AUTHTYPE = pgsql +DBINCLUDE_PATH = /Library/PostgreSQL/include + AUTHOBJECT = $(DBASETYPE)/dbauth$(DBASE_AUTHTYPE).o MSGBUFOBJECT = $(DBASETYPE)/dbmsgbuf$(DBASETYPE).o SEARCHOBJECT = $(DBASETYPE)/dbsearch$(DBASETYPE).o @@ -37,7 +39,7 @@ # from compiler about vsyslog function # Added the -D_SVID_SOURCE option because ipc.h asked me to. -CFLAGS = -Wall -O2 -D_BSD_SOURCE -D_SVID_SOURCE +CFLAGS = -Wall -O2 -D_BSD_SOURCE -D_SVID_SOURCE -I $(DBINCLUDE_PATH) .PHONY: clean install diff -ur dbmail/mysql/dbauthmysql.c dbmail.working/mysql/dbauthmysql.c --- dbmail/mysql/dbauthmysql.c Tue Jun 4 11:04:53 2002 +++ dbmail.working/mysql/dbauthmysql.c Thu Nov 7 11:32:21 2002 @@ -6,7 +6,7 @@ */ #include "../auth.h" -#include "/usr/include/mysql/mysql.h" +#include <mysql.h> #include "../list.h" #include "../debug.h" #include <stdlib.h> diff -ur dbmail/mysql/dbmsgbufmysql.c dbmail.working/mysql/dbmsgbufmysql.c --- dbmail/mysql/dbmsgbufmysql.c Mon Mar 25 10:17:21 2002 +++ dbmail.working/mysql/dbmsgbufmysql.c Thu Nov 7 11:32:36 2002 @@ -7,7 +7,7 @@ #include "../dbmsgbuf.h" #include "../db.h" -#include "/usr/include/mysql/mysql.h" +#include <mysql.h> #include <stdlib.h> #include <string.h> #include <stdio.h> diff -ur dbmail/mysql/dbmysql.c dbmail.working/mysql/dbmysql.c --- dbmail/mysql/dbmysql.c Thu Nov 7 09:34:32 2002 +++ dbmail.working/mysql/dbmysql.c Thu Nov 7 11:32:57 2002 @@ -5,7 +5,7 @@ * Functions for connecting and talking to the Mysql database */ #include "../db.h" -#include "/usr/include/mysql/mysql.h" +#include <mysql.h> #include "../config.h" #include "../pop3.h" #include "../list.h" diff -ur dbmail/mysql/dbsearchmysql.c dbmail.working/mysql/dbsearchmysql.c --- dbmail/mysql/dbsearchmysql.c Mon Mar 25 10:17:21 2002 +++ dbmail.working/mysql/dbsearchmysql.c Thu Nov 7 11:33:48 2002 @@ -6,7 +6,7 @@ #include "../dbsearch.h" #include "../db.h" -#include "/usr/include/mysql/mysql.h" +#include <mysql.h> #include "../rfcmsg.h" #include <stdlib.h> #include <stdio.h> diff -ur dbmail/pgsql/dbauthpgsql.c dbmail.working/pgsql/dbauthpgsql.c --- dbmail/pgsql/dbauthpgsql.c Thu Nov 7 09:34:32 2002 +++ dbmail.working/pgsql/dbauthpgsql.c Thu Nov 7 11:36:55 2002 @@ -7,9 +7,7 @@ */ #include "../auth.h" -/*#include "/usr/local/pgsql/include/libpq-fe.h"*/ -/*#include "/usr/include/postgresql/libpq-fe.h"*/ -#include "/Library/PostgreSQL/include/libpq-fe.h" +#include <libpq-fe.h> #include "../list.h" #include "../debug.h" diff -ur dbmail/pgsql/dbmsgbufpgsql.c dbmail.working/pgsql/dbmsgbufpgsql.c --- dbmail/pgsql/dbmsgbufpgsql.c Thu Nov 7 09:34:32 2002 +++ dbmail.working/pgsql/dbmsgbufpgsql.c Thu Nov 7 11:37:04 2002 @@ -9,9 +9,7 @@ #include "../dbmsgbuf.h" #include "../db.h" -/*#include "/usr/local/pgsql/include/libpq-fe.h"*/ -/*#include "/usr/include/postgresql/libpq-fe.h"*/ -#include "/Library/PostgreSQL/include/libpq-fe.h" +#include <libpq-fe.h> #include <stdlib.h> #include <string.h> diff -ur dbmail/pgsql/dbpgsql.c dbmail.working/pgsql/dbpgsql.c --- dbmail/pgsql/dbpgsql.c Thu Nov 7 09:34:32 2002 +++ dbmail.working/pgsql/dbpgsql.c Thu Nov 7 11:36:46 2002 @@ -5,9 +5,7 @@ * Functions for connecting and talking to the PostgreSQL database */ #include "../db.h" -/*#include "/usr/local/pgsql/include/libpq-fe.h"*/ -/*#include "/usr/include/postgresql/libpq-fe.h"*/ -#include "/Library/PostgreSQL/include/libpq-fe.h" +#include <libpq-fe.h> #include "../config.h" #include "../pop3.h" #include "../list.h" diff -ur dbmail/pgsql/dbsearchpgsql.c dbmail.working/pgsql/dbsearchpgsql.c --- dbmail/pgsql/dbsearchpgsql.c Thu Nov 7 09:34:32 2002 +++ dbmail.working/pgsql/dbsearchpgsql.c Thu Nov 7 11:37:25 2002 @@ -7,9 +7,7 @@ #include "../dbsearch.h" #include "../db.h" -/*#include "/usr/local/pgsql/include/libpq-fe.h"*/ -/*#include "/usr/include/postgresql/libpq-fe.h"*/ -#include "/Library/PostgreSQL/include/libpq-fe.h" +#include <libpq-fe.h> #include "../rfcmsg.h" #include <stdlib.h>
