Stop doing s/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g in bundled PCRE sources

As we build PCRE outside of QtCore, there is no need to do that anymore.

Change-Id: Ib184966062f6afe7a449b860058e61e1ab2f7939
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

src/3rdparty/pcre/import_from_pcre_tarball.sh

@@ -35,8 +35,6 @@
 # This is a small script to copy the required files from a PCRE tarball
 # into 3rdparty/pcre/ , following the instructions found in the NON-UNIX-USE
 # file. Documentation, tests, demos etc. are not imported.
-# Also, a global s/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g is performed, to avoid
-# tampering QtCore compilation with a -DHAVE_CONFIG_H.
 
 if [ $# -ne 2 ]; then
     echo "Usage: $0 pcre_tarball_dir/ \$QTDIR/src/3rdparty/pcre/"
@@ -54,10 +52,9 @@ fi
 
 # with 1 argument, copies PCRE_DIR/$1 to TARGET_DIR/$1
 # with 2 arguments, copies PCRE_DIR/$1 to TARGET_DIR/$2
-# every file copied gets a s/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g
-copy_and_convert_file() {
+copy_file() {
     if [ $# -lt 1 -o $# -gt 2  ]; then
-        echo "Wrong number of arguments to copy_and_convert_file"
+        echo "Wrong number of arguments to copy_file"
         exit 3
     fi
 
@@ -69,11 +66,11 @@ copy_and_convert_file() {
     fi
 
     mkdir -p "$TARGET_DIR/$(dirname "$SOURCE_FILE")"
-    sed 's/HAVE_CONFIG_H/PCRE_HAVE_CONFIG_H/g' < "$PCRE_DIR/$SOURCE_FILE" > "$TARGET_DIR/$DEST_FILE"
+    cp "$PCRE_DIR/$SOURCE_FILE" "$TARGET_DIR/$DEST_FILE"
 }
 
-copy_and_convert_file "pcre.h.generic" "pcre.h"
-copy_and_convert_file "pcre_chartables.c.dist" "pcre_chartables.c"
+copy_file "pcre.h.generic" "pcre.h"
+copy_file "pcre_chartables.c.dist" "pcre_chartables.c"
 
 FILES="
     AUTHORS
@@ -148,5 +145,5 @@ FILES="
 "
 
 for i in $FILES; do
-    copy_and_convert_file "$i"
+    copy_file "$i"
 done

src/3rdparty/pcre/pcre.pro

@@ -7,7 +7,7 @@ CONFIG += \
 
 load(qt_helper_lib)
 
-DEFINES += PCRE_HAVE_CONFIG_H
+DEFINES += HAVE_CONFIG_H
 
 # platform/compiler specific definitions
 win32: DEFINES += PCRE_STATIC

src/3rdparty/pcre/pcre16_ord2utf16.c

@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This file contains a private PCRE function that converts an ordinal
 character value into a UTF16 string. */
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre16_utf16_utils.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 strings to host byte order. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre16_valid_utf16.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 strings. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_byte_order.c

@@ -43,7 +43,7 @@ see if it was compiled with the opposite endianness. If so, it uses an
 auxiliary local function to flip the appropriate bytes. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_chartables.c

@@ -20,7 +20,7 @@ and dead code stripping is activated. This leads to link errors. Pulling in the
 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. */
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_compile.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 supporting internal functions that are not used by other modules. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_config.c

@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This module contains the external function pcre_config(). */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_dfa_exec.c

@@ -72,7 +72,7 @@ in others, so I abandoned this code. */
 
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_exec.c

@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 pattern matching using an NFA algorithm, trying to mimic Perl as closely as
 possible. There are also some static supporting functions. */
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_fullinfo.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 information about a compiled pattern. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_get.c

@@ -43,7 +43,7 @@ from the subject string after a regex match has succeeded. The original idea
 for these functions came from Scott Wimer. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_globals.c

@@ -52,7 +52,7 @@ a local function is used.
 Also, when compiling for Virtual Pascal, things are done differently, and
 global variables are not used. */
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_jit_compile.c

@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 -----------------------------------------------------------------------------
 */
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_maketables.c

@@ -45,7 +45,7 @@ compilation of dftables.c, in which case the macro DFTABLES is defined. */
 
 
 #ifndef DFTABLES
-#  ifdef PCRE_HAVE_CONFIG_H
+#  ifdef HAVE_CONFIG_H
 #  include "config.h"
 #  endif
 #  include "pcre_internal.h"

src/3rdparty/pcre/pcre_newline.c

@@ -47,7 +47,7 @@ and NLTYPE_ANY. The full list of Unicode newline characters is taken from
 http://unicode.org/unicode/reports/tr18/. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_ord2utf8.c

@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
 /* This file contains a private PCRE function that converts an ordinal
 character value into a UTF8 string. */
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_refcount.c

@@ -44,7 +44,7 @@ pattern data block. This might be helpful in applications where the block is
 shared by different users. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_string_utils.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 of strings for different data item sizes. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_study.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 supporting functions. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_tables.c

@@ -45,7 +45,7 @@ uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name
 clashes with the library. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_ucd.c

@@ -10,7 +10,7 @@ needed. */
 
 #ifndef PCRE_INCLUDED
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_valid_utf8.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 strings. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_version.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 string that identifies the PCRE version that is in use. */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

src/3rdparty/pcre/pcre_xclass.c

@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
 class. It is used by both pcre_exec() and pcre_def_exec(). */
 
 
-#ifdef PCRE_HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif