Merge remote-tracking branch 'origin/7.32'

ChangeLog

@@ -4,6 +4,7 @@
 - removed some left-over debugging code from configure.ac
 - better handling of args without values, thanks Ruven
 - better error messages from vips.c
+- im_jpeg2vips.c builds without jpeglib.h, thanks Alessandro
 
 6/2/13 started 7.32.1
 - fix --without-lcms, thanks speckins

libvips/deprecated/im_jpeg2vips.c

@@ -44,13 +44,15 @@
 #include <vips/intl.h>
 
 #include <stdlib.h>
+#include <setjmp.h>
 
 #include <vips/vips.h>
 
-#include <setjmp.h>
+#ifdef HAVE_JPEG
 #include <jpeglib.h>
 #include <jerror.h>
 #include "../foreign/jpeg.h"
+#endif /*HAVE_JPEG*/
 
 static int
 jpeg2vips( const char *name, IMAGE *out, gboolean header_only )
@@ -116,7 +118,8 @@ jpeg2vips( const char *name, IMAGE *out, gboolean header_only )
 		header_only, shrink, fail_on_warn ) )
 		return( -1 );
 #else
-	vips_error( "im_jpeg2vips", _( "no JPEG support in your libvips" ) ); 
+	vips_error( "im_jpeg2vips", 
+		"%s", _( "no JPEG support in your libvips" ) ); 
 
 	return( -1 );
 #endif /*HAVE_JPEG*/

libvips/iofuncs/base64.c

@@ -15,7 +15,8 @@
  * 
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301  USA
  * 
  * \section{Base-64 Routines}
  *