Mercurial > hg > octave-max

changeset 6025:bb0c9f97fe4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-10-03 19:21:09 by jwe]
author jwe
date Tue, 03 Oct 2006 19:21:09 +0000
parents 500d884ae373
children 31bf61b463ce
files ChangeLog configure.in scripts/ChangeLog scripts/pkg/pkg.m
diffstat 4 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-10-03  John W. Eaton  <jwe@octave.org>
 
+	* configure.in: Warn if PCRE library is not found.
+
 	* configure.in: Include CAMD_LIBS, AMD_LIBS, and REGEX_LIBS in the
 	summary.
 
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.522 $)
+AC_REVISION($Revision: 1.523 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -416,6 +416,9 @@
     else
       REGEX_LIBS="-lpcre"
     fi
+  else
+    warn_pcre="PCRE library not found.  This will result in some loss of functionality for the regular expression matching functions."
+    AC_MSG_WARN($warn_pcre)
   fi
 fi
 AC_CHECK_FUNCS(regexec, WITH_REGEX=yes , [
@@ -1905,6 +1908,11 @@
   warn_msg_printed=true
 fi
 
+if test -n "$warn_pcre"; then
+  AC_MSG_WARN($warn_pcre)
+  warn_msg_printed=true
+fi
+
 if test -n "$warn_zlib"; then
   AC_MSG_WARN($warn_zlib)
   warn_msg_printed=true
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+2006-10-03  Søren Hauberg  <soren@hauberg.org>
+
+	* pkg/pkg.m: Avoid calling addpath with no args.
+
 2006-10-03  Bill Denney  <denney@seas.upenn.edu>
 
  	* audio/loadaudio.m, control/base/nyquist.m,
--- a/scripts/pkg/pkg.m
+++ b/scripts/pkg/pkg.m
@@ -1068,7 +1068,9 @@
             endif
         endfor
     endif
-    addpath(dirs{:});
+    if (length(dirs) > 0)
+        addpath(dirs{:});
+    endif
 
     ## Add local binaries, if any, to the EXEC_PATH
     for i = 1:length(dirs)