devhelp-02-gecko20.diff revision 20829
20255N/A--- a/m4/gecko.m4.orig 2011-03-21 11:45:39.585790802 +0800
20255N/A+++ b/m4/gecko.m4 2011-03-21 11:52:12.887346051 +0800
20255N/A@@ -110,7 +110,7 @@
20255N/A
20255N/A if $PKG_CONFIG --exists ${gecko_cv_gecko}-xpcom; then
20255N/A _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
20255N/A- _GECKO_CFLAGS="-I$_GECKO_INCLUDE_ROOT"
20255N/A+ _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}-xpcom`"
20255N/A _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
20255N/A _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
20255N/A _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
20255N/A@@ -301,7 +301,9 @@
20255N/A #ifdef MOZILLA_1_8_BRANCH
20255N/A version = "1.8.1";
20255N/A #else
20255N/A-if (strncmp (MOZILLA_VERSION, "1.9", strlen ("1.9")) == 0) {
20829N/A+if ((strncmp (MOZILLA_VERSION, "2.0", strlen ("2.0")) == 0) || (strncmp (MOZILLA_VERSION, "5.0", strlen ("5.0")) == 0) || (strncmp (MOZILLA_VERSION, "6.0", strlen ("6.0")) == 0)) {
20255N/A+ version = "2.0";
20255N/A+} else if (strncmp (MOZILLA_VERSION, "1.9", strlen ("1.9")) == 0) {
20255N/A version = "1.9";
20255N/A } else if (strncmp (MOZILLA_VERSION, "1.8", strlen ("1.8")) == 0) {
20255N/A version = "1.8";
20255N/A@@ -325,7 +327,7 @@
20255N/A
20255N/A gecko_cv_gecko_version_int="$(echo "$gecko_cv_gecko_version" | $AWK -F . '{print [$]1 * 1000000 + [$]2 * 1000 + [$]3}')"
20255N/A
20255N/A-if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "1009000"; then
20255N/A+if test "$gecko_cv_gecko_version_int" -lt "1007000" -o "$gecko_cv_gecko_version_int" -gt "2000000"; then
20255N/A AC_MSG_ERROR([Gecko version $gecko_cv_gecko_version is not supported!])
20255N/A fi
20255N/A
20255N/A@@ -345,6 +347,10 @@
20255N/A AC_DEFINE([HAVE_GECKO_1_9],[1],[Define if we have gecko 1.9])
20255N/A gecko_cv_have_gecko_1_9=yes
20255N/A fi
20255N/A+if test "$gecko_cv_gecko_version_int" -ge "2000000"; then
20255N/A+ AC_DEFINE([HAVE_GECKO_2_0],[1],[Define if we have gecko 2.0])
20255N/A+ gecko_cv_have_gecko_2_0=yes
20255N/A+fi
20255N/A
20255N/A fi # if gecko_cv_have_gecko
20255N/A