diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | m4/gecko.m4 | 8 |
2 files changed, 14 insertions, 3 deletions
@@ -1,4 +1,11 @@ -2006-04-13 Christian Persch <chpe@cvs.gnome.org> +2006-04-17 Chhristian Persch <chpe@cvs.gnome.org> + + * m4/gecko.m4: + + Also allow cairo-gtk2 builds. + Builds but segfaults on startup. + +2006-04-17 Christian Persch <chpe@cvs.gnome.org> * configure.ac: * embed/mozilla/GtkNSSDialogs.cpp: diff --git a/m4/gecko.m4 b/m4/gecko.m4 index 0f53ae54a..56c8b634e 100644 --- a/m4/gecko.m4 +++ b/m4/gecko.m4 @@ -182,8 +182,13 @@ AC_RUN_IFELSE( [AC_LANG_SOURCE( [[#include <mozilla-config.h> #include <string.h> + #include <stdlib.h> int main(void) { - return strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") != 0; + if (strcmp (MOZ_DEFAULT_TOOLKIT, "gtk2") == 0 || + strcmp (MOZ_DEFAULT_TOOLKIT, "cairo-gtk2") == 0) + return EXIT_SUCCESS; + + return EXIT_FAILURE; } ]] )], [result=yes], @@ -396,7 +401,6 @@ AC_DEFUN([GECKO_XPCOM_PROGRAM], [[ // redirect unwanted mozilla debug output to the bit bucket freopen ("/dev/null", "w", stdout); -//freopen ("/dev/null", "w", stderr); nsresult rv; nsCOMPtr<nsILocalFile> directory; |