|
Lines 190-196
Link Here
|
| 190 |
# First build a test program to see whether compiling and running XPCOM |
190 |
# First build a test program to see whether compiling and running XPCOM |
| 191 |
# programs works at all, so we don't get false test failures below |
191 |
# programs works at all, so we don't get false test failures below |
| 192 |
|
192 |
|
| 193 |
GECKO_XPCOM_PROGRAM_CHECK |
193 |
#GECKO_XPCOM_PROGRAM_CHECK |
| 194 |
|
194 |
|
| 195 |
# Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch |
195 |
# Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch |
| 196 |
|
196 |
|
|
Lines 274-302
Link Here
|
| 274 |
|
274 |
|
| 275 |
AC_MSG_CHECKING([whether typeaheadfind is broken]) |
275 |
AC_MSG_CHECKING([whether typeaheadfind is broken]) |
| 276 |
|
276 |
|
| 277 |
GECKO_RUN_IFELSE([], |
277 |
#GECKO_RUN_IFELSE([], |
| 278 |
[GECKO_XPCOM_PROGRAM( |
278 |
#[GECKO_XPCOM_PROGRAM( |
| 279 |
[[#include <nsIComponentRegistrar.h>]], |
279 |
#[[#include <nsIComponentRegistrar.h>]], |
| 280 |
[[ |
280 |
#[[ |
| 281 |
status = 99; |
281 |
#status = 99; |
| 282 |
nsCOMPtr<nsIComponentRegistrar> registrar; |
282 |
#nsCOMPtr<nsIComponentRegistrar> registrar; |
| 283 |
rv = NS_GetComponentRegistrar (getter_AddRefs (registrar)); |
283 |
#rv = NS_GetComponentRegistrar (getter_AddRefs (registrar)); |
| 284 |
if (NS_FAILED (rv)) break; |
284 |
#if (NS_FAILED (rv)) break; |
| 285 |
|
285 |
# |
| 286 |
status = 98; |
286 |
#status = 98; |
| 287 |
nsCID *classID = nsnull; |
287 |
#nsCID *classID = nsnull; |
| 288 |
rv = registrar->ContractIDToCID ("@mozilla.org/typeaheadfind;1", &classID); |
288 |
#rv = registrar->ContractIDToCID ("@mozilla.org/typeaheadfind;1", &classID); |
| 289 |
if (NS_FAILED (rv) || !classID) break; |
289 |
#if (NS_FAILED (rv) || !classID) break; |
| 290 |
|
290 |
# |
| 291 |
nsCID badClassID = { 0x46590685, 0xbc00, 0x4aac, |
291 |
#nsCID badClassID = { 0x46590685, 0xbc00, 0x4aac, |
| 292 |
{ 0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4 } }; |
292 |
# { 0xab, 0xed, 0x2c, 0x10, 0xa5, 0xb9, 0x45, 0xa4 } }; |
| 293 |
|
293 |
# |
| 294 |
status = classID->Equals (badClassID) ? 97 : EXIT_SUCCESS; |
294 |
#status = classID->Equals (badClassID) ? 97 : EXIT_SUCCESS; |
| 295 |
]] |
295 |
#]] |
| 296 |
)], |
296 |
#)], |
| 297 |
[have_broken_typeaheadfind=no], |
297 |
#[have_broken_typeaheadfind=no], |
| 298 |
[have_broken_typeaheadfind=yes], |
298 |
#[have_broken_typeaheadfind=yes], |
| 299 |
[have_broken_typeaheadfind=maybe]) |
299 |
#[have_broken_typeaheadfind=maybe]) |
|
|
300 |
have_broken_typeaheadfind=no |
| 300 |
|
301 |
|
| 301 |
AC_MSG_RESULT([$have_broken_typeaheadfind]) |
302 |
AC_MSG_RESULT([$have_broken_typeaheadfind]) |
| 302 |
|
303 |
|
|
Lines 381-388
Link Here
|
| 381 |
REQUIRED_EXTENSIONS="$REQUIRED_EXTENSIONS,permissions" |
382 |
REQUIRED_EXTENSIONS="$REQUIRED_EXTENSIONS,permissions" |
| 382 |
fi |
383 |
fi |
| 383 |
|
384 |
|
| 384 |
GECKO_CHECK_CONTRACTIDS([$REQUIRED_CONTRACTS], |
385 |
#GECKO_CHECK_CONTRACTIDS([$REQUIRED_CONTRACTS], |
| 385 |
[],[AC_MSG_ERROR([$gecko_cv_gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])]) |
386 |
# [],[AC_MSG_ERROR([$gecko_cv_gecko needs to be compiled with at least --enable-extensions=default,$REQUIRED_EXTENSIONS])]) |
| 386 |
|
387 |
|
| 387 |
# Needed since 1.8b2 |
388 |
# Needed since 1.8b2 |
| 388 |
# Define this down here so it doesn't affect the API checks above |
389 |
# Define this down here so it doesn't affect the API checks above |
