Revision: 947
http://www.exim.org/viewvc/pcre2?view=rev&revision=947
Author: ph10
Date: 2018-06-22 16:04:01 +0100 (Fri, 22 Jun 2018)
Log Message:
-----------
Remove previous patch, as it did not take account of read-only source
directories.
Modified Paths:
--------------
code/trunk/CMakeLists.txt
code/trunk/ChangeLog
code/trunk/configure.ac
Modified: code/trunk/CMakeLists.txt
===================================================================
--- code/trunk/CMakeLists.txt 2018-06-22 14:58:09 UTC (rev 946)
+++ code/trunk/CMakeLists.txt 2018-06-22 15:04:01 UTC (rev 947)
@@ -81,7 +81,6 @@
# 2017-04-08 PH added HEAP_LIMIT
# 2017-06-15 ZH added SUPPORT_JIT_SEALLOC support
# 2018-06-19 PH added checks for stdint.h and inttypes.h
-# 2018-06-21 PH added deletion of src/pcre2.h and src/config.h
PROJECT(PCRE2 C)
@@ -131,12 +130,6 @@
CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
-# Clear out any previously created config.h and pcre2.h in the source
-# directory so that if we are compiling in a separate build directory there
-# is no confusion.
-
-FILE(REMOVE ${CMAKE_SOURCE_DIR}/src/config.h ${CMAKE_SOURCE_DIR}/src/pcre2.h)
-
# User-configurable options
#
# Note: CMakeSetup displays these in alphabetical order, regardless of
Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog 2018-06-22 14:58:09 UTC (rev 946)
+++ code/trunk/ChangeLog 2018-06-22 15:04:01 UTC (rev 947)
@@ -86,11 +86,7 @@
these now, if using MSVC or a standard C before C99, %lu is used with a
cast if necessary.
-19. Arrange for "configure" and CMake to delete pcre2.h and config.h from the
-source directory src so that there is no confusion when building in a different
-directory if these files happen to be present.
-
Version 10.31 12-February-2018
------------------------------
Modified: code/trunk/configure.ac
===================================================================
--- code/trunk/configure.ac 2018-06-22 14:58:09 UTC (rev 946)
+++ code/trunk/configure.ac 2018-06-22 15:04:01 UTC (rev 947)
@@ -32,12 +32,6 @@
# This was added at the suggestion of libtoolize (03-Jan-10)
AC_CONFIG_MACRO_DIR([m4])
-# Clear out any previously created config.h and pcre2.h in the source
-# directory so that if we are compiling in a separate build directory there
-# is no confusion.
-
-rm -f $srcdir/src/config.h $srcdir/src/pcre2.h
-
# The default CFLAGS in Autoconf are "-g -O2" for gcc and just "-g" for any
# other compiler. There doesn't seem to be a standard way of getting rid of the
# -g (which I don't think is needed for a production library). This fudge seems
