Mercurial > octave-dspies

diff build-aux/common.mk @ 17821:82c94987abc6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS. Rename REGEX to PCRE to accurately name the library. * configure.ac: Remove REGEX_CPPFLAGS from XTRA_CXXFLAGS. Rename REGEX to PCRE to accurately name the library. * build-aux/common.mk: Add PCRE_LIBS, PCRE_CPPFLAGS macro substitutions. Delete REGEX_LIBS. * liboctave/util/module.mk: Add PCRE_CPPFLAGS to util convenience library. * liboctave/link-deps.mk: Rename REGEX_LIBS to PCRE_LIBS. libinterp/link-deps.mk: : Remove REGEX_LIBS which was never required for libinterp. * libinterp/corefcn/toplev.cc, libinterp/oct-conf.in.h: Rename REGEX to PCRE to accurately name the library.
author Rik <rik@octave.org>
date Thu, 31 Oct 2013 21:15:00 -0700
parents e6317049225b
children 23f680301f65 b6b6e0dc700e
line wrap: on
line diff
--- a/build-aux/common.mk	Thu Oct 31 17:10:38 2013 -0700
+++ b/build-aux/common.mk	Thu Oct 31 21:15:00 2013 -0700
@@ -266,6 +266,9 @@
 
 OPENGL_LIBS = @OPENGL_LIBS@
 
+PCRE_CPPFLAGS = @PCRE_CPPFLAGS@
+PCRE_LIBS = @PCRE_LIBS@
+
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 
@@ -277,8 +280,6 @@
 QRUPDATE_LDFLAGS = @QRUPDATE_LDFLAGS@
 QRUPDATE_LIBS = @QRUPDATE_LIBS@
 
-REGEX_LIBS = @REGEX_LIBS@
-
 READLINE_LIBS = @READLINE_LIBS@
 
 SPARSE_XCPPFLAGS = \
@@ -611,6 +612,8 @@
   -e "s|%OCTAVE_CONF_OCT_LINK_DEPS%|\"${OCT_LINK_DEPS}\"|" \
   -e "s|%OCTAVE_CONF_OCT_LINK_OPTS%|\"${OCT_LINK_OPTS}\"|" \
   -e "s|%OCTAVE_CONF_OPENGL_LIBS%|\"${OPENGL_LIBS}\"|" \
+  -e "s|%OCTAVE_CONF_PCRE_CPPFLAGS%|\"${PCRE_CPPFLAGS}\"|" \
+  -e "s|%OCTAVE_CONF_PCRE_LIBS%|\"${PCRE_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_PREFIX%|\"${prefix}\"|" \
   -e "s|%OCTAVE_CONF_PTHREAD_CFLAGS%|\"${PTHREAD_CFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_PTHREAD_LIBS%|\"${PTHREAD_LIBS}\"|" \
@@ -626,7 +629,6 @@
   -e "s|%OCTAVE_CONF_RANLIB%|\"${RANLIB}\"|" \
   -e "s|%OCTAVE_CONF_RDYNAMIC_FLAG%|\"${RDYNAMIC_FLAG}\"|" \
   -e "s|%OCTAVE_CONF_READLINE_LIBS%|\"${READLINE_LIBS}\"|" \
-  -e "s|%OCTAVE_CONF_REGEX_LIBS%|\"${REGEX_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_SED%|\"${SED}\"|" \
   -e "s|%OCTAVE_CONF_SHARED_LIBS%|\"${SHARED_LIBS}\"|" \
   -e "s|%OCTAVE_CONF_SHLEXT%|\"${SHLEXT}\"|" \