diff options
author | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2012-06-18 16:47:14 +0000 |
---|---|---|
committer | ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15> | 2012-06-18 16:47:14 +0000 |
commit | d99b3a10e96e5b00778d10587d5f81ef8c7158a6 (patch) | |
tree | 47118ab0bd315847ca5f15178bfdb34c35479ec2 | |
parent | 37b4efccc0529613ee2c93004d33ef681c410a9f (diff) | |
download | pcre-d99b3a10e96e5b00778d10587d5f81ef8c7158a6.tar.gz |
Add libpcre.la to link commands for pcretest and pcregrep because this is
required in some OS for shared objects.
git-svn-id: svn://vcs.exim.org/pcre/code/trunk@980 2f5784b3-3f2a-0410-8824-cb99058d5e15
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | Makefile.am | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -145,6 +145,10 @@ Version 8.31 02-June-2012 both cases the values are those that cannot be the first data item in a UTF character. The three items that might have provoked this were recursions, possessively repeated groups, and atomic groups. + +40. Ensure that libpcre is explicitly listed in the link commands for pcretest + and pcregrep, because some OS require shared objects to be explicitly + passed to ld, causing the link step to fail if they are not. Version 8.30 04-February-2012 diff --git a/Makefile.am b/Makefile.am index ec55f91..224af89 100644 --- a/Makefile.am +++ b/Makefile.am @@ -339,7 +339,7 @@ pcretest_SOURCES = pcretest.c pcretest_LDADD = $(LIBREADLINE) if WITH_PCRE8 pcretest_SOURCES += pcre_printint.c -pcretest_LDADD += libpcreposix.la +pcretest_LDADD += libpcre.la libpcreposix.la endif # WITH_PCRE8 if WITH_PCRE16 pcretest_SOURCES += pcre16_printint.c @@ -352,7 +352,7 @@ dist_noinst_SCRIPTS += RunGrepTest bin_PROGRAMS += pcregrep pcregrep_SOURCES = pcregrep.c pcregrep_LDADD = $(LIBZ) $(LIBBZ2) -pcregrep_LDADD += libpcreposix.la +pcregrep_LDADD += libpcre.la libpcreposix.la endif # WITH_PCRE8 EXTRA_DIST += \ |