# HG changeset patch # User Rik # Date 1259818931 28800 # Node ID 84a7c11ff928c1c34185a78e33d5d93ca2c4ded7 # Parent f0f19b51b5d074b324c0e6a3001c313a7eab48ba Correctly compile even when libcurl is not present according to configure Missing ifdefs surrounding code dependent on libcurl prevented compilation when the library was not present. diff -r f0f19b51b5d0 -r 84a7c11ff928 src/ChangeLog --- a/src/ChangeLog Wed Dec 02 20:34:01 2009 -0800 +++ b/src/ChangeLog Wed Dec 02 21:42:11 2009 -0800 @@ -1,3 +1,8 @@ +2009-12-02 Rik + + * DLD-FUNCTIONS/urlwrite.cc: Correctly compile code even when libcurl is + not present according to configure. + 2009-12-01 Jaroslav Hajek * ov-bool-mat.h (octave_bool_matrix::octave_bool_matrix (const diff -r f0f19b51b5d0 -r 84a7c11ff928 src/DLD-FUNCTIONS/urlwrite.cc --- a/src/DLD-FUNCTIONS/urlwrite.cc Wed Dec 02 20:34:01 2009 -0800 +++ b/src/DLD-FUNCTIONS/urlwrite.cc Wed Dec 02 21:42:11 2009 -0800 @@ -48,7 +48,7 @@ #include "oct-map.h" #include "unwind-prot.h" -#if defined (HAVE_CURL) +#ifdef HAVE_CURL #include #include @@ -740,7 +740,7 @@ { octave_value_list retval; -#if defined (HAVE_CURL) +#ifdef HAVE_CURL int nargin = args.length (); @@ -900,7 +900,7 @@ // Octave's return value octave_value_list retval; -#if defined (HAVE_CURL) +#ifdef HAVE_CURL int nargin = args.length (); @@ -1423,6 +1423,7 @@ return octave_value (); } +#ifdef HAVE_CURL static string_vector mput_directory (const curl_handle& curl, const std::string& base, const std::string& dir) @@ -1509,6 +1510,7 @@ return retval; } +#endif DEFUN_DLD (__ftp_mput__, args, nargout, "-*- texinfo -*-\n\