--- code/trunk/configure.ac	2007/03/07 09:43:22	106
+++ code/trunk/configure.ac	2007/03/12 15:19:06	123
@@ -9,7 +9,7 @@
 m4_define(pcre_major, [7])
 m4_define(pcre_minor, [1])
 m4_define(pcre_prerelease, [-RC1])
-m4_define(pcre_date, [2007-03-05])
+m4_define(pcre_date, [2007-03-12])
 
 # Libtool shared library interface versions (current:revision:age)
 m4_define(libpcre_version, [0:1:0])
@@ -172,12 +172,14 @@
 Standard C, but there are a few non-standard things it can cope with, allowing
 it to run on SunOS4 and other "close to standard" systems.
 
-On a system without "configure" you should use the distributed config.h, and
-set up the macros the way you need them.
-
-If your system has bcopy() and not memmove(), change the definitions of
-HAVE_BCOPY and HAVE_MEMMOVE. If your system has neither bcopy() nor memmove(),
-leave them both undefined; an emulation function will be used. */])
+If you are going to build PCRE "by hand" on a system without "configure" you
+should copy the distributed config.h.generic to config.h, and then set up the
+macros the way you need them. Alternatively, you can avoid editing by using -D
+on the compiler command line to set the macro values.
+
+PCRE uses memmove() if HAVE_MEMMOVE is set to 1; otherwise it uses bcopy() if
+HAVE_BCOPY is set to 1. If your system has neither bcopy() nor memmove(), set
+them both to 0; an emulation function will be used. */])
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -260,9 +262,9 @@
 fi
 
 AC_DEFINE_UNQUOTED([NEWLINE], [$ac_pcre_newline_value], [
-  The value of NEWLINE determines the newline character sequence. On 
+  The value of NEWLINE determines the newline character sequence. On
   Unix-like systems, "configure" can be used to override the default,
-  which is 10. The possible values are 10 (LF), 13 (CR), 3338 (CRLF), 
+  which is 10. The possible values are 10 (LF), 13 (CR), 3338 (CRLF),
   or -1 (ANY).])
 
 AC_DEFINE_UNQUOTED([LINK_SIZE], [$with_link_size], [
@@ -302,8 +304,8 @@
   NO_RECURSE is defined) that is used. The value of
   MATCH_LIMIT_RECURSION applies only to recursive calls of match(). To
   have any useful effect, it must be less than the value of
-  MATCH_LIMIT. The default is to use the same value as MATCH_LIMIT. 
-  There is a runtime method for setting a different limit. On systems 
+  MATCH_LIMIT. The default is to use the same value as MATCH_LIMIT.
+  There is a runtime method for setting a different limit. On systems
   that support it, "configure" can be used to override the default.])
 
 AC_DEFINE([MAX_NAME_SIZE], [32], [
@@ -340,13 +342,6 @@
     "configure", this can be done via --enable-ebcdic.])
 fi
 
-# Here is where pcre specific substs are handled
-# These 3 are only used by RunTest.in.
-# TODO: remove once RunTest uses pcretest -C instead.
-AC_SUBST(LINK_SIZE, $with_link_size)
-AC_SUBST(UTF8, $enable_utf8)
-AC_SUBST(UCP, $enable_unicode_properties)
-
 # Platform specific issues
 NO_UNDEFINED=
 EXPORT_ALL_SYMBOLS=