ph10 2007/06/29 09:49:17 BST
Modified files:
exim-src/src version.c
exim-src/src/pcre Makefile pcre_internal.h
Log:
Fix pcre #include problem; add "-pre" to version.
Revision Changes Path
1.9 +16 -16 exim/exim-src/src/pcre/Makefile
1.6 +1 -1 exim/exim-src/src/pcre/pcre_internal.h
1.23 +1 -1 exim/exim-src/src/version.c
Index: version.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/version.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- version.c 19 Apr 2007 13:19:06 -0000 1.22
+++ version.c 29 Jun 2007 08:49:17 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/version.c,v 1.22 2007/04/19 13:19:06 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/version.c,v 1.23 2007/06/29 08:49:17 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -12,7 +12,7 @@
#include "exim.h"
-#define THIS_VERSION "4.68"
+#define THIS_VERSION "4.68-dev"
/* The header file cnumber.h contains a single line containing the
Index: Makefile
===================================================================
RCS file: /home/cvs/exim/exim-src/src/pcre/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile 26 Jun 2007 11:16:54 -0000 1.8
+++ Makefile 29 Jun 2007 08:49:17 -0000 1.9
@@ -1,4 +1,4 @@
-# $Cambridge: exim/exim-src/src/pcre/Makefile,v 1.8 2007/06/26 11:16:54 ph10 Exp $
+# $Cambridge: exim/exim-src/src/pcre/Makefile,v 1.9 2007/06/29 08:49:17 ph10 Exp $
# Makefile for PCRE (Perl-Compatible Regular Expression) library for use by
# Exim. This is a tailored Makefile, not the normal one that comes with the
@@ -8,7 +8,7 @@
AR = ar cq
CC = gcc -O2 -Wall
-CFLAGS = -I.
+CFLAGS =
RANLIB = @true
##############################################################################
@@ -21,7 +21,7 @@
../pcretest: libpcre.a pcretest.o
@echo "$(CC) -o ../pcretest pcretest.o libpcre.a"
- $(FE)$(CC) $(CFLAGS) -I. -o ../pcretest pcretest.o libpcre.a
+ $(FE)$(CC) $(CFLAGS) -o ../pcretest pcretest.o libpcre.a
libpcre.a: $(OBJ)
-rm -f libpcre.a
@@ -31,58 +31,58 @@
pcre_chartables.o: pcre_chartables.c pcre_compile.c config.h pcre.h pcre_internal.h Makefile
@echo "$(CC) pcre_chartables.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_chartables.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_chartables.c
pcre_compile.o: pcre_compile.c config.h pcre.h pcre_internal.h Makefile
@echo "$(CC) pcre_compile.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_compile.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_compile.c
pcre_config.o: pcre_config.c config.h pcre.h pcre_internal.h Makefile
@echo "$(CC) pcre_config.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_config.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_config.c
pcre_exec.o: pcre_chartables.c pcre_exec.c config.h pcre.h pcre_internal.h Makefile
@echo "$(CC) pcre_exec.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_exec.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_exec.c
pcre_maketables.o: pcre_maketables.c config.h pcre.h pcre_internal.h Makefile
- @echo "$(CC) pcre_maketables.c"
+ @echo "$(CC) pcre_maketables.c"
$(FE)$(CC) -c $(CFLAGS) pcre_maketables.c
pcre_fullinfo.o: pcre_fullinfo.c pcre.h config.h pcre_internal.h Makefile
@echo "$(CC) pcre_fullinfo.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_fullinfo.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_fullinfo.c
pcre_get.o: pcre_get.c pcre.h config.h pcre_internal.h Makefile
@echo "$(CC) pcre_get.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_get.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_get.c
pcre_globals.o: pcre_globals.c pcre.h config.h pcre_internal.h Makefile
@echo "$(CC) pcre_globals.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_globals.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_globals.c
pcre_newline.o: pcre_newline.c pcre.h config.h pcre_internal.h Makefile
@echo "$(CC) pcre_newline.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_newline.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_newline.c
pcre_study.o: pcre_study.c pcre.h config.h pcre_internal.h Makefile
@echo "$(CC) pcre_study.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_study.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_study.c
pcre_tables.o: pcre_tables.c pcre.h config.h pcre_internal.h Makefile
@echo "$(CC) pcre_tables.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_tables.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_tables.c
pcre_try_flipped.o: pcre_try_flipped.c pcre.h config.h pcre_internal.h Makefile
@echo "$(CC) pcre_try_flipped.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_try_flipped.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_try_flipped.c
pcre_version.o: pcre_version.c config.h pcre.h pcre_internal.h Makefile
@echo "$(CC) pcre_version.c"
- $(FE)$(CC) -c $(CFLAGS) -I. pcre_version.c
+ $(FE)$(CC) -c $(CFLAGS) pcre_version.c
pcretest.o: pcretest.c config.h pcre.h pcre_internal.h Makefile
@echo "$(CC) pcretest.c"
- $(FE)$(CC) -c -DNOPOSIX -DNODFA -DNOUTF8 -DNOINFOCHECK $(CFLAGS) -I. pcretest.c
+ $(FE)$(CC) -c -DNOPOSIX -DNODFA -DNOUTF8 -DNOINFOCHECK $(CFLAGS) pcretest.c
# End
Index: pcre_internal.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/pcre/pcre_internal.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pcre_internal.h 26 Jun 2007 11:16:54 -0000 1.5
+++ pcre_internal.h 29 Jun 2007 08:49:17 -0000 1.6
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/pcre/pcre_internal.h,v 1.5 2007/06/26 11:16:54 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/pcre/pcre_internal.h,v 1.6 2007/06/29 08:49:17 ph10 Exp $ */
/*************************************************
* Perl-Compatible Regular Expressions *
@@ -236,7 +236,7 @@
/* Include the public PCRE header and the definitions of UCP character property
values. */
-#include <pcre.h>
+#include "pcre.h"
#include "ucp.h"
/* When compiling for use with the Virtual Pascal compiler, these functions
