#
#
# patch "configure.ac"
#  from [9d42b22ad34940b5452e866a6b255e574b6e3dce]
#    to [a7a508ca8f53f63f6985ca3545bfae070f8270d1]
# 
# patch "pcre/Makefile.am"
#  from [f8ace4c2cda7a35f4f39816f43f81f2f4bdfd292]
#    to [5f5a65bf4da6e40045a00591848ec555294c8dfa]
# 
# patch "pcre/configure.ac"
#  from [9b9c1d6982cdc614cf0e547b72eb76e3eeecce30]
#    to [cc92c3aa02e3ee4d83a9f852f150a2f9335c8dff]
# 
# patch "pcre/pcre_chartables.c"
#  from [d9401a46b0d13b36b344c6a96580da7b5a8fb7b8]
#    to [7553e801092f8ac13a5d04b259b3ce6476788b93]
#
============================================================
--- configure.ac	9d42b22ad34940b5452e866a6b255e574b6e3dce
+++ configure.ac	a7a508ca8f53f63f6985ca3545bfae070f8270d1
@@ -43,7 +43,8 @@ AC_SUBST(subsrcdir)
 # It is much easier to create the build subdirectories in the same
 # breath as the top level Makefile than to deal with Make's bizarro
 # behavior when directories are goals.
-AC_CONFIG_FILES([Makefile],
-	        [mkdir -p $needed_dirs],
-		[needed_dirs="$LIBRARIES monotone"])
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_COMMANDS([build-dirs],
+	           [mkdir -p $needed_dirs],
+		   [needed_dirs="$LIBRARIES monotone"])
 AC_OUTPUT
============================================================
--- pcre/Makefile.am	f8ace4c2cda7a35f4f39816f43f81f2f4bdfd292
+++ pcre/Makefile.am	5f5a65bf4da6e40045a00591848ec555294c8dfa
@@ -29,7 +29,7 @@ bin_PROGRAMS = pcretest pcregrep
 noinst_SCRIPTS = RunTest RunGrepTest
 bin_PROGRAMS = pcretest pcregrep
 
-pcretest_SOURCES = pcretest.c
+pcretest_SOURCES = pcretest.c pcreposix.c pcreposix.h
 pcretest_LDADD = libpcre.a
 
 pcregrep_SOURCES = pcregrep.c
============================================================
--- pcre/configure.ac	9b9c1d6982cdc614cf0e547b72eb76e3eeecce30
+++ pcre/configure.ac	cc92c3aa02e3ee4d83a9f852f150a2f9335c8dff
@@ -203,8 +203,11 @@ them both to 0; an emulation function wi
 them both to 0; an emulation function will be used. */])
 
 # Checks for header files.
+dnl Explicitly specifying AC_INCLUDES_DEFAULT gets autoconf not to do
+dnl all the tests twice.  AC_HEADER_STDC gets us sys/types.h and
+dnl sys/stat.h for free.
 AC_HEADER_STDC
-AC_CHECK_HEADERS(limits.h sys/types.h sys/stat.h dirent.h windows.h)
+AC_CHECK_HEADERS([limits.h dirent.h windows.h],,, [AC_INCLUDES_DEFAULT()])
 
 # Checks for typedefs, structures, and compiler characteristics.
 
@@ -369,44 +372,3 @@ AC_OUTPUT
 AC_CONFIG_COMMANDS([script-chmod], [chmod a+x pcre-config])
 
 AC_OUTPUT
-
-# Print out a nice little message after configure is run displaying your
-# chosen options.
-
-cat <<EOF
-
-$PACKAGE-$VERSION configuration summary:
-
-    Install prefix .................. : ${prefix}
-    C preprocessor .................. : ${CPP}
-    C compiler ...................... : ${CC}
-    C++ preprocessor ................ : ${CXXCPP}
-    C++ compiler .................... : ${CXX}
-    Linker .......................... : ${LD}
-    C preprocessor flags ............ : ${CPPFLAGS}
-    C compiler flags ................ : ${CFLAGS}
-    C++ compiler flags .............. : ${CXXFLAGS}
-    Linker flags .................... : ${LDFLAGS}
-    Extra libraries ................. : ${LIBS}
-
-    Build C++ library ............... : ${enable_cpp}
-    Enable UTF-8 support ............ : ${enable_utf8}
-    Unicode properties .............. : ${enable_unicode_properties}
-    Newline char/sequence ........... : ${enable_newline}
-    \R matches only ANYCRLF ......... : ${enable_bsr_anycrlf}
-    EBCDIC coding ................... : ${enable_ebcdic}
-    Rebuild char tables ............. : ${enable_rebuild_chartables}
-    Use stack recursion ............. : ${enable_stack_for_recursion}
-    POSIX mem threshold ............. : ${with_posix_malloc_threshold}
-    Internal link size .............. : ${with_link_size}
-    Match limit ..................... : ${with_match_limit}
-    Match limit recursion ........... : ${with_match_limit_recursion}
-    Build shared libs ............... : ${enable_shared}
-    Build static libs ............... : ${enable_static}
-    Link pcregrep with libz ......... : ${enable_pcregrep_libz}
-    Link pcregrep with libbz2 ....... : ${enable_pcregrep_libbz2}
-    Link pcretest with libreadline .. : ${enable_pcretest_libreadline}
-
-EOF
-
-dnl end configure.ac
============================================================
--- pcre/pcre_chartables.c	d9401a46b0d13b36b344c6a96580da7b5a8fb7b8
+++ pcre/pcre_chartables.c	7553e801092f8ac13a5d04b259b3ce6476788b93
@@ -20,7 +20,9 @@ unit might reference this" and so it wil
 header ensures that the array gets flagged as "someone outside this compilation
 unit might reference this" and so it will always be supplied to the linker. */
 
-#include "pcre_config.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "pcre_internal.h"