walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Both make systems now delete src/{pcre2.h,config.h} before starting. The 

existence of these files can confuse if building is happening in another 
directory.
This commit is contained in:
Philip.Hazel 2018-06-21 16:13:15 +00:00
parent c46434dd62
commit c5c9d9bacd
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -81,6 +81,7 @@
# 2017-04-08 PH added HEAP_LIMIT # 2017-04-08 PH added HEAP_LIMIT
# 2017-06-15 ZH added SUPPORT_JIT_SEALLOC support # 2017-06-15 ZH added SUPPORT_JIT_SEALLOC support
# 2018-06-19 PH added checks for stdint.h and inttypes.h # 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) PROJECT(PCRE2 C)
@ -130,6 +131,12 @@ CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY)
CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) 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 # User-configurable options
# #
# Note: CMakeSetup displays these in alphabetical order, regardless of # Note: CMakeSetup displays these in alphabetical order, regardless of

4
ChangeLog
View File

@ -86,6 +86,10 @@ standard systems:
these now, if using MSVC or a standard C before C99, %lu is used with a these now, if using MSVC or a standard C before C99, %lu is used with a
cast if necessary. 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 Version 10.31 12-February-2018
------------------------------ ------------------------------

6
configure.ac
View File

@ -32,6 +32,12 @@ AC_CONFIG_HEADERS(src/config.h)
# This was added at the suggestion of libtoolize (03-Jan-10) # This was added at the suggestion of libtoolize (03-Jan-10)
AC_CONFIG_MACRO_DIR([m4]) 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 # 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 # 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 # -g (which I don't think is needed for a production library). This fudge seems