svnno****@sourc*****
svnno****@sourc*****
Wed Feb 20 07:59:51 JST 2008
Revision: 3366
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3366
Author: ikezoe
Date: 2008-02-20 07:59:51 +0900 (Wed, 20 Feb 2008)
Log Message:
-----------
2008-02-20 Hiroyuki Ikezoe <poinc****@ikezo*****>
* macro/gecko.m4: Support for libxul-unstable.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/macros/gecko.m4
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-02-19 22:12:47 UTC (rev 3365)
+++ kazehakase/trunk/ChangeLog 2008-02-19 22:59:51 UTC (rev 3366)
@@ -1,3 +1,7 @@
+2008-02-20 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * macro/gecko.m4: Support for libxul-unstable.
+
2008-02-19 Hiroyuki Ikezoe <poinc****@ikezo*****>
* module/embed/gecko/gtkmozembed/EmbedWindow.cpp,
Modified: kazehakase/trunk/macros/gecko.m4
===================================================================
--- kazehakase/trunk/macros/gecko.m4 2008-02-19 22:12:47 UTC (rev 3365)
+++ kazehakase/trunk/macros/gecko.m4 2008-02-19 22:59:51 UTC (rev 3366)
@@ -30,8 +30,8 @@
AM_CXXFLAGS=$_SAVE_AM_CXXFLAGS
fi
-CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/widget -I$MOZILLA_INCLUDE_ROOT/layout -I$MOZILLA_INCLUDE_ROOT/helperAppDlg -I$MOZILLA_INCLUDE_ROOT/dom -I$MOZILLA_INCLUDE_ROOT/exthandler -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/necko -I$MOZILLA_INCLUDE_ROOT/gfx -I$MOZILLA_INCLUDE_ROOT/content -I$MOZILLA_INCLUDE_ROOT/locale -I$MOZILLA_INCLUDE_ROOT/docshell -I$MOZILLA_INCLUDE_ROOT/mimetype -I$MOZILLA_INCLUDE_ROOT/nkcache `$PKG_CONFIG --cflags-only-I $GECKO-xpcom` -Wconversion -Wsign-compare -Werror"
-CXXFLAGS="$AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO-xpcom`"
+CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/widget -I$MOZILLA_INCLUDE_ROOT/layout -I$MOZILLA_INCLUDE_ROOT/helperAppDlg -I$MOZILLA_INCLUDE_ROOT/dom -I$MOZILLA_INCLUDE_ROOT/exthandler -I$MOZILLA_INCLUDE_ROOT/pipnss -I$MOZILLA_INCLUDE_ROOT/necko -I$MOZILLA_INCLUDE_ROOT/gfx -I$MOZILLA_INCLUDE_ROOT/content -I$MOZILLA_INCLUDE_ROOT/locale -I$MOZILLA_INCLUDE_ROOT/docshell -I$MOZILLA_INCLUDE_ROOT/mimetype -I$MOZILLA_INCLUDE_ROOT/nkcache `$PKG_CONFIG --cflags-only-I $GECKO_MODULE` -Wconversion -Wsign-compare -Werror"
+CXXFLAGS="$AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO_MODULE`"
AC_MSG_RESULT([$CXXFLAGS])
dnl **************************************************************
@@ -49,7 +49,7 @@
gecko_version=`cat $MOZILLA_INCLUDE_ROOT/mozilla-config.h | grep MOZILLA_VERSION_U | awk '{ print $[3]; }' | tr ".ab+" " "`
if test -z "$gecko_version"; then
- gecko_version="1 7"
+ gecko_version="1 9"
fi
gecko_version_major=`echo $gecko_version | awk '{ print $[1]; }'`
@@ -281,8 +281,8 @@
GECKO=
AC_ARG_WITH([gecko_engine],
- AS_HELP_STRING([--with-gecko-engine@<:@=mozilla|firefox|thunderbird|seamonkey|xulrunner@:>@],
- [Whether to use mozilla, firefox or thunderbird or seamonkey xpcom (default: mozilla)]),
+ AS_HELP_STRING([--with-gecko-engine@<:@=mozilla|firefox|xulrunner@:>@],
+ [Whether to use mozilla, firefox xpcom (default: mozilla)]),
[GECKO="$withval"])
AC_MSG_CHECKING([for gecko engine])
@@ -298,16 +298,14 @@
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 thunderbird-xpcom; then
- GECKO=thunderbird
elif $PKG_CONFIG --exists xulrunner-xpcom; then
GECKO=xulrunner
+ elif $PKG_CONFIG --exists libxul-unstable; then
+ GECKO=libxul
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
+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
AC_MSG_ERROR([unknown gecko engine name ($GECKO)])
fi
@@ -323,11 +321,10 @@
case "$GECKO" in
mozilla) min_version=1.7 ;;
- seamonkey) min_version=1.0 ;;
firefox) min_version=1.0 ;;
mozilla-firefox) min_version=1.0 ;;
- thunderbird) min_version=0.8 ;;
xulrunner) min_version=1.8 ;;
+ libxul) min_version=1.9 ;;
esac
dnl **************************************************************
@@ -339,9 +336,13 @@
if test x"$enable_gtkmozembed" = "xyes"; then
GECKO_MODULE=$GECKO-xpcom
else
- GECKO_MODULE=$GECKO-gtkmozembed
+ if test x"$GECKO" = "xlibxul"; then
+ GECKO_MODULE=$GECKO-embedding-unstable
+ else
+ GECKO_MODULE=$GECKO-gtkmozembed
+ fi
fi
-
+
PKG_CHECK_MODULES(MOZILLA_COMPONENT, $GECKO_MODULE >= $min_version)
AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
@@ -350,20 +351,20 @@
MOZILLA_COMPONENT_VERSION="`$PKG_CONFIG --modversion $GECKO_MODULE`"
AC_SUBST(MOZILLA_COMPONENT_VERSION)
- MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $GECKO-xpcom`"
- mozilla_include_type="`$PKG_CONFIG --variable=includetype $GECKO-xpcom`"
- if test x"$mozilla_include_type" = "xstable"; then
+ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $GECKO_MODULE`"
+ mozilla_include_type="`$PKG_CONFIG --variable=includetype $GECKO_MODULE`"
+ if test x"$mozilla_include_type" = "xunstable"; then
MOZILLA_INCLUDE_ROOT="$MOZILLA_INCLUDE_ROOT/unstable"
fi
AC_SUBST(MOZILLA_INCLUDE_ROOT)
- MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $GECKO-xpcom`"
+ MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $GECKO_MODULE`"
if test -z "$MOZILLA_HOME"; then
- MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $GECKO-xpcom`"
+ MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $GECKO_MODULE`"
fi
AC_SUBST(MOZILLA_HOME)
- MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $GECKO-xpcom`"
+ MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $GECKO_MODULE`"
AC_SUBST(MOZILLA_PREFIX)
KAZEHAKASE_GECKO_API_CHECK