From b18bbc79c18be7bd72f8c276979a5b3c0a262b27 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Wed, 24 Nov 2004 20:00:59 +0000
Subject: Adapt to changing mozilla API here.

2004-11-24  Christian Persch  <chpe@cvs.gnome.org>

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

	Adapt to changing mozilla API here.
---
 configure.ac | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index a489613af..fb186d61e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -285,7 +285,7 @@ AC_COMPILE_IFELSE(
 		  nsIURI *arg1;
 		  p->RemovePage(arg1);]]
 	)],
-	[AC_DEFINE([MOZ_NSIGLOBALHISTORY_NSIURIP],[1],[dummy]) result=yes],
+	[AC_DEFINE([MOZ_NSIGLOBALHISTORY_NSIURIP],[1],[Define if nsIBrowserHistory methods expect nsIURI*]) result=yes],
 	[result=no])
 
 AC_MSG_RESULT([$result])
@@ -303,7 +303,7 @@ AC_COMPILE_IFELSE(
 		[[nsIBrowserHistory *p;
 		  p->AddPageWithDetails(nsnull,nsnull,0);]]
 	)],
-	[AC_DEFINE([MOZ_NSIBROWSERHISTORY_ADDPAGEWITHDETAILS],[1],[dummy]) result=yes],
+	[AC_DEFINE([MOZ_NSIBROWSERHISTORY_ADDPAGEWITHDETAILS],[1],[Define if nsIBrowserHistory::AddPageWithDetails exists]) result=yes],
 	[result=no])
 
 AC_MSG_RESULT([$result])
@@ -321,7 +321,7 @@ AC_COMPILE_IFELSE(
 		[[nsIBrowserHistory *p;
 		  p->AddURI(nsnull,PR_FALSE,PR_FALSE,nsnull);]]
 	)],
-	[AC_DEFINE([MOZ_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER],[1],[dummy]) result=yes],
+	[AC_DEFINE([MOZ_NSIBROWSERHISTORY_ADDURI_WITH_REFERRER],[1],[Define if nsIGlobalHistory2::AddURI takes a referrer]) result=yes],
 	[result=no])
 
 AC_MSG_RESULT([$result])
@@ -337,7 +337,7 @@ AC_COMPILE_IFELSE(
 		[[nsIXULChromeRegistry *p;
 		  p->SelectSkin (nsEmbedCString(), PR_FALSE);]]
 	)],
-	[AC_DEFINE([MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN],[1],[dummy]) result=yes],
+	[AC_DEFINE([MOZ_NSIXULCHROMEREGISTRY_SELECTSKIN],[1],[Define if nsIXULChromeRegistry::SelectSkin exists]) result=yes],
 	[result=no])
 
 AC_MSG_RESULT([$result])
@@ -357,7 +357,25 @@ AC_COMPILE_IFELSE(
 		[[nsIDOMNSEvent *p;
 		  p->GetIsTrusted (nsnull);]]
 	)],
-	[AC_DEFINE([MOZ_NSIDOMNSEVENT_GETISTRUSTED],[1],[dummy]) result=yes],
+	[AC_DEFINE([MOZ_NSIDOMNSEVENT_GETISTRUSTED],[1],[Define if nsIDOMNSEvent::GetIsTrusted exists]) result=yes],
+	[result=no])
+
+AC_MSG_RESULT([$result])
+
+dnl Added in 1.8a6 on trunk
+dnl https://bugzilla.mozilla.org/show_bug.cgi?id=223310
+AC_MSG_CHECKING([whether nsIKeygenThread takes an nsIObserver])
+
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(
+		[[#include <pipnss/nsIKeygenThread.h>
+		  #include <nsIObserver.h>]],
+		[[nsIKeygenThread *p;
+		  nsIObserver *obs;
+		  p->StartKeyGeneration (obs);]]
+	)],
+	[AC_DEFINE([HAVE_NSIKEYGENTHREAD_NSIOBSERVER],[1],
+		   [Define if nsIKeygenThread::StartKeyGeneration takes an nsIObserver]) result=yes],
 	[result=no])
 
 AC_MSG_RESULT([$result])
-- 
cgit v1.2.3