[packages/epiphany.git] / epiphany-no_typeaheadfind_check.patch

--- configure.ac.orig	2006-12-29 22:39:59.000000000 +0100
+++ configure.ac	2006-12-30 23:19:57.000000000 +0100
@@ -264,48 +264,6 @@
 
 AC_MSG_RESULT([$have_psm])
 
-# This is only present on toolkit
-
-if test "$gecko_cv_gecko_flavour" = "toolkit"; then
-
-AC_DEFINE([HAVE_TYPEAHEADFIND],[1],[Define if we have tookit's typeaheadfind])
-
-# Make sure we DON'T have the typeaheadfind extension
-
-AC_MSG_CHECKING([whether typeaheadfind is broken])
-
-GECKO_RUN_IFELSE([],
-[GECKO_XPCOM_PROGRAM(
-[[#include <nsIComponentRegistrar.h>]],
-[[
-status = 99;
-nsCOMPtr<nsIComponentRegistrar> registrar;
-rv = NS_GetComponentRegistrar (getter_AddRefs (registrar));
-if (NS_FAILED (rv)) break;
-
-status = 98;
-nsCID *classID = nsnull;
-rv = registrar->ContractIDToCID ("@mozilla.org/typeaheadfind;1", &classID);
-if (NS_FAILED (rv) || !classID) break;
-
-nsCID badClassID = { 0x46590685, 0xbc00, 0x4aac,
-		     { 0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4 } };
-
-status = classID->Equals (badClassID) ? 97 : EXIT_SUCCESS;
-]]
-)],
-[have_broken_typeaheadfind=no],
-[have_broken_typeaheadfind=yes],
-[have_broken_typeaheadfind=maybe])
-
-AC_MSG_RESULT([$have_broken_typeaheadfind])
-
-if test "$have_broken_typeaheadfind" = "yes"; then
-	AC_MSG_ERROR([You must not compile $gecko_cv_gecko with the "typeaheadfind" extension enabled!])
-fi
-
-fi # gecko_cv_gecko_flavour = toolkit
-
 # Make sure we don't accidentally build without PSM support
 
 AC_MSG_CHECKING([whether to include PSM support])
Commit	Line	Data
aa905c57	1	--- configure.ac.orig 2006-12-29 22:39:59.000000000 +0100
	2	+++ configure.ac 2006-12-30 23:19:57.000000000 +0100
	3	@@ -264,48 +264,6 @@
	4
	5	AC_MSG_RESULT([$have_psm])
	6
	7	-# This is only present on toolkit
	8	-
	9	-if test "$gecko_cv_gecko_flavour" = "toolkit"; then
	10	-
	11	-AC_DEFINE([HAVE_TYPEAHEADFIND],[1],[Define if we have tookit's typeaheadfind])
	12	-
	13	-# Make sure we DON'T have the typeaheadfind extension
	14	-
	15	-AC_MSG_CHECKING([whether typeaheadfind is broken])
	16	-
	17	-GECKO_RUN_IFELSE([],
	18	-[GECKO_XPCOM_PROGRAM(
	19	-[[#include <nsIComponentRegistrar.h>]],
	20	-[[
	21	-status = 99;
	22	-nsCOMPtr<nsIComponentRegistrar> registrar;
	23	-rv = NS_GetComponentRegistrar (getter_AddRefs (registrar));
	24	-if (NS_FAILED (rv)) break;
	25	-
	26	-status = 98;
	27	-nsCID *classID = nsnull;
	28	-rv = registrar->ContractIDToCID ("@mozilla.org/typeaheadfind;1", &classID);
	29	-if (NS_FAILED (rv) \|\| !classID) break;
	30	-
	31	-nsCID badClassID = { 0x46590685, 0xbc00, 0x4aac,
	32	- { 0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4 } };
	33	-
	34	-status = classID->Equals (badClassID) ? 97 : EXIT_SUCCESS;
	35	-]]
	36	-)],
	37	-[have_broken_typeaheadfind=no],
	38	-[have_broken_typeaheadfind=yes],
	39	-[have_broken_typeaheadfind=maybe])
	40	-
	41	-AC_MSG_RESULT([$have_broken_typeaheadfind])
	42	-
	43	-if test "$have_broken_typeaheadfind" = "yes"; then
	44	- AC_MSG_ERROR([You must not compile $gecko_cv_gecko with the "typeaheadfind" extension enabled!])
	45	-fi
	46	-
	47	-fi # gecko_cv_gecko_flavour = toolkit
	48	-
	49	# Make sure we don't accidentally build without PSM support
	50
	51	AC_MSG_CHECKING([whether to include PSM support])