# HG changeset patch
# User jwe
# Date 1195067772 0
# Node ID ff4a4cc863a965e15845b4f0081b5a06a2d0aa3e
# Parent  ff2ff2c09865b940e9527e536aaea4fed2a4a757
[project @ 2007-11-14 19:16:12 by jwe]

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.594 $)
+AC_REVISION($Revision: 1.595 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -449,13 +449,11 @@
   else
     REGEX_LIBS=-lpcre
   fi
-fi
-if test $WITH_PCRE = no; then
+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
 
-## not sure why we need to check for regex like this if pcre is defined, but it was like this when I got here ...
 AC_CHECK_FUNCS(regexec, WITH_REGEX=yes , [
   AC_CHECK_LIB(regex, regexec, WITH_REGEX=yes, WITH_REGEX=no)])
 if test $WITH_REGEX = yes ; then
diff --git a/scripts/general/interp3.m b/scripts/general/interp3.m
--- a/scripts/general/interp3.m
+++ b/scripts/general/interp3.m
@@ -70,20 +70,21 @@
     print_usage ();
   endif
 
-  if (ischar (varargin {end}))
-    method = varargin {end};
+  if (ischar (varargin{end}))
+    method = varargin{end};
     nargs = nargs - 1;
-  elseif (ischar (varargin {end - 1}))
-    if (! isnumeric (varargin {end}) || ! isscalar (varargin {end}))
+  elseif (ischar (varargin{end-1}))
+    if (! isnumeric (varargin{end}) || ! isscalar (varargin{end}))
       error ("extrapal is expected to be a numeric scalar");
     endif
-    extrapval = varargin {end};
-    method = varargin {end - 1};
+    extrapval = varargin{end};
+    method = varargin{end-1};
     nargs = nargs - 2;
   endif
 
-  if (nargs < 3 || (nargs == 4 && ! isvector (varargin {1}) && 
-      nargs == (ndims (varargin {1}) + 1)))
+  if (nargs < 3 || (nargs == 4 && ! isvector (varargin{1})
+		    && nargs == (ndims (varargin{1}) + 1)))
+    v = varargin{1};
     if (ndims (v) != 3)
       error ("expect 3-dimensional array of values");
     endif
@@ -99,8 +100,8 @@
     endif
     v = permute (v, [2, 1, 3]);
     vi = ipermute (interpn (v, x{:}, method, extrapval), [2, 1, 3]);
-  elseif (nargs == 7 && nargs == (2 * ndims (varargin {ceil (nargs / 2)})) + 1)
-    v = varargin {4};
+  elseif (nargs == 7 && nargs == (2 * ndims (varargin{ceil (nargs / 2)})) + 1)
+    v = varargin{4};
     if (ndims (v) != 3)
       error ("expect 3-dimensional array of values");
     endif
@@ -125,7 +126,7 @@
       y{1} = permute (y{1}, [2, 1, 3]);
     endif
     v = permute (v, [2, 1, 3]);
-    vi = ipermute (interpn (x{:}, v, y{:}, method, extrapval), [2,1,3]);
+    vi = ipermute (interpn (x{:}, v, y{:}, method, extrapval), [2, 1, 3]);
   else
     error ("wrong number or incorrectly formatted input arguments");
   endif