aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Persch <chpe@cvs.gnome.org>2005-07-13 00:34:01 +0800
committerChristian Persch <chpe@src.gnome.org>2005-07-13 00:34:01 +0800
commitf47ca89ba54f3954646ed97c8c0d69e5903ee5f1 (patch)
treea9639f15702945142323eb5362033d543e67943e
parent5e7d713ce0280257ff8529a044417fd90123601d (diff)
downloadgsoc2013-epiphany-f47ca89ba54f3954646ed97c8c0d69e5903ee5f1.tar
gsoc2013-epiphany-f47ca89ba54f3954646ed97c8c0d69e5903ee5f1.tar.gz
gsoc2013-epiphany-f47ca89ba54f3954646ed97c8c0d69e5903ee5f1.tar.bz2
gsoc2013-epiphany-f47ca89ba54f3954646ed97c8c0d69e5903ee5f1.tar.lz
gsoc2013-epiphany-f47ca89ba54f3954646ed97c8c0d69e5903ee5f1.tar.xz
gsoc2013-epiphany-f47ca89ba54f3954646ed97c8c0d69e5903ee5f1.tar.zst
gsoc2013-epiphany-f47ca89ba54f3954646ed97c8c0d69e5903ee5f1.zip
Detect seamonkey trunk.
2005-07-12 Christian Persch <chpe@cvs.gnome.org> * configure.ac: Detect seamonkey trunk.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac50
2 files changed, 33 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index 02df68f6a..7df3911d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
* configure.ac:
+ Detect seamonkey trunk.
+
+2005-07-12 Christian Persch <chpe@cvs.gnome.org>
+
+ * configure.ac:
+
Update min-versions for mozilla dependency.
2005-07-11 Christian Persch <chpe@cvs.gnome.org>
diff --git a/configure.ac b/configure.ac
index 49f5590ef..15e377890 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
dnl Copyright (C) 2000-2004 Marco Pesenti Gritti
-dnl Copyright (C) 2003, 2004 Christian Persch
+dnl Copyright (C) 2003, 2004, 2005 Christian Persch
dnl
dnl This program is free software; you can redistribute it and/or modify it
dnl under the terms of the GNU General Public License as published by the
@@ -162,37 +162,41 @@ dnl *******
AC_MSG_CHECKING([which mozilla to use])
-MOZILLA=
AC_ARG_WITH([mozilla],
AS_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird@:>@],
- [Whether to use mozilla, firefox or thunderbird gtkmozembed (default: mozilla)]),
- [MOZILLA="$withval"])
-
-dnl try to autodetect: if mozilla exists, use it, else try firefox, then thunderbird
-if test "x$MOZILLA" = "x"; then
- if $PKG_CONFIG --exists firefox-gtkmozembed; then
- MOZILLA=firefox
- elif $PKG_CONFIG --exists mozilla-gtkmozembed; then
- MOZILLA=mozilla
- elif $PKG_CONFIG --exists thunderbird-gtkmozembed; then
- MOZILLA=thunderbird
- else
- AC_MSG_ERROR([no mozilla installation found])
- fi
-elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"; then
- AC_MSG_ERROR([unknown mozilla name ($MOZILLA)])
+ [Which gecko engine to use (default: autodetect)]))
+
+GECKOS="firefox mozilla-firefox seamonkey mozilla thunderbird mozilla-thunderbird"
+gecko=$with_mozilla
+
+if test "x$gecko" = "x"; then
+ dnl Autodetect gecko
+ for g in $GECKOS; do
+ if $PKG_CONFIG --exists $g-xpcom; then
+ gecko=$g
+ break;
+ fi
+ done
fi
-AC_SUBST(MOZILLA)
+if test "x$gecko" = "x"; then
+ AC_MSG_ERROR([No gecko found])
+elif ! ( echo "$GECKOS" | egrep "(^| )$gecko(\$| )" > /dev/null); then
+ AC_MSG_ERROR([Unknown gecko "$gecko" specified])
+fi
-AC_MSG_RESULT([$MOZILLA])
+AC_MSG_RESULT([$gecko])
-case "$MOZILLA" in
+case "$gecko" in
mozilla) min_version=1.7.5 flavour=mozilla ;;
-firefox) min_version=1.0 flavour=toolkit ;;
-thunderbird) min_version=1.0 flavour=toolkit ;;
+seamonkey) min_version=1.0 flavour=mozilla ;;
+*firefox) min_version=1.0 flavour=toolkit ;;
+*thunderbird) min_version=1.0 flavour=toolkit ;;
esac
+MOZILLA=$gecko
+AC_SUBST([MOZILLA])
+
MOZILLA_FLAVOUR=$flavour
AC_SUBST(MOZILLA_FLAVOUR)