Mercurial > octave
diff build-aux/subst-config-vals.in.sh @ 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 | a1f1ab76aa64 |
| children | 092078913d54 |
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh Thu Jan 05 13:26:10 2017 -0500 +++ b/build-aux/subst-config-vals.in.sh Fri Jan 06 08:08:58 2017 -0500 @@ -135,6 +135,7 @@ OSMESA_LDFLAGS="@OSMESA_LDFLAGS@" OSMESA_LIBS="@OSMESA_LIBS@" PCRE_CPPFLAGS="@PCRE_CPPFLAGS@" +PCRE_LDFLAGS="@PCRE_LDFLAGS@" PCRE_LIBS="@PCRE_LIBS@" prefix="@prefix@" PTHREAD_CFLAGS="@PTHREAD_CFLAGS@" @@ -298,6 +299,7 @@ -e "s|%OCTAVE_CONF_OSMESA_LDFLAGS%|\"${OSMESA_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_OSMESA_LIBS%|\"${OSMESA_LIBS}\"|" \ -e "s|%OCTAVE_CONF_PCRE_CPPFLAGS%|\"${PCRE_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_PCRE_LDFLAGS%|\"${PCRE_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_PCRE_LIBS%|\"${PCRE_LIBS}\"|" \ -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \ -e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \