Mercurial > octave-nkf

diff libinterp/oct-conf.in.h @ 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 4197fc428c7d
line wrap: on
line diff
--- a/libinterp/oct-conf.in.h	Thu Oct 31 17:10:38 2013 -0700
+++ b/libinterp/oct-conf.in.h	Thu Oct 31 21:15:00 2013 -0700
@@ -450,6 +450,14 @@
 #define OCTAVE_CONF_OPENGL_LIBS %OCTAVE_CONF_OPENGL_LIBS%
 #endif
 
+#ifndef OCTAVE_CONF_PCRE_CPPFLAGS
+#define OCTAVE_CONF_PCRE_CPPFLAGS %OCTAVE_CONF_PCRE_CPPFLAGS%
+#endif
+
+#ifndef OCTAVE_CONF_PCRE_LIBS
+#define OCTAVE_CONF_PCRE_LIBS %OCTAVE_CONF_PCRE_LIBS%
+#endif
+
 #ifndef OCTAVE_CONF_PREFIX
 #define OCTAVE_CONF_PREFIX %OCTAVE_CONF_PREFIX%
 #endif
@@ -510,10 +518,6 @@
 #define OCTAVE_CONF_READLINE_LIBS %OCTAVE_CONF_READLINE_LIBS%
 #endif
 
-#ifndef OCTAVE_CONF_REGEX_LIBS
-#define OCTAVE_CONF_REGEX_LIBS %OCTAVE_CONF_REGEX_LIBS%
-#endif
-
 #ifndef OCTAVE_CONF_SED
 #define OCTAVE_CONF_SED %OCTAVE_CONF_SED%
 #endif