exim-use_system_pcre.patch

   1 diff -urN exim-3.15.orig/OS/Makefile-Base exim-3.15/OS/Makefile-Base
   2 --- exim-3.15.orig/OS/Makefile-Base     Wed Jun 14 09:57:38 2000
   3 +++ exim-3.15/OS/Makefile-Base  Sat Jul 22 12:35:24 2000
   4 @@ -79,7 +79,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          ../util/exigrep ../util/eximstats ../util/exiqsumm \
  11          ../util/transport-filter.pl ../util/convert4r3 \
  12          exim_dbmbuild exim_dumpdb exim_fixdb exim_tidydb exim_lock \
  13 @@ -203,7 +203,7 @@
  14          route.o search.o smtp_in.o smtp_out.o spool_in.o spool_out.o \
  15          store.o string.o tod.o transport.o tree.o verify.o $(EXIM_PERL)
  16
  17 -exim:   libident/libident.a pcre/libpcre.a lookups/lookups.a auths/auths.a \
  18 +exim:   libident/libident.a lookups/lookups.a auths/auths.a \
  19          directors/directors.a routers/routers.a transports/transports.a \
  20          $(OBJ_EXIM) version.c
  21         awk '{ print ($$1+1) }' cnumber.h > cnumber.temp
  22 @@ -211,7 +211,7 @@
  23         $(CC) -c $(CFLAGS) $(INCLUDE) $(IPV6_INCLUDE) version.c
  24         /bin/rm -f exim
  25         $(PURIFY) $(CC) -o exim $(LFLAGS) $(OBJ_EXIM) version.o \
  26 -         libident/libident.a pcre/libpcre.a directors/directors.a \
  27 +         libident/libident.a -lpcre directors/directors.a \
  28           routers/routers.a transports/transports.a lookups/lookups.a \
  29           auths/auths.a \
  30           $(LIBS) $(IPV6_LIBS) $(EXTRALIBS) $(DBMLIB) $(LIBRESOLV) \
  31 @@ -283,12 +283,12 @@
  32
  33  OBJ_MONBIN = dummies.o os.o spool_in.o store.o 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) $(CC) -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         @echo " "
  45         @echo ">>> exim monitor binary built"