svnno****@sourc*****
svnno****@sourc*****
Sat Jan 5 01:03:18 JST 2008
Revision: 3324
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3324
Author: kous
Date: 2008-01-05 01:03:17 +0900 (Sat, 05 Jan 2008)
Log Message:
-----------
* macros/gecko.m4: supported xulrunner 1.9 detection.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/macros/gecko.m4
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2008-01-04 16:02:10 UTC (rev 3323)
+++ kazehakase/trunk/ChangeLog 2008-01-04 16:03:17 UTC (rev 3324)
@@ -1,5 +1,7 @@
2008-01-05 Kouhei Sutou <kou****@cozmi*****>
+ * macros/gecko.m4: supported xulrunner 1.9 detection.
+
* module/embed/gecko/*.{cpp,h}: removed needless <XXX/...> prefix
from #include.
Modified: kazehakase/trunk/macros/gecko.m4
===================================================================
--- kazehakase/trunk/macros/gecko.m4 2008-01-04 16:02:10 UTC (rev 3323)
+++ kazehakase/trunk/macros/gecko.m4 2008-01-04 16:03:17 UTC (rev 3324)
@@ -297,9 +297,16 @@
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="$MOZILLA_INCLUDE_ROOT/unstable"
+ fi
AC_SUBST(MOZILLA_INCLUDE_ROOT)
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $GECKO-xpcom`"
+ if test -z "$MOZILLA_HOME"; then
+ MOZILLA_HOME="`$PKG_CONFIG --variable=sdkdir $GECKO-xpcom`"
+ fi
AC_SUBST(MOZILLA_HOME)
MOZILLA_PREFIX="`$PKG_CONFIG --variable=prefix $GECKO-xpcom`"