svnno****@sourc*****
svnno****@sourc*****
Wed Mar 21 14:14:50 JST 2007
Revision: 2940
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=2940
Author: kous
Date: 2007-03-21 14:14:50 +0900 (Wed, 21 Mar 2007)
Log Message:
-----------
* macros/gecko.m4: supported --without-gecko-engine.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/macros/gecko.m4
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-03-21 04:03:31 UTC (rev 2939)
+++ kazehakase/trunk/ChangeLog 2007-03-21 05:14:50 UTC (rev 2940)
@@ -1,5 +1,7 @@
2007-03-21 Kouhei Sutou <kou****@cozmi*****>
+ * macros/gecko.m4: supported --without-gecko-engine.
+
* Makefile.am (ACLOCAL_AMFLAGS): added for working auto re-automake.
* configure.in: renamed to ...
* configure.ac: ... this.
Modified: kazehakase/trunk/macros/gecko.m4
===================================================================
--- kazehakase/trunk/macros/gecko.m4 2007-03-21 04:03:31 UTC (rev 2939)
+++ kazehakase/trunk/macros/gecko.m4 2007-03-21 05:14:50 UTC (rev 2940)
@@ -224,8 +224,13 @@
[Whether to use mozilla, firefox or thunderbird or seamonkey xpcom (default: mozilla)]),
[GECKO="$withval"])
-dnl try to autodetect: if mozilla exists, use it, else try firefox, then thunderbird
-if test "x$GECKO" = "x"; then
+AC_MSG_CHECKING([for gecko engine])
+if test "x$GECKO" = "xno"; then
+ GECKO=
+ gecko_engine_not_found_message="disabled"
+elif test "x$GECKO" = "x"; then
+ dnl try to autodetect: if mozilla exists, use it, else try firefox,
+ dnl then thunderbird
if $PKG_CONFIG --exists firefox-xpcom; then
GECKO=firefox
elif $PKG_CONFIG --exists mozilla-firefox-xpcom; then
@@ -238,6 +243,8 @@
GECKO=thunderbird
elif $PKG_CONFIG --exists xulrunner-xpcom; then
GECKO=xulrunner
+ else
+ gecko_engine_not_found_message="not found"
fi
elif test "x$with_gecko_engine" != "xmozilla" -a "x$with_gecko_engine" != "xfirefox" -a "x$with_gecko_engine" != "xthunderbird" -a "x$with_gecko_engine" != "xseamonkey" -a "x$with_gecko_engine" != "xmozilla-firefox" -a "x$with_gecko_engine" != "xxulrunner"; then
AC_MSG_ERROR([unknown gecko engine name ($GECKO)])
@@ -245,7 +252,9 @@
AM_CONDITIONAL(WITH_GECKO, test "x$GECKO" != "x")
-if test "x$GECKO" != "x" ; then
+if test "x$GECKO" = "x"; then
+ AC_MSG_RESULT([$gecko_engine_not_found_message])
+else
AC_SUBST(GECKO)
AC_DEFINE([WITH_GECKO],[1],[Define using Gecko support])