# HG changeset patch
# User jwe
# Date 1172081947 0
# Node ID de4ae354c831910b3dd68115bd091310ca41cd38
# Parent  877b80a8dee7db26f49c32cde25098ad0cc54ef6
[project @ 2007-02-21 18:19:07 by jwe]

diff -r 877b80a8dee7 -r de4ae354c831 ChangeLog
--- a/ChangeLog	Wed Feb 21 12:30:11 2007 +0000
+++ b/ChangeLog	Wed Feb 21 18:19:07 2007 +0000
@@ -1,3 +1,9 @@
+2007-02-21  John W. Eaton  <jwe@octave.org>
+
+	* configure.in: Also warn about missing functionality for
+	--without-glpk or --without-curl options.  Print curl library
+	warning in summary.
+
 2007-02-20  Rafael Laboissiere  <rafael@debian.org>
 
 	* configure.in: Check for versions of GLPK prior to 4.15 and set
diff -r 877b80a8dee7 -r de4ae354c831 configure.in
--- a/configure.in	Wed Feb 21 12:30:11 2007 +0000
+++ b/configure.in	Wed Feb 21 18:19:07 2007 +0000
@@ -29,7 +29,7 @@
 EXTERN_CXXFLAGS="$CXXFLAGS"
 
 AC_INIT
-AC_REVISION($Revision: 1.556 $)
+AC_REVISION($Revision: 1.557 $)
 AC_PREREQ(2.57)
 AC_CONFIG_SRCDIR([src/octave.cc])
 AC_CONFIG_HEADER(config.h)
@@ -586,6 +586,8 @@
   glpk_lib="glpk"
 elif test "$with_glpk" != no; then
   glpk_lib="$with_glpk"
+else
+  glpk_missing=yes
 fi
 
 GLPK_LIBS=
@@ -618,6 +620,8 @@
   curl_lib="curl"
 elif test "$with_curl" != no; then
   curl_lib="$with_curl"
+else
+  curl_missing=yes
 fi
 
 CURL_LIBS=
@@ -2163,6 +2167,11 @@
   warn_msg_printed=true
 fi
 
+if test -n "$warn_curl"; then
+  AC_MSG_WARN($warn_curl)
+  warn_msg_printed=true
+fi
+
 if test -n "$warn_fftw"; then
   AC_MSG_WARN($warn_fftw)
   warn_msg_printed=true
diff -r 877b80a8dee7 -r de4ae354c831 src/ChangeLog
--- a/src/ChangeLog	Wed Feb 21 12:30:11 2007 +0000
+++ b/src/ChangeLog	Wed Feb 21 18:19:07 2007 +0000
@@ -1,3 +1,12 @@
+2007-02-21  John W. Eaton  <jwe@octave.org>
+
+	* DLD-FUNCTIONS/urlwrite.cc (Furlwrite, Furlread): Return error
+	code and message instead of throwing error if functionality is
+	missing.
+
+	* oct-obj.h (octave_value_list::splice): Set default for
+	replacement list argument.
+
 2007-02-20  Rafael Laboissiere  <rafael@laboissiere.net>
 
 	* DLD-FUNCTIONS/__glpk__.cc: Adapt code for changes in the GLPK
diff -r 877b80a8dee7 -r de4ae354c831 src/DLD-FUNCTIONS/urlwrite.cc
--- a/src/DLD-FUNCTIONS/urlwrite.cc	Wed Feb 21 12:30:11 2007 +0000
+++ b/src/DLD-FUNCTIONS/urlwrite.cc	Wed Feb 21 18:19:07 2007 +0000
@@ -314,7 +314,9 @@
     error ("urlwrite: curl: %s", curl_easy_strerror (res));
 
 #else
-  error ("urlwrite: not available in this version of Octave");
+  retval(2) = "urlwrite: not available in this version of Octave";
+  retval(1) = 0;
+  retval(0) = "";
 #endif
 
   return retval;
@@ -429,7 +431,9 @@
     error ("urlread: curl: %s", curl_easy_strerror (res));
 
 #else
-  error ("urlread: not available in this version of Octave");
+  retval(2) = "urlread: not available in this version of Octave";
+  retval(1) = 0;
+  retval(0) = "";
 #endif
 
   return retval;
diff -r 877b80a8dee7 -r de4ae354c831 src/oct-obj.h
--- a/src/oct-obj.h	Wed Feb 21 12:30:11 2007 +0000
+++ b/src/oct-obj.h	Wed Feb 21 18:19:07 2007 +0000
@@ -107,8 +107,9 @@
 
   octave_value_list& reverse (void);
 
-  octave_value_list splice (octave_idx_type offset, octave_idx_type length,
-			    const octave_value_list& lst) const;
+  octave_value_list
+  splice (octave_idx_type offset, octave_idx_type len,
+	  const octave_value_list& lst = octave_value_list ()) const;
 
   bool all_strings_p (void) const;