--- epiphany-2.14.2.1/configure.ac	2006-05-29 21:21:48.000000000 +0100
+++ epiphany-2.14.2.1-alex/configure.ac	2006-07-22 13:25:22.000000000 +0100
@@ -190,7 +190,7 @@
 # First build a test program to see whether compiling and running XPCOM
 # programs works at all, so we don't get false test failures below
 
-GECKO_XPCOM_PROGRAM_CHECK
+#GECKO_XPCOM_PROGRAM_CHECK
 
 # Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
 
@@ -274,29 +274,30 @@
 
 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])
+#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])
+have_broken_typeaheadfind=no
 
 AC_MSG_RESULT([$have_broken_typeaheadfind])
 
@@ -381,8 +382,8 @@
 	REQUIRED_EXTENSIONS="$REQUIRED_EXTENSIONS,permissions"
 fi
 
-GECKO_CHECK_CONTRACTIDS([$REQUIRED_CONTRACTS],
-	[],[AC_MSG_ERROR([$gecko_cv_gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])])
+#GECKO_CHECK_CONTRACTIDS([$REQUIRED_CONTRACTS],
+#	[],[AC_MSG_ERROR([$gecko_cv_gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])])
 
 # Needed since 1.8b2
 # Define this down here so it doesn't affect the API checks above