Mercurial > hg > octave-max

changeset 8607:08331c2fb00f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add -lregex to REGEX_LIBS at configure stage, add ARPACK_LIBS, REGEX_LIBS to liboctave's link deps
author Benjamin Lindner <lindnerb@users.sourceforge.net>
date Tue, 27 Jan 2009 22:44:38 -0500
parents 0611b48a2b61
children 5cc1fba0a7d6
files ChangeLog configure.in liboctave/ChangeLog liboctave/Makefile.in
diffstat 4 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-01-27  Benjamin Lindner  <lindnerb@users.sourceforge.net>
+
+	* configure.in: Add of -lregex to REGEX_LIBS.
+
 2009-01-26  Thomas Treichl  <Thomas.Treichl@gmx.net>
 
 	* aclocal.m4 (OCTAVE_HAVE_FRAMEWORK): New macro.
--- a/configure.in
+++ b/configure.in
@@ -473,10 +473,8 @@
   AC_CHECK_LIB(regex, regexec, WITH_REGEX=yes, WITH_REGEX=no)])
 if test $WITH_REGEX = yes ; then
   AC_DEFINE(HAVE_REGEX, 1, [Define if regex is available.])
-  if test $WITH_PCRE = no ; then
     AC_CHECK_FUNCS(regexec, REGEX_LIBS= , [
-      AC_CHECK_LIB(regex, regexec, REGEX_LIBS="-lregex")])
-  fi
+      AC_CHECK_LIB(regex, regexec, REGEX_LIBS="$REGEX_LIBS -lregex")])
 fi
 if test $WITH_REGEX = no; then
   warn_regex="regular expression functions not found.  The regular expression matching functions will be disabled."
--- a/liboctave/ChangeLog
+++ b/liboctave/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-27  Benjamin Lindner  <lindnerb@users.sourceforge.net>
+
+	* Makefile.in (LINK_DEPS): Include ARPACK_LIBS and REGEX_LIBS in
+	the list.
+
 2009-01-27  Jaroslav Hajek  <highegg@gmail.com>
 
 	* dbleQR.cc (QR::init): Use form. Use local buffers.
--- a/liboctave/Makefile.in
+++ b/liboctave/Makefile.in
@@ -38,7 +38,7 @@
   -L../libcruft -L. $(RLD_FLAG) \
   $(LIBCRUFT) $(CHOLMOD_LIBS) $(UMFPACK_LIBS)  $(AMD_LIBS) \
   $(CAMD_LIBS) $(COLAMD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) \
-  $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) $(LIBGLOB) $(LIBS) $(FLIBS)
+  $(ARPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) $(LIBGLOB) $(REGEX_LIBS) $(LIBS) $(FLIBS)
 
 MATRIX_INC := Array.h Array2.h Array3.h ArrayN.h DiagArray2.h \
 	Array-util.h ArrayN-idx.h MArray-defs.h \