[master] 40a65166f Reduce use of PCRE linker flags differently

[Nils Goroll]

commit 40a65166f92bd4c57b0dc3b30173ea1a78afa20d
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Jun 10 11:35:58 2021 +0200

    Reduce use of PCRE linker flags differently
    
    ... to make our SunOS vtest build happy again
    
    ld: fatal: file /opt/local/lib/libpcre.so: wrong ELF class: ELFCLASS64
    ld: fatal: file processing errors. No output written to vjsn_test
    collect2: error: ld returned 1 exit status
    
    The issue here was order of the -L -l arguments when a (32bit) version
    of a library needs to be found first in an overridden LDPATH.
    
    Ref 12bbe31f7989538f6711448a91667347d8d529bf
    Ref #3559

diff --git a/lib/libvarnish/Makefile.am b/lib/libvarnish/Makefile.am
index ea2ba0a3a..3be8609f1 100644
--- a/lib/libvarnish/Makefile.am
+++ b/lib/libvarnish/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 	@PCRE_CFLAGS@
 
 AM_CFLAGS   = $(AM_LT_CFLAGS)  @SAN_CFLAGS@
-AM_LDFLAGS  = $(AM_LT_LDFLAGS) @SAN_LDFLAGS@ @PCRE_LIBS@
+AM_LDFLAGS  = $(AM_LT_LDFLAGS) @SAN_LDFLAGS@
 
 noinst_LTLIBRARIES = libvarnish.la
 
@@ -44,6 +44,8 @@ libvarnish_la_SOURCES = \
 	vtim.c \
 	vus.c
 
+libvarnish_la_LIBADD = @PCRE_LIBS@
+
 TESTS = vjsn_test vnum_c_test vbh_test vsb_test
 
 noinst_PROGRAMS = ${TESTS}