*** OS/Makefile-Base.ORIG	Fri Mar 28 09:02:24 2008
--- OS/Makefile-Base	Fri Mar 28 09:04:54 2008
***************
*** 96,102 ****
  # therefore always be run, even if the files exist. This shouldn't in fact be a
  # problem, but it does no harm. Other make programs will just ignore this.
  
! .PHONY: all allexim buildauths buildlookups buildpcre buildrouters \
          buildtransports checklocalmake clean
  
  
--- 96,102 ----
  # therefore always be run, even if the files exist. This shouldn't in fact be a
  # problem, but it does no harm. Other make programs will just ignore this.
  
! .PHONY: all allexim buildauths buildlookups buildrouters \
          buildtransports checklocalmake clean
  
  
***************
*** 103,109 ****
  # This is the real default target for all the various exim binaries and
  # scripts, once the configuring stuff is done.
  
! allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \
          exigrep eximstats exipick exiqgrep exiqsumm \
          transport-filter.pl convert4r3 convert4r4 \
          exim_checkaccess \
--- 103,109 ----
  # This is the real default target for all the various exim binaries and
  # scripts, once the configuring stuff is done.
  
! allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
          exigrep eximstats exipick exiqgrep exiqsumm \
          transport-filter.pl convert4r3 convert4r4 \
          exim_checkaccess \
***************
*** 314,320 ****
          local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
          $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
  
! exim:   pcre/libpcre.a lookups/lookups.a auths/auths.a \
          routers/routers.a transports/transports.a \
          $(OBJ_EXIM) version.c
  	@echo " "
--- 314,320 ----
          local_scan.o $(EXIM_PERL) $(OBJ_WITH_CONTENT_SCAN) \
          $(OBJ_WITH_OLD_DEMIME) $(OBJ_EXPERIMENTAL)
  
! exim:   lookups/lookups.a auths/auths.a \
          routers/routers.a transports/transports.a \
          $(OBJ_EXIM) version.c
  	@echo " "
***************
*** 325,331 ****
  	rm -f exim
  	@echo "$(LNCC) -o exim"
  	$(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
! 	  pcre/libpcre.a \
  	  routers/routers.a transports/transports.a lookups/lookups.a \
  	  auths/auths.a \
  	  $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
--- 325,331 ----
  	rm -f exim
  	@echo "$(LNCC) -o exim"
  	$(FE)$(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
! 	  -lpcre \
  	  routers/routers.a transports/transports.a lookups/lookups.a \
  	  auths/auths.a \
  	  $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
***************
*** 429,435 ****
  
  OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tod.o tree.o $(MONBIN)
  
! eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \
              ../exim_monitor/em_version.c
  	@echo "$(CC) exim_monitor/em_version.c"
  	$(FE)$(CC) -o em_version.o -c \
--- 429,435 ----
  
  OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tod.o tree.o $(MONBIN)
  
! eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
              ../exim_monitor/em_version.c
  	@echo "$(CC) exim_monitor/em_version.c"
  	$(FE)$(CC) -o em_version.o -c \
***************
*** 436,442 ****
  	  $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
  	@echo "$(LNCC) -o eximon.bin"
  	$(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
! 	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
  	  $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
  	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
  	  echo $(STRIP_COMMAND) eximon.bin; \
--- 436,442 ----
  	  $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
  	@echo "$(LNCC) -o eximon.bin"
  	$(FE)$(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
! 	$(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \
  	  $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
  	@if [ x"$(STRIP_COMMAND)" != x"" ]; then \
  	  echo $(STRIP_COMMAND) eximon.bin; \
*** src/exim.h.ORIG	Fri Mar 28 09:06:07 2008
--- src/exim.h	Fri Mar 28 09:06:36 2008
***************
*** 422,428 ****
  
  /* The header from the PCRE regex package */
  
! #include "pcre/pcre.h"
  
  /* Exim includes are in several files. Note that local_scan.h #includes
  config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.
--- 422,428 ----
  
  /* The header from the PCRE regex package */
  
! #include <pcre.h>
  
  /* Exim includes are in several files. Note that local_scan.h #includes
  config.h, mytypes.h, and store.h, so we don't need to mention them explicitly.
*** exim_monitor/em_hdr.h.ORIG	Fri Mar 28 09:07:05 2008
--- exim_monitor/em_hdr.h	Fri Mar 28 09:07:22 2008
***************
*** 87,93 ****
  
  /* Regular expression include */
  
! #include "pcre/pcre.h"
  
  /* Includes from the main source of Exim. We need to have MAXPACKET defined for
  the benefit of structs.h. One of these days I should tidy up this interface so
--- 87,93 ----
  
  /* Regular expression include */
  
! #include <pcre.h>
  
  /* Includes from the main source of Exim. We need to have MAXPACKET defined for
  the benefit of structs.h. One of these days I should tidy up this interface so