aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChhristian Persch <chpe@cvs.gnome.org>2006-04-17 22:23:53 +0800
committerChristian Persch <chpe@src.gnome.org>2006-04-17 22:23:53 +0800
commitca5c5b595be26cc91a92abb9b7c61fead8e11e3e (patch)
treeb65acc3138173e3fecd4e1122eba4a49c2c429ae
parentd0fbb2dbdc437d122b4ebe33110bb926ffa34e8a (diff)
downloadgsoc2013-epiphany-ca5c5b595be26cc91a92abb9b7c61fead8e11e3e.tar
gsoc2013-epiphany-ca5c5b595be26cc91a92abb9b7c61fead8e11e3e.tar.gz
gsoc2013-epiphany-ca5c5b595be26cc91a92abb9b7c61fead8e11e3e.tar.bz2
gsoc2013-epiphany-ca5c5b595be26cc91a92abb9b7c61fead8e11e3e.tar.lz
gsoc2013-epiphany-ca5c5b595be26cc91a92abb9b7c61fead8e11e3e.tar.xz
gsoc2013-epiphany-ca5c5b595be26cc91a92abb9b7c61fead8e11e3e.tar.zst
gsoc2013-epiphany-ca5c5b595be26cc91a92abb9b7c61fead8e11e3e.zip
Also allow cairo-gtk2 builds. Builds but segfaults on startup.
2006-04-17 Chhristian Persch <chpe@cvs.gnome.org> * m4/gecko.m4: Also allow cairo-gtk2 builds. Builds but segfaults on startup.
-rw-r--r--ChangeLog9
-rw-r--r--m4/gecko.m48
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e74fa5ad..5022759e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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;