--- configure.ac.old	2011-07-13 16:04:23.000000000 +0200
+++ configure.ac.old	2011-07-13 16:06:36.000000000 +0200
@@ -259,13 +259,17 @@ 
 LIBJPEG=""
 libjpeg_msg="no"
 AC_SUBST(LIBJPEG)
-AC_CHECK_LIB(jpeg,jpeg_start_decompress,[
-	AC_CHECK_HEADER(jpeglib.h,[
-		AC_DEFINE(HAVE_LIBJPEG,1,[define if we found LIBJPEG and its headers])
-		LIBJPEG="-ljpeg"
-		libjpeg_msg="yes"
+AC_ARG_WITH([jpeg], AS_HELP_STRING([--without-jpeg], [Build without jpeg library (default: no)]))
+AS_IF([test "x$with_jpeg" != "xno"], [
+	AC_CHECK_LIB(jpeg,jpeg_start_decompress,[
+		AC_CHECK_HEADER(jpeglib.h,[
+			AC_DEFINE(HAVE_LIBJPEG,1,[define if we found LIBJPEG and its headers])
+			LIBJPEG="-ljpeg"
+			libjpeg_msg="yes"
+		])
 	])
 ])
+
 GP_CONFIG_MSG([JPEG mangling support],[${libjpeg_msg}])
 
 dnl ---------------------------------------------------------------------------