Hiroyuki Ikezoe
ikezo****@users*****
Wed Mar 14 10:15:19 JST 2007
Index: kazehakase/macros/gecko.m4
diff -u kazehakase/macros/gecko.m4:1.4 kazehakase/macros/gecko.m4:1.5
--- kazehakase/macros/gecko.m4:1.4 Wed Mar 14 08:41:37 2007
+++ kazehakase/macros/gecko.m4 Wed Mar 14 10:15:19 2007
@@ -68,9 +68,6 @@
AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9])
fi
-AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "8"])
-AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "9"])
-
AC_MSG_CHECKING([whether nsPIDOMWindow methods return nsPIDOMWindow*])
AC_COMPILE_IFELSE(
@@ -163,9 +160,8 @@
p->GetInputStream (nsEmbedCString(), nsEmbedString(), nsnull);]]
)],
[AC_DEFINE([MOZ_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_],[1],[Define if nsICanvasRenderingContextInternal has GetInputStream]) result=yes],
- [result=no])
+ [no_nsicanvasrenderingcontextinternal_have_getinputstream=no])
-AM_CONDITIONAL([MOZ_NO_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_], [test "$result" = "no"])
AC_MSG_RESULT([$result])
AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/content/nsICanvasRenderingContextInternal.h],
@@ -270,12 +266,10 @@
Enable including GtkMozEmbed module],,
enable_gtkmozembed=yes)
if test x"$enable_gtkmozembed" = "xyes"; then
- AC_DEFINE(ENABLE_GTKMOZEMBED, 1, [Define including GtkMozEmbed])
GECKO_MODULE=$GECKO-xpcom
else
GECKO_MODULE=$GECKO-gtkmozembed
fi
- AM_CONDITIONAL(ENABLE_GTKMOZEMBED, test x"$enable_gtkmozembed" = "xyes")
PKG_CHECK_MODULES(MOZILLA_COMPONENT, $GECKO_MODULE >= $min_version)
@@ -297,4 +291,9 @@
KAZEHAKASE_GECKO_API_CHECK
fi
+AM_CONDITIONAL(ENABLE_GTKMOZEMBED, test x"$enable_gtkmozembed" = "xyes")
+AM_CONDITIONAL([HAVE_GECKO_1_8],[test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "8"])
+AM_CONDITIONAL([HAVE_GECKO_1_9],[test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "9"])
+AM_CONDITIONAL([MOZ_NO_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_], [test "$no_nsicanvasrenderingcontextinternal_have_getinputstream" = "no"])
+
])