# HG changeset patch # User jwe # Date 1159903269 0 # Node ID bb0c9f97fe4fcb17a5b05722b581efc8cb2514be # Parent 500d884ae3730687568c08dd69b61022c4f53c36 [project @ 2006-10-03 19:21:09 by jwe] diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-10-03 John W. Eaton + * configure.in: Warn if PCRE library is not found. + * configure.in: Include CAMD_LIBS, AMD_LIBS, and REGEX_LIBS in the summary. diff --git a/configure.in b/configure.in --- 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 diff --git a/scripts/ChangeLog b/scripts/ChangeLog --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +2006-10-03 Søren Hauberg + + * pkg/pkg.m: Avoid calling addpath with no args. + 2006-10-03 Bill Denney * audio/loadaudio.m, control/base/nyquist.m, diff --git a/scripts/pkg/pkg.m b/scripts/pkg/pkg.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)