diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-10-01 16:33:23 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-10-01 16:33:23 +0800 |
| commit | 3ffbf9a7ea569b7ebb198bc7f9a04bde304d20a0 (patch) | |
| tree | aad7d2637e69866c637922fa10aaf2ac96c679c5 /Makefile.in | |
| parent | c481137b40a75bc2f00517da58fbf8e5353404f3 (diff) | |
configure/Makefile: allow the use of a system libpcre2 if available
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/Makefile.in b/Makefile.in index d10cb1ee..b79362cb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -55,23 +55,20 @@ localedir = @localedir@ PCRE2_WIDTH = @WCHAR_T_BITS@ PCRE2_DIR = pcre2-10.20 -PCRE2_CXXFLAGS = -I$(PCRE2_DIR)/src PCRE2_LIBDIR = $(PCRE2_DIR)/.libs PCRE2_LIB = $(PCRE2_LIBDIR)/libpcre2-$(PCRE2_WIDTH).a PCRE2_H = $(PCRE2_DIR)/src/pcre2.h -PCRE2_CONFIG = --disable-pcre2-8 --enable-pcre2-$(PCRE2_WIDTH) --disable-shared +EXTRA_PCRE2 = @EXTRA_PCRE2@ # # Various flags # MACROS = -DLOCALEDIR=\"$(localedir)\" -DPREFIX=L\"$(prefix)\" -DDATADIR=L\"$(datadir)\" -DSYSCONFDIR=L\"$(sysconfdir)\" -DBINDIR=L\"$(bindir)\" -DDOCDIR=L\"$(docdir)\" -CXXFLAGS = @CXXFLAGS@ -iquote. -iquote./src/ $(MACROS) $(PCRE2_CXXFLAGS) $(EXTRA_CXXFLAGS) +CXXFLAGS = @CXXFLAGS@ -iquote. -iquote./src/ $(MACROS) $(EXTRA_CXXFLAGS) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ -PCRE2 = pcre2-10.20 -LIBS_PCRE2 = -L$(PCRE2_LIBDIR) -lpcre2-$(PCRE2_WIDTH) -LIBS = @LIBS@ $(LIBS_PCRE2) +LIBS = @LIBS@ LDFLAGS_FISH = ${LDFLAGS} @LDFLAGS_FISH@ # @@ -794,19 +791,17 @@ obj: # Build the fish program. # -fish: $(FISH_OBJS) obj/fish.o $(PCRE2_LIB) +fish: $(FISH_OBJS) obj/fish.o $(EXTRA_PCRE2) $(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_OBJS) obj/fish.o $(LIBS) -o $@ -$(PCRE2_H): - (cd $(PCRE2_DIR) && autoreconf -i && ./configure $(PCRE2_CONFIG) && make libpcre2-$(PCRE2_WIDTH).la) - $(PCRE2_LIB): $(PCRE2_H) + (cd $(PCRE2_DIR) && make libpcre2-$(PCRE2_WIDTH).la) # # Build the fish_tests program. # -fish_tests: $(FISH_TESTS_OBJS) $(PCRE2_LIB) +fish_tests: $(FISH_TESTS_OBJS) $(EXTRA_PCRE2) $(CXX) $(CXXFLAGS) $(LDFLAGS_FISH) $(FISH_TESTS_OBJS) $(LIBS) -o $@ @@ -814,7 +809,7 @@ fish_tests: $(FISH_TESTS_OBJS) $(PCRE2_LIB) # Build the fish_indent program. # -fish_indent: $(FISH_INDENT_OBJS) $(PCRE2_LIB) +fish_indent: $(FISH_INDENT_OBJS) $(EXTRA_PCRE2) $(CXX) $(CXXFLAGS) $(LDFLAGS) $(FISH_INDENT_OBJS) $(LIBS) -o $@ |