Third round...

configure

@@ -7083,32 +7083,14 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$Cairo_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (cairo >= 1.2.0) were not met:
 
-$Cairo_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables Cairo_CFLAGS
-and Cairo_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+      have_cairo=false
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
 
-Alternatively, you may set the environment variables Cairo_CFLAGS
-and Cairo_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+      have_cairo=false
 
 else
 	Cairo_CFLAGS=$pkg_cv_Cairo_CFLAGS
@@ -7257,32 +7239,14 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GDK_pixbuf_2_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gdk-pixbuf-2.0) were not met:
-
-$GDK_pixbuf_2_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
 
-Alternatively, you may set the environment variables GDK_pixbuf_2_CFLAGS
-and GDK_pixbuf_2_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+         have_gdk_pixbuf=false
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
 
-Alternatively, you may set the environment variables GDK_pixbuf_2_CFLAGS
-and GDK_pixbuf_2_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+         have_gdk_pixbuf=false
 
 else
 	GDK_pixbuf_2_CFLAGS=$pkg_cv_GDK_pixbuf_2_CFLAGS
@@ -7358,32 +7322,14 @@ fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$GDK_pixbuf_2_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gdk-pixbuf-2.0) were not met:
 
-$GDK_pixbuf_2_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDK_pixbuf_2_CFLAGS
-and GDK_pixbuf_2_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+         have_gdk_pixbuf=false
 
 elif test $pkg_failed = untried; then
      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDK_pixbuf_2_CFLAGS
-and GDK_pixbuf_2_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+         have_gdk_pixbuf=false
 
 else
 	GDK_pixbuf_2_CFLAGS=$pkg_cv_GDK_pixbuf_2_CFLAGS

configure.ac

@@ -174,7 +174,9 @@ AS_IF([test "x$enable_cairo" != "xno"],
    [
       have_cairo=true
       AC_DEFINE([HAVE_CAIRO], [1], [Define to 1 if Cairo is available])
-   ], [])
+   ], [
+      have_cairo=false
+   ])
 ], [
    AC_MSG_RESULT([no])
 ])
@@ -193,7 +195,9 @@ AS_IF([test "x$enable_gdk_pixbuf" != "xno"],
          AC_DEFINE([HAVE_GDK_PIXBUF], [1],
                    [Define to 1 if gdk-pixbuf is available])
          have_gdk_pixbuf=true
-      ], [])
+      ], [
+         have_gdk_pixbuf=false
+      ])
    ])
 ], [
    AC_MSG_RESULT([no])