Tidy up config.h management (task from README) (#658)

This fortuitously fixes the 16/32-bit 'unity' build.

Also tidy up the ckd_smul macros, for the sake of the Unity build.

Author: NWilson

CMakeLists.txt

@@ -885,7 +885,6 @@ if(PCRE2_BUILD_PCRE2_16)
     set_target_properties(
       pcre2-16-static
       PROPERTIES
-        UNITY_BUILD OFF
         COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
         MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
         MACHO_CURRENT_VERSION "${LIBPCRE2_32_MACHO_CURRENT_VERSION}"
@@ -914,7 +913,6 @@ if(PCRE2_BUILD_PCRE2_16)
     set_target_properties(
       pcre2-16-shared
       PROPERTIES
-        UNITY_BUILD OFF
         COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=16
         MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
         MACHO_CURRENT_VERSION "${LIBPCRE2_32_MACHO_CURRENT_VERSION}"
@@ -955,7 +953,6 @@ if(PCRE2_BUILD_PCRE2_32)
     set_target_properties(
       pcre2-32-static
       PROPERTIES
-        UNITY_BUILD OFF
         COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
         MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
         MACHO_CURRENT_VERSION "${LIBPCRE2_32_MACHO_CURRENT_VERSION}"
@@ -984,7 +981,6 @@ if(PCRE2_BUILD_PCRE2_32)
     set_target_properties(
       pcre2-32-shared
       PROPERTIES
-        UNITY_BUILD OFF
         COMPILE_DEFINITIONS PCRE2_CODE_UNIT_WIDTH=32
         MACHO_COMPATIBILITY_VERSION "${LIBPCRE2_32_MACHO_COMPATIBILITY_VERSION}"
         MACHO_CURRENT_VERSION "${LIBPCRE2_32_MACHO_CURRENT_VERSION}"

Makefile.am

@@ -778,10 +778,7 @@ EXTRA_DIST += \
   testdata/testoutput6 \
   testdata/testoutput7 \
   testdata/testoutput8-16-2 \
-  testdata/testoutput8-16-3 \
   testdata/testoutput8-16-4 \
-  testdata/testoutput8-32-2 \
-  testdata/testoutput8-32-3 \
   testdata/testoutput8-32-4 \
   testdata/testoutput8-8-2 \
   testdata/testoutput8-8-3 \

RunTest

@@ -667,11 +667,17 @@ for bmode in "$test8" "$test16" "$test32"; do
 
   if [ $do8 = yes ] ; then
     echo $title8
+    bits_link_size=$link_size
+    if [ $bits = "16" -a $link_size = "3" ] ; then
+      bits_link_size=4
+    elif [ $bits = "32" ] ; then
+      bits_link_size=4
+    fi
     if [ $utf -eq 0 ] ; then
       echo "  Skipped because UTF-$bits support is not available"
     else
       $sim $valgrind $pcre2test -q $setstack $bmode $testdata/testinput8 testtry
-      checkresult $? 8-$bits-$link_size ""
+      checkresult $? 8-$bits-$bits_link_size ""
     fi
   fi
 

RunTest.bat

@@ -259,7 +259,10 @@ if [%3] == [] (
 )
 
 if %1 == 8 (
-  set outnum=%1-%bits%-%link_size%
+  set bits_link_size=%link_size%
+  if %bits% EQU 16 if %link_size% EQU 3 set bits_link_size=4
+  if %bits% EQU 32 set bits_link_size=4
+  set outnum=%1-%bits%-!bits_link_size!
 ) else if %1 == 11 (
   set outnum=%1-%bits%
 ) else if %1 == 12 (

maint/GenerateUcd.py

@@ -790,9 +790,6 @@ def write_bitsets(list, item_size):
 headers are needed. */
 
 #ifndef PCRE2_PCRE2TEST
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #include "pcre2_internal.h"
 #endif /* PCRE2_PCRE2TEST */
 

maint/README

@@ -396,9 +396,6 @@ years.
   perhaps be used as a way round this problem. However, note that Perl does not
   distinguish: like PCRE2, a name is just an alias for a number in Perl.
 
-. Instead of having #ifdef HAVE_CONFIG_H in each module, put #include
-  "something" and the the #ifdef appears only in one place, in "something".
-
 . Implement something like (?(R2+)... to check outer recursions.
 
 . If Perl ever supports the POSIX notation [[.something.]] PCRE2 should try

maint/manifest-tarball

@@ -444,10 +444,7 @@ drwxr-xr-x tarball-dir/pcre2-SNAPSHOT/testdata
 -rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput6
 -rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput7
 -rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput8-16-2
--rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput8-16-3
 -rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput8-16-4
--rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput8-32-2
--rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput8-32-3
 -rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput8-32-4
 -rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput8-8-2
 -rw-r--r-- tarball-dir/pcre2-SNAPSHOT/testdata/testoutput8-8-3

maint/pcre2_chartables.c.non-standard

@@ -1,7 +1,3 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
 #include "pcre2_internal.h"
 
 const uint8_t PRIV(default_tables)[] = {

maint/ucptest.c

@@ -82,11 +82,6 @@ characters, the list ends with ...
 The command "list" must be followed by one of property names script, bool,
 type, gbreak or bidi. The defined values for that property are listed. */
 
-
-#ifdef HAVE_CONFIG_H
-#include "../src/config.h"
-#endif
-
 #ifndef SUPPORT_UNICODE
 #error "Unicode support not enabled"
 #endif

src/pcre2_auto_possess.c

@@ -38,16 +38,14 @@ POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
 */
 
+
 /* This module contains functions that scan a compiled pattern and change
 repeats into possessive repeats where possible. */
 
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "pcre2_internal.h"
 
 
-#include "pcre2_internal.h"
 
 /* This macro represents the max size of list[] and that is used to keep
 track of UCD info in several places, it should be kept on sync with the