diff options
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/OS/Makefile-GNU | 14 | ||||
| -rw-r--r-- | src/OS/Makefile-GNUkFreeBSD | 30 | ||||
| -rw-r--r-- | src/OS/Makefile-GNUkNetBSD | 30 | ||||
| -rw-r--r-- | src/OS/os.h-GNU | 11 | ||||
| -rw-r--r-- | src/OS/os.h-GNUkFreeBSD | 24 | ||||
| -rw-r--r-- | src/OS/os.h-GNUkNetBSD | 24 |
7 files changed, 128 insertions, 10 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index ba8b15bfb..6796a00b5 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.59 2004/12/29 10:55:58 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.60 2005/01/04 10:25:58 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -272,6 +272,9 @@ Exim version 4.50 (which came originally from the Samba project). I have added a test to the spa_base64_to_bits() function which I hope fixes it. +62. Configuration update for GNU/Hurd and variations. Updated Makefile-GNU and + os.h-GNU, and added configuration files for GNUkFreeBSD and GNUkNetBSD. + Exim version 4.43 ----------------- diff --git a/src/OS/Makefile-GNU b/src/OS/Makefile-GNU index d52fb22c9..9ec916441 100644 --- a/src/OS/Makefile-GNU +++ b/src/OS/Makefile-GNU @@ -1,8 +1,14 @@ -# $Cambridge: exim/src/OS/Makefile-GNU,v 1.1 2004/10/06 15:07:39 ph10 Exp $ +# $Cambridge: exim/src/OS/Makefile-GNU,v 1.2 2005/01/04 10:25:58 ph10 Exp $ -# Exim: OS-specific make file for GNU/Hurd. +# Exim: OS-specific make file for GNU and variants. + +HAVE_ICONV=yes BASENAME_COMMAND=look_for_it +CHOWN_COMMAND=look_for_it +CHGRP_COMMAND=look_for_it + +CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE DBMLIB = -ldb USE_DB = yes @@ -10,8 +16,6 @@ USE_DB = yes LIBS = -lnsl -lcrypt LIBRESOLV = -lresolv -CFLAGS = -O2 -g -Wall - X11=/usr/X11R6 XINCLUDE=-I$(X11)/include XLFLAGS=-L$(X11)/lib @@ -19,6 +23,8 @@ X11_LD_LIB=$(X11)/lib EXIWHAT_PS_ARG=ax EXIWHAT_EGREP_ARG='/exim( |$$)' +EXIWHAT_MULTIKILL_CMD=killall +EXIWHAT_MULTIKILL_ARG=exim4 EXIWHAT_KILL_SIGNAL=-USR1 # End diff --git a/src/OS/Makefile-GNUkFreeBSD b/src/OS/Makefile-GNUkFreeBSD new file mode 100644 index 000000000..03a8ac9e8 --- /dev/null +++ b/src/OS/Makefile-GNUkFreeBSD @@ -0,0 +1,30 @@ +# $Cambridge: exim/src/OS/Makefile-GNUkFreeBSD,v 1.1 2005/01/04 10:25:58 ph10 Exp $ + +# Exim: OS-specific make file for GNU and variants. + +HAVE_ICONV=yes + +BASENAME_COMMAND=look_for_it +CHOWN_COMMAND=look_for_it +CHGRP_COMMAND=look_for_it + +CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + +DBMLIB = -ldb +USE_DB = yes + +LIBS = -lnsl -lcrypt +LIBRESOLV = -lresolv + +X11=/usr/X11R6 +XINCLUDE=-I$(X11)/include +XLFLAGS=-L$(X11)/lib +X11_LD_LIB=$(X11)/lib + +EXIWHAT_PS_ARG=ax +EXIWHAT_EGREP_ARG='/exim( |$$)' +EXIWHAT_MULTIKILL_CMD=killall +EXIWHAT_MULTIKILL_ARG=exim4 +EXIWHAT_KILL_SIGNAL=-USR1 + +# End diff --git a/src/OS/Makefile-GNUkNetBSD b/src/OS/Makefile-GNUkNetBSD new file mode 100644 index 000000000..05f4f56aa --- /dev/null +++ b/src/OS/Makefile-GNUkNetBSD @@ -0,0 +1,30 @@ +# $Cambridge: exim/src/OS/Makefile-GNUkNetBSD,v 1.1 2005/01/04 10:25:58 ph10 Exp $ + +# Exim: OS-specific make file for GNU and variants. + +HAVE_ICONV=yes + +BASENAME_COMMAND=look_for_it +CHOWN_COMMAND=look_for_it +CHGRP_COMMAND=look_for_it + +CFLAGS ?= -O -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE + +DBMLIB = -ldb +USE_DB = yes + +LIBS = -lnsl -lcrypt +LIBRESOLV = -lresolv + +X11=/usr/X11R6 +XINCLUDE=-I$(X11)/include +XLFLAGS=-L$(X11)/lib +X11_LD_LIB=$(X11)/lib + +EXIWHAT_PS_ARG=ax +EXIWHAT_EGREP_ARG='/exim( |$$)' +EXIWHAT_MULTIKILL_CMD=killall +EXIWHAT_MULTIKILL_ARG=exim4 +EXIWHAT_KILL_SIGNAL=-USR1 + +# End diff --git a/src/OS/os.h-GNU b/src/OS/os.h-GNU index 6d44d5a2d..48a53599a 100644 --- a/src/OS/os.h-GNU +++ b/src/OS/os.h-GNU @@ -1,15 +1,14 @@ -/* $Cambridge: exim/src/OS/os.h-GNU,v 1.1 2004/10/06 15:07:39 ph10 Exp $ */ +/* $Cambridge: exim/src/OS/os.h-GNU,v 1.2 2005/01/04 10:25:58 ph10 Exp $ */ /* Exim: OS-specific C header file for GNU/Hurd */ #define CRYPT_H +#define GLIBC_IP_OPTIONS #define HAVE_MMAP +#define HAVE_BSD_GETLOADAVG #define HAVE_SYS_VFS_H #define NO_IP_VAR_H -#define NO_NET_IF_H -#define NO_FIND_INTERFACES -#define SETRLIMIT_NOT_SUPPORTED -#define GLIBC_IP_OPTIONS +#define SIG_IGN_WORKS #define F_FREESP O_TRUNC typedef struct flock flock_t; @@ -17,4 +16,6 @@ typedef struct flock flock_t; #define os_strsignal strsignal #define OS_STRSIGNAL +/* Hurd-specific bits below */ + /* End */ diff --git a/src/OS/os.h-GNUkFreeBSD b/src/OS/os.h-GNUkFreeBSD new file mode 100644 index 000000000..ce05e2d4d --- /dev/null +++ b/src/OS/os.h-GNUkFreeBSD @@ -0,0 +1,24 @@ +/* $Cambridge: exim/src/OS/os.h-GNUkFreeBSD,v 1.1 2005/01/04 10:25:58 ph10 Exp $ */ + +/* Exim: OS-specific C header file for GNU/kFreeBSD */ + +#define CRYPT_H +#define GLIBC_IP_OPTIONS +#define HAVE_MMAP +#define HAVE_BSD_GETLOADAVG +#define HAVE_SYS_VFS_H +#define NO_IP_VAR_H +#define SIG_IGN_WORKS + +#define F_FREESP O_TRUNC +typedef struct flock flock_t; + +#define os_strsignal strsignal +#define OS_STRSIGNAL + +/* kFreeBSD-specific bits below */ + +#define HAVE_SYS_MOUNT_H +#define SIOCGIFCONF_GIVES_ADDR + +/* End */ diff --git a/src/OS/os.h-GNUkNetBSD b/src/OS/os.h-GNUkNetBSD new file mode 100644 index 000000000..faddca675 --- /dev/null +++ b/src/OS/os.h-GNUkNetBSD @@ -0,0 +1,24 @@ +/* $Cambridge: exim/src/OS/os.h-GNUkNetBSD,v 1.1 2005/01/04 10:25:58 ph10 Exp $ */ + +/* Exim: OS-specific C header file for GNU/kNetBSD */ + +#define CRYPT_H +#define GLIBC_IP_OPTIONS +#define HAVE_MMAP +#define HAVE_BSD_GETLOADAVG +#define HAVE_SYS_VFS_H +#define NO_IP_VAR_H +#define SIG_IGN_WORKS + +#define F_FREESP O_TRUNC +typedef struct flock flock_t; + +#define os_strsignal strsignal +#define OS_STRSIGNAL + +/* kNetBSD-specific bits below */ + +#define HAVE_SYS_MOUNT_H +#define SIOCGIFCONF_GIVES_ADDR + +/* End */ |