--- gimp-2.2.7/configure.in	2005-04-11 05:42:07.000000000 -0400
+++ gimp-2.2.7.new/configure.in	2005-05-23 19:50:07.000000000 -0400
@@ -1095,11 +1095,20 @@
 # Check for gtkhtml2
 ####################
 
+AC_ARG_ENABLE(gtkhtml,
+        AC_HELP_STRING([--enable-gtkhtml],
+	               [build with gtkhtml (by default disabled)]),,
+	               [enable_gtkhtml=no])				
+if test "x$enable_gtkhtml" = xno; then
+	have_gtkhtml2=no
+else
 PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= gtkhtml2_required_version,
   have_gtkhtml2=yes,
   AC_MSG_WARN([*** Help browser plug-in will not be built (GtkHtml2 not found) ***]))
 AC_SUBST(GTKHTML2_CFLAGS)
 AC_SUBST(GTKHTML2_LIBS)
+fi
+
 AM_CONDITIONAL(BUILD_HELPBROWSER, test x$have_gtkhtml2 = xyes)
 
 
@@ -1107,10 +1116,17 @@
 # Check for librsvg
 ###################
 
+AC_ARG_ENABLE(svg,
+	AC_HELP_STRING([--enable-svg],
+		       [build with librsvg library (by default disabled)]),,
+	[enable_svg=no])
+
+if test "x$enable_svg" != xno; then		
 PKG_CHECK_MODULES(SVG, librsvg-2.0 >= rsvg_required_version,
   SVG='svg$(EXEEXT)'
   LIBSVG=$SVG_LIBS,
   AC_MSG_WARN([*** SVG import plug-in will not be built (librsvg not found) ***]))
+fi
 AC_SUBST(SVG)
 AC_SUBST(SVG_CFLAGS)
 AC_SUBST(LIBSVG)
@@ -1183,23 +1199,26 @@
 # Check for lcms
 ################
 
+AC_ARG_ENABLE(lcms, [  --disable-lcms    build without color proof support (requires lcms)])
+
 have_lcms=no
-AC_CHECK_LIB(lcms, cmsCreate_sRGBProfile, [
-  AC_CHECK_HEADER(lcms.h,
-    have_lcms=yes, [
-    AC_CHECK_HEADER(lcms/lcms.h,
-      have_lcms=yes
-      AC_DEFINE(HAVE_LCMS_LCMS_H, 1,
-        [Define to 1 if the lcms header must be included as lcms/lcms.h]))
-    ])
-])
+if test "x$enable_lcms" != "xno"; then
+  AC_CHECK_LIB(lcms, cmsCreate_sRGBProfile, [
+    AC_CHECK_HEADER(lcms.h,
+      have_lcms=yes, [
+      AC_CHECK_HEADER(lcms/lcms.h,
+        have_lcms=yes
+        AC_DEFINE(HAVE_LCMS_LCMS_H, 1,
+          [Define to 1 if the lcms header must be included as lcms/lcms.h]))
+      ])
+  ])
 
-if test $have_lcms = yes; then
-  LCMS_LIBS="-llcms"
-else
-  AC_MSG_WARN([*** color proof module will not be built (lcms not found or unuseable) ***])
+  if test $have_lcms = yes; then
+    LCMS_LIBS="-llcms"
+  else
+    AC_MSG_WARN([*** color proof module will not be built (lcms not found or unuseable) ***])
+  fi
 fi
-
 AC_SUBST(LCMS_LIBS)
 AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes)