Mercurial > octave-nkf
changeset 17821:82c94987abc6
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 | 3488d987eb50 |
| children | ebb3ef964372 |
| files | build-aux/common.mk configure.ac libinterp/corefcn/toplev.cc libinterp/link-deps.mk libinterp/oct-conf.in.h liboctave/link-deps.mk liboctave/util/module.mk |
| diffstat | 7 files changed, 27 insertions(+), 18 deletions(-) [+] |
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}\"|" \
--- a/configure.ac Thu Oct 31 17:10:38 2013 -0700 +++ b/configure.ac Thu Oct 31 21:15:00 2013 -0700 @@ -664,7 +664,7 @@ ### Check for PCRE regex library. -REGEX_LIBS= +PCRE_LIBS= pcre_fail_msg="to build Octave, you must have the PCRE library and header files installed" @@ -687,18 +687,19 @@ ac_cv_pcre_h_macros_present=yes, ac_cv_pcre_h_macros_present=no)]) if test $ac_cv_pcre_h_macros_present = yes; then - ## check for pcre-config, and if so, set XTRA_CXXFLAGS appropriately + ## check for pcre-config, and if so, get build variables AC_CHECK_PROG(HAVE_PCRE_CONFIG, pcre-config, [yes], [no]) if test $HAVE_PCRE_CONFIG = yes; then - XTRA_CXXFLAGS="$XTRA_CXXFLAGS `pcre-config --cflags`" - REGEX_LIBS=`pcre-config --libs` + PCRE_CPPFLAGS=`pcre-config --cflags` + PCRE_LIBS=`pcre-config --libs` else - REGEX_LIBS="-lpcre" + PCRE_LIBS="-lpcre" fi save_LIBS="$LIBS" - LIBS="$REGEX_LIBS $LIBS" + LIBS="$PCRE_LIBS $LIBS" AC_CHECK_FUNCS([pcre_compile], - [AC_SUBST(REGEX_LIBS)], + [AC_SUBST(PCRE_CPPFLAGS) + AC_SUBST(PCRE_LIBS)], [AC_MSG_ERROR([$pcre_fail_msg])]) LIBS="$save_LIBS" else @@ -2852,6 +2853,8 @@ Magick++ LDFLAGS: $MAGICK_LDFLAGS Magick++ libraries: $MAGICK_LIBS OPENGL libraries: $OPENGL_LIBS + PCRE CPPFLAGS: $PCRE_CPPFLAGS + PCRE libraries: $PCRE_LIBS PTHREAD flags: $PTHREAD_CFLAGS PTHREAD libraries: $PTHREAD_LIBS QHULL CPPFLAGS: $QHULL_CPPFLAGS @@ -2864,7 +2867,6 @@ Qt LDFLAGS: $QT_LDFLAGS Qt libraries: $QT_LIBS READLINE libraries: $READLINE_LIBS - REGEX libraries: $REGEX_LIBS TERM libraries: $TERM_LIBS UMFPACK CPPFLAGS: $UMFPACK_CPPFLAGS UMFPACK LDFLAGS: $UMFPACK_LDFLAGS
--- 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 },
--- a/libinterp/link-deps.mk Thu Oct 31 17:10:38 2013 -0700 +++ b/libinterp/link-deps.mk Thu Oct 31 21:15:00 2013 -0700 @@ -11,7 +11,6 @@ $(HDF5_LIBS) \ $(Z_LIBS) \ $(FFTW_XLIBS) \ - $(REGEX_LIBS) \ $(OPENGL_LIBS) \ $(X11_LIBS) \ $(CARBON_LIBS) \
--- 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