svnno****@sourc*****
svnno****@sourc*****
Wed Feb 20 10:29:45 JST 2008
Revision: 3369
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3369
Author: ikezoe
Date: 2008-02-20 10:29:45 +0900 (Wed, 20 Feb 2008)
Log Message:
-----------
support for seamonkey-1.1.
Modified Paths:
--------------
kazehakase/trunk/macros/gecko.m4
Modified: kazehakase/trunk/macros/gecko.m4
===================================================================
--- kazehakase/trunk/macros/gecko.m4 2008-02-20 01:00:07 UTC (rev 3368)
+++ kazehakase/trunk/macros/gecko.m4 2008-02-20 01:29:45 UTC (rev 3369)
@@ -249,9 +249,6 @@
AC_DEFINE([HAVE_NSIBADCERTLISTENER_H],[1],
[Define if mozilla nsIBadCertListener header is available])])
-AM_CONDITIONAL(HAVE_NSIBADCERTLISTENER_H,
- test "x$have_nsibadcertlistner_h" = "xyes")
-
dnl Check for nsIDocShell::GetSecurityUI
dnl This code is picked from galeon-1.3.21.
dnl nsIDocShell::GetSecurityUI was added in 1.8b2 as part of the fastback
@@ -281,8 +278,8 @@
GECKO=
AC_ARG_WITH([gecko_engine],
- AS_HELP_STRING([--with-gecko-engine@<:@=mozilla|firefox|xulrunner@:>@],
- [Whether to use mozilla, firefox xpcom (default: mozilla)]),
+ AS_HELP_STRING([--with-gecko-engine@<:@=mozilla|seamonkey|firefox|xulrunner@:>@],
+ [Whether to use mozilla, firefox seamonkey xpcom (default: mozilla)]),
[GECKO="$withval"])
AC_MSG_CHECKING([for gecko engine])
@@ -298,6 +295,8 @@
GECKO=mozilla-firefox
elif $PKG_CONFIG --exists mozilla-xpcom; then
GECKO=mozilla
+ elif $PKG_CONFIG --exists seamonkey-xpcom; then
+ GECKO=seamonkey
elif $PKG_CONFIG --exists xulrunner-xpcom; then
GECKO=xulrunner
elif $PKG_CONFIG --exists libxul-unstable; then
@@ -305,7 +304,7 @@
else
gecko_engine_not_found_message="not found"
fi
-elif test "x$with_gecko_engine" != "xlibxul" -a "x$with_gecko_engine" != "xmozilla" -a "x$with_gecko_engine" != "xfirefox" -a "x$with_gecko_engine" != "xmozilla-firefox" -a "x$with_gecko_engine" != "xxulrunner"; then
+elif test "x$with_gecko_engine" != "xlibxul" -a "x$with_gecko_engine" != "xseamonkey" -a "x$with_gecko_engine" != "xmozilla" -a "x$with_gecko_engine" != "xfirefox" -a "x$with_gecko_engine" != "xmozilla-firefox" -a "x$with_gecko_engine" != "xxulrunner"; then
AC_MSG_ERROR([unknown gecko engine name ($GECKO)])
fi
@@ -323,6 +322,7 @@
mozilla) min_version=1.7 ;;
firefox) min_version=1.0 ;;
mozilla-firefox) min_version=1.0 ;;
+ seamonkey) min_version=1.1 ;;
xulrunner) min_version=1.8 ;;
libxul) min_version=1.9 ;;
esac
@@ -390,4 +390,7 @@
AM_CONDITIONAL([MOZ_NO_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_],
[test "$no_nsicanvasrenderingcontextinternal_have_getinputstream" = "no"])
+AM_CONDITIONAL(HAVE_NSIBADCERTLISTENER_H,
+ test "x$have_nsibadcertlistner_h" = "xyes")
+
])