Mercurial > octave
diff libinterp/build-env.in.cc @ 23005:8e9dd0d6e337
update check for pcre library to use pkg-config (bug #49993)
* configure.ac: Use PKG_CONFIG to check for pcre library. Define
PCRE_LDFLAGS separately from PCRE_LIBS. Display PCRE_LDFLAGS in
summary message.
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh: Also
substitute PCRE_LDFLAGS.
* libinterp/corefcn/toplev.cc (F__octave_config_info__): Also include
PCRE_LDFLAGS in the struct.
* libinterp/build-env.in.cc, libinterp/build-env.h (PCRE_LDFLAGS):
New variable.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 06 Jan 2017 08:08:58 -0500 |
parents | 31bd8a50d44c |
children | ef4d915df748 |
line wrap: on
line diff
--- a/libinterp/build-env.in.cc Thu Jan 05 13:26:10 2017 -0500 +++ b/libinterp/build-env.in.cc Fri Jan 06 08:08:58 2017 -0500 @@ -237,6 +237,8 @@ const char *PCRE_CPPFLAGS = %OCTAVE_CONF_PCRE_CPPFLAGS%; + const char *PCRE_LDFLAGS = %OCTAVE_CONF_PCRE_LDFLAGS%; + const char *PCRE_LIBS = %OCTAVE_CONF_PCRE_LIBS%; const char *PREFIX = %OCTAVE_CONF_PREFIX%;