From d0fbb2dbdc437d122b4ebe33110bb926ffa34e8a Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Mon, 17 Apr 2006 14:22:21 +0000
Subject: Check for nsIMutableArray.h and include it if found. Fixes build with

2006-04-13  Christian Persch  <chpe@cvs.gnome.org>

	* configure.ac:
	* embed/mozilla/GtkNSSDialogs.cpp:

	Check for nsIMutableArray.h and include it if found. Fixes build with
	gecko trunk.
---
 ChangeLog                       |  8 ++++++++
 configure.ac                    | 10 ++++++++++
 embed/mozilla/GtkNSSDialogs.cpp |  6 +++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e3e578d32..5e74fa5ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-13  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.ac:
+	* embed/mozilla/GtkNSSDialogs.cpp:
+
+	Check for nsIMutableArray.h and include it if found. Fixes build with
+	gecko trunk.
+
 2006-04-15  Tommi Komulainen  <tommi.komulainen@iki.fi>
 
 	* lib/widgets/ephy-location-entry.c (update_favicon): Replace
diff --git a/configure.ac b/configure.ac
index 6ee1d9e42..8b4a5ac23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -363,6 +363,16 @@ GECKO_CHECK_HEADERS([windowwatcher],[nsINonBlockingAlertService.h])
 
 GECKO_CHECK_HEADERS([docshell],[nsIGlobalHistory3.h])
 
+# Check for nsIIOService2.h
+# Added in 1.9
+
+GECKO_CHECK_HEADERS([necko],[nsIIOService2.h])
+
+# Check for nsIMutableArray.h
+# Split out into its own header in 1.9
+
+GECKO_CHECK_HEADERS([xpcom],[nsIMutableArray.h])
+	
 # Check for some contractIDs that we need but are provided by extensions
 # which may or may not have been built.
 
diff --git a/embed/mozilla/GtkNSSDialogs.cpp b/embed/mozilla/GtkNSSDialogs.cpp
index 72b85b7f7..c6489cf06 100644
--- a/embed/mozilla/GtkNSSDialogs.cpp
+++ b/embed/mozilla/GtkNSSDialogs.cpp
@@ -45,8 +45,12 @@
 #include <nsIASN1Sequence.h>
 #include <nsICRLInfo.h>
 #include <nsISimpleEnumerator.h>
-#include <nsIArray.h>
 #include <nsIDOMWindow.h>
+#include <nsIArray.h>
+#ifdef HAVE_NSIMUTABLEARRAY_H
+#include <nsIMutableArray.h>
+#endif
+
 #undef MOZILLA_INTERNAL_API
 #include <nsEmbedString.h>
 #define MOZILLA_INTERNAL_API 1
-- 
cgit v1.2.3