diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/gecko.m4 | 11 |
3 files changed, 13 insertions, 7 deletions
@@ -3,6 +3,13 @@ * configure.ac: * m4/gecko.m4: + Tiny output improvements. + +2005-11-09 Christian Persch <chpe@cvs.gnome.org> + + * configure.ac: + * m4/gecko.m4: + Add check for contract IDs which we need but are only provided by extensions which may or may not have been built into gecko. We cannot check for the headers here since they are always present. diff --git a/configure.ac b/configure.ac index 85b5b748a..fcd5f409a 100644 --- a/configure.ac +++ b/configure.ac @@ -408,7 +408,7 @@ fi dnl Check for some contractIDs that we need but are provided by extensions dnl which may or may not have been built. -GECKO_CHECK_CONTRACTID([PermissionsManager],[@mozilla.org/permissionmanager;1]) +GECKO_CHECK_CONTRACTID([PermissionManager],[@mozilla.org/permissionmanager;1]) GECKO_CHECK_CONTRACTID([CookiePermission],[@mozilla.org/cookie/permission;1]) dnl *************** diff --git a/m4/gecko.m4 b/m4/gecko.m4 index 29542fbd3..15ab200de 100644 --- a/m4/gecko.m4 +++ b/m4/gecko.m4 @@ -92,7 +92,6 @@ dnl ************************************************************** AC_LANG_PUSH([C++]) -_SAVE_CPPFLAGS=$CPPFLAGS _SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS -fshort-wchar" @@ -105,7 +104,7 @@ AC_CACHE_CHECK([for compiler -fshort-wchar option], } ]])], [gecko_cv_have_usable_wchar_option="yes"], [gecko_cv_have_usable_wchar_option="no"], - [gecko_cv_have_usable_wchar_option="maybe"])]) + [gecko_cv_have_usable_wchar_option="maybe (cross-compiling)"])]) CXXFLAGS="$_SAVE_CXXFLAGS" @@ -220,9 +219,9 @@ NS_ShutdownXPCOM (nsnull); exit (EXIT_SUCCESS); ]) ], -[gecko_cv_xpcom_contractid_[]$1[]=yes], -[gecko_cv_xpcom_contractid_[]$1[]=no], -[gecko_cv_xpcom_contractid_[]$1[]="no (cross-compiling)"]) +[gecko_cv_xpcom_contractid_[]$1[]=present], +[gecko_cv_xpcom_contractid_[]$1[]="not present"], +[gecko_cv_xpcom_contractid_[]$1[]="not present (cross-compiling)"]) CPPFLAGS="$_SAVE_CPPFLAGS" CXXFLAGS="$_SAVE_CXXFLAGS" @@ -232,7 +231,7 @@ AC_LANG_POP([C++]) ]) -if test "$gecko_cv_xpcom_contractid_[]$1" = "yes"; then +if test "$gecko_cv_xpcom_contractid_[]$1" = "present"; then ifelse([$3],,[:],[$3]) else ifelse([$4],,[AC_MSG_FAILURE([dnl |