exim4-use_system_pcre.patch

   1 diff -urN exim-3.952.orig/OS/Makefile-Base exim-3.952/OS/Makefile-Base
   2 --- exim-3.952.orig/OS/Makefile-Base    Tue Dec 18 13:04:43 2001
   3 +++ exim-3.952/OS/Makefile-Base Tue Jan 15 16:23:40 2002
   4 @@ -94,7 +94,7 @@
   5  # This is the real default target for all the various exim binaries and
   6  # scripts, once the configuring stuff is done.
   7
   8 -allexim: config.h buildpcre $(EXIM_MONITOR) exicyclog exinext exiwhat \
   9 +allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \
  10          exigrep eximstats exiqgrep exiqsumm \
  11          transport-filter.pl convert4r3 convert4r4 \
  12          exim_checkaccess \
  13 @@ -235,7 +235,7 @@
  14          store.o string.o tls.o tod.o transport.o tree.o verify.o \
  15          local_scan.o $(EXIM_PERL)
  16
  17 -exim:   pcre/libpcre.a lookups/lookups.a auths/auths.a \
  18 +exim:   lookups/lookups.a auths/auths.a \
  19          routers/routers.a transports/transports.a \
  20          $(OBJ_EXIM) version.c
  21         @echo " "
  22 @@ -244,7 +244,7 @@
  23         $(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) $(TLS_INCLUDE) version.c
  24         /bin/rm -f exim
  25         $(PURIFY) $(LNCC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
  26 -         pcre/libpcre.a \
  27 +         -lpcre \
  28           routers/routers.a transports/transports.a lookups/lookups.a \
  29           auths/auths.a \
  30           $(LIBRESOLV) $(LIBS) $(LIBS_EXIM) $(IPV6_LIBS) $(EXTRALIBS) \
  31 @@ -347,12 +347,12 @@
  32
  33  OBJ_MONBIN = util-spool_in.o util-store.o util-string.o tree.o $(MONBIN)
  34
  35 -eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) pcre/libpcre.a \
  36 +eximon.bin: $(EXIMON_EDITME) eximon $(OBJ_MONBIN) \
  37              ../exim_monitor/em_version.c
  38         $(CC) -o em_version.o -c \
  39           $(CFLAGS) $(XINCLUDE) -I. ../exim_monitor/em_version.c
  40         $(PURIFY) $(LNCC) -o eximon.bin em_version.o $(LFLAGS) $(XLFLAGS) \
  41 -       $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 pcre/libpcre.a \
  42 +       $(OBJ_MONBIN) -lXaw -lXmu -lXt -lXext -lX11 -lpcre \
  43           $(LIBS) $(LIBS_EXIMON) $(EXTRALIBS) $(EXTRALIBS_EXIMON) -lc
  44         @if [ x"$(STRIP_COMMAND)" != x"" ]; then \
  45           echo $(STRIP_COMMAND) eximon.bin; \