diff --git a/build/configure.ac.enable b/build/configure.ac.enable
index e04b9f097..1e757fb6b 100644
--- a/build/configure.ac.enable
+++ b/build/configure.ac.enable
@@ -187,12 +187,18 @@ CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([REQUIRES],,[ ])dnl
 CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([CFLAGS NONPKGCONFIG_CFLAGS],,[ ])dnl
 CAIRO_ACCUMULATED_FEATURE_VARS_REGISTER([LIBS NONPKGCONFIG_LIBS],,[ ],[$LIBS])dnl
 AC_SUBST(CAIRO_REQUIRES)dnl
-AC_SUBST(CAIRO_BASE)dnl
 AC_SUBST(CAIRO_CFLAGS)dnl
 AC_SUBST(CAIRO_NONPKGCONFIG_CFLAGS)dnl
 AC_SUBST(CAIRO_LIBS)dnl
 AC_SUBST(CAIRO_NONPKGCONFIG_LIBS)dnl
 
+dnl add non-pkgconfig values
+AC_CONFIG_COMMANDS_PRE(
+[dnl
+CAIRO_CFLAGS="$CAIRO_CFLAGS $CAIRO_NONPKGCONFIG_CFLAGS"
+CAIRO_LIBS="$CAIRO_LIBS $CAIRO_NONPKGCONFIG_LIBS"
+])dnl
+
 m4_define([_CAIRO_FEATURE_CONFIG_PKGCONFIG_FILE],
 [dnl
 	AC_CONFIG_FILES([$3:$4],