Mercurial > octave-nkf

diff libinterp/corefcn/toplev.cc @ 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 7005044f3080
line wrap: on
line diff
--- a/libinterp/corefcn/toplev.cc	Thu Oct 31 17:10:38 2013 -0700
+++ b/libinterp/corefcn/toplev.cc	Thu Oct 31 21:15:00 2013 -0700
@@ -1336,6 +1336,8 @@
     { false, "OCT_LINK_DEPS", OCTAVE_CONF_OCT_LINK_DEPS },
     { false, "OCT_LINK_OPTS", OCTAVE_CONF_OCT_LINK_OPTS },
     { false, "OPENGL_LIBS", OCTAVE_CONF_OPENGL_LIBS },
+    { false, "PCRE_CPPFLAGS", OCTAVE_CONF_PCRE_CPPFLAGS },
+    { false, "PCRE_LIBS", OCTAVE_CONF_PCRE_LIBS },
     { false, "PTHREAD_CFLAGS", OCTAVE_CONF_PTHREAD_CFLAGS },
     { false, "PTHREAD_LIBS", OCTAVE_CONF_PTHREAD_LIBS },
     { false, "QHULL_CPPFLAGS", OCTAVE_CONF_QHULL_CPPFLAGS },
@@ -1350,7 +1352,6 @@
     { false, "RANLIB", OCTAVE_CONF_RANLIB },
     { false, "RDYNAMIC_FLAG", OCTAVE_CONF_RDYNAMIC_FLAG },
     { false, "READLINE_LIBS", OCTAVE_CONF_READLINE_LIBS },
-    { false, "REGEX_LIBS", OCTAVE_CONF_REGEX_LIBS },
     { false, "SED", OCTAVE_CONF_SED },
     { false, "SHARED_LIBS", OCTAVE_CONF_SHARED_LIBS },
     { false, "SHLEXT", OCTAVE_CONF_SHLEXT },