From 8da361470fb8a4e11c7292dbfc57e3dafef7b7f0 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 4 Sep 2008 21:59:27 -0400
Subject: [PATCH] [configure.in] Forbid arbitrary CAIRO_ patterns in the output

---
 acinclude.m4    | 11 +++++++++--
 build/enable.ac |  7 +++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 196937089..09a8a4327 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,8 +2,6 @@ dnl -*- mode: autoconf -*-
 
 # serial 1
 
-m4_pattern_forbid([_CAIRO])
-
 dnl Usage:
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
 AC_DEFUN([GTK_DOC_CHECK],
@@ -120,6 +118,15 @@ esac
 ])# AX_C_FLOAT_WORDS_BIGENDIAN
 
 
+
+dnl ==========================================================================
+dnl
+dnl Cairo-specific macros
+dnl
+m4_pattern_forbid([CAIRO])
+
+dnl ==========================================================================
+
 dnl Usage:
 dnl   CAIRO_BIGENDIAN
 dnl
diff --git a/build/enable.ac b/build/enable.ac
index fd91cca60..649a99878 100644
--- a/build/enable.ac
+++ b/build/enable.ac
@@ -201,6 +201,7 @@ endif
 	])
 ])
 
+m4_pattern_allow(^CAIRO_HAS_)
 m4_define([_CAIRO_BUILD_FEATURE_NAME_NORMALIZED],
 	[CAIRO_HAS_[$1]m4_bmatch([$1],[$2$],,[$2])])
 
@@ -255,6 +256,7 @@ dnl Report
 dnl
 
 dnl Accumulator for warning messages
+m4_pattern_allow(^CAIRO_WARNING_MESSAGE$)
 CAIRO_WARNING_MESSAGE=""
 
 AC_DEFUN([CAIRO_REPORT],
@@ -346,6 +348,7 @@ dnl Generate {src,boilerplate}/Config.mk{,.win32}
 dnl
 
 dnl Accumulators
+m4_pattern_allow(^CAIRO_CONFIG_AMAKE$)
 CAIRO_CONFIG_AMAKE='# Generated by configure.  Do not edit.
 
 include $(top_srcdir)/src/Sources.mk
@@ -361,6 +364,7 @@ all_cairo_sources = $(cairo_sources)
 supported_cairo_headers = $(cairo_headers)
 unsupported_cairo_headers =
 '
+m4_pattern_allow(^CAIRO_CONFIG_WIN32$)
 CAIRO_CONFIG_WIN32=$CAIRO_CONFIG_AMAKE
 
 dnl Generate
@@ -378,8 +382,11 @@ dnl List of enabled, supported but disabled, and all supported features
 dnl
 
 dnl Accumulators
+m4_pattern_allow(^CAIRO_FEATURES$)
 CAIRO_FEATURES=""
+m4_pattern_allow(^CAIRO_NO_FEATURES$)
 CAIRO_NO_FEATURES=""
+m4_pattern_allow(^CAIRO_SUPPORTED_FEATURES$)
 CAIRO_SUPPORTED_FEATURES=""
 
 dnl Generate src/cairo-features.h and src/cairo-supported-features.h