Skip to content

Commit 24cd667

Browse files
bscottmpkoning2
authored andcommitted
Makfile: PCRE2 default
Remove the USE_PCRE2 makefile variable so that the makefile's configuration searches for PCRE2 and falls back to PCRE if not found.
1 parent 59c5506 commit 24cd667

1 file changed

Lines changed: 13 additions & 18 deletions

File tree

makefile

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -611,27 +611,22 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
611611
LIBEXT = $(LIBEXTSAVE)
612612
endif
613613
endif
614-
## RegEx: Prefer the PCRE library over PCRE2 for historical reasons. Only detect
615-
## and use PCRE2 if USE_PCRE2 is set as a command line variable or in the
616-
## environment.
617614
FALLBACK_PCRE=yes
618-
ifdef USE_PCRE2
619-
# Find the PCRE2 RegEx library
620-
ifneq (,$(call find_include,pcre2))
621-
PCRE2_LIB=pcre2-8
622-
ifneq (,$(call find_lib,${PCRE2_LIB}))
623-
OS_CCDEFS += -DHAVE_PCRE2_H
624-
OS_LDFLAGS += -l${PCRE2_LIB}
625-
$(info using libpcre2-8: $(call find_lib,${PCRE2_LIB}) $(call find_include,pcre2))
626-
ifeq ($(LD_SEARCH_NEEDED),$(call need_search,${PCRE2_LIB}))
627-
OS_LDFLAGS += -L$(dir $(call find_lib,${{PCRE2_LIB}}))
628-
endif
629-
FALLBACK_PCRE=
615+
# Find the PCRE2 RegEx library
616+
ifneq (,$(call find_include,pcre2))
617+
PCRE2_LIB=pcre2-8
618+
ifneq (,$(call find_lib,${PCRE2_LIB}))
619+
OS_CCDEFS += -DHAVE_PCRE2_H
620+
OS_LDFLAGS += -l${PCRE2_LIB}
621+
$(info using libpcre2-8: $(call find_lib,${PCRE2_LIB}) $(call find_include,pcre2))
622+
ifeq ($(LD_SEARCH_NEEDED),$(call need_search,${PCRE2_LIB}))
623+
OS_LDFLAGS += -L$(dir $(call find_lib,${{PCRE2_LIB}}))
630624
endif
625+
FALLBACK_PCRE=
631626
endif
632-
ifneq ($(FALLBACK_PCRE),)
633-
$(info *** Info *** PCRE2 not detected, falling back to PCRE)
634-
endif
627+
endif
628+
ifneq ($(FALLBACK_PCRE),)
629+
$(info *** Info *** PCRE2 not detected, falling back to PCRE)
635630
endif
636631
# Find PCRE RegEx library, either because we didn't want PCRE2 or we didn't
637632
# find PCRE2.

0 commit comments

Comments
 (0)