|
 |
e0b8daa |
diff -up gambas-3.17.3/gb.pcre/configure.ac.just-pcre2 gambas-3.17.3/gb.pcre/configure.ac
|
|
|
e0b8daa |
--- gambas-3.17.3/gb.pcre/configure.ac.just-pcre2 2022-09-20 14:20:07.418837160 -0400
|
|
|
e0b8daa |
+++ gambas-3.17.3/gb.pcre/configure.ac 2022-09-20 14:21:12.326309588 -0400
|
|
|
e0b8daa |
@@ -11,22 +11,6 @@ GB_COMPONENT_PKG_CONFIG(
|
|
|
e0b8daa |
pcre, PCRE, gb.pcre, [src],
|
|
|
e0b8daa |
libpcre2-8)
|
|
|
e0b8daa |
|
|
|
e0b8daa |
-if test "$have_pcre" != "yes"; then
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
- GB_COMPONENT_PKG_CONFIG_AGAIN(
|
|
|
e0b8daa |
- pcre, PCRE, gb.pcre, [src],
|
|
|
e0b8daa |
- libpcre, [trying with pcre])
|
|
|
e0b8daa |
- gb_use_pcre2=0
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
-else
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
- AC_DEFINE_UNQUOTED(PCRE2, 1, libpcre2 is used)
|
|
|
e0b8daa |
- gb_use_pcre2=1
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
-fi
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
-AM_CONDITIONAL(USE_PCRE2, test "$gb_use_pcre2" = 1)
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
AC_OUTPUT( \
|
|
|
e0b8daa |
Makefile \
|
|
|
e0b8daa |
src/Makefile \
|
|
|
e0b8daa |
diff -up gambas-3.17.3/gb.pcre/src/main.c.just-pcre2 gambas-3.17.3/gb.pcre/src/main.c
|
|
|
e0b8daa |
--- gambas-3.17.3/gb.pcre/src/main.c.just-pcre2 2022-09-20 14:23:27.914296475 -0400
|
|
|
e0b8daa |
+++ gambas-3.17.3/gb.pcre/src/main.c 2022-09-20 14:23:37.395365484 -0400
|
|
|
e0b8daa |
@@ -29,7 +29,7 @@
|
|
|
e0b8daa |
#include <stdarg.h>
|
|
|
e0b8daa |
#include <string.h>
|
|
|
e0b8daa |
|
|
|
e0b8daa |
-#include "regexp.h"
|
|
|
e0b8daa |
+#include "regexp2.h"
|
|
|
e0b8daa |
|
|
|
e0b8daa |
#include "main.h"
|
|
|
e0b8daa |
|
|
|
e0b8daa |
diff -up gambas-3.17.3/gb.pcre/src/Makefile.am.just-pcre2 gambas-3.17.3/gb.pcre/src/Makefile.am
|
|
|
e0b8daa |
--- gambas-3.17.3/gb.pcre/src/Makefile.am.just-pcre2 2022-09-20 14:21:58.953648970 -0400
|
|
|
e0b8daa |
+++ gambas-3.17.3/gb.pcre/src/Makefile.am 2022-09-20 14:22:10.542733323 -0400
|
|
|
e0b8daa |
@@ -9,16 +9,6 @@ gb_pcre_la_CPPFLAGS = @PCRE_INC@
|
|
|
e0b8daa |
|
|
|
e0b8daa |
gb_pcre_la_SOURCES = \
|
|
|
e0b8daa |
main.h main.c \
|
|
|
e0b8daa |
- gb.pcre.h
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
-if USE_PCRE2
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
-gb_pcre_la_SOURCES += regexp2.h regexp2.c
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
-else
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
-gb_pcre_la_SOURCES += regexp.h regexp.c
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
-endif
|
|
|
e0b8daa |
-
|
|
|
e0b8daa |
+ gb.pcre.h \
|
|
|
e0b8daa |
+ regexp2.h regexp2.c
|
|
|
e0b8daa |
|