Merge branch 'cb/pcre1-cleanup'

PCRE fixes.

* cb/pcre1-cleanup:
  grep: refactor and simplify PCRE1 support
  grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1

diff --cc Makefile
Simple merge

diff --cc grep.c
Simple merge

diff --cc grep.h
index 1060f0fe500eaedd842bdf6b3dd04d8220a49a12,ff620d784a067b5dea73b1c0d5f5b6030abf7cfe..05dc1bb98e5e2209a945da6024a757ce02d4d103
--- 1/grep.h
--- 2/grep.h
+++ b/grep.h
@@@ -3,20 -3,6 +3,9 @@@
  #include "color.h"
  #ifdef USE_LIBPCRE1
  #include <pcre.h>
- #ifdef PCRE_CONFIG_JIT
- #if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
- #ifndef NO_LIBPCRE1_JIT
- #define GIT_PCRE1_USE_JIT
- #define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE
- #endif
- #endif
- #endif
- #ifndef GIT_PCRE_STUDY_JIT_COMPILE
- #define GIT_PCRE_STUDY_JIT_COMPILE 0
- #endif
 +#ifndef PCRE_NO_UTF8_CHECK
 +#define PCRE_NO_UTF8_CHECK 0
 +#endif
  #else
  typedef int pcre;
  typedef int pcre_extra;