Hiroyuki Ikezoe
ikezo****@users*****
Tue Mar 13 15:06:54 JST 2007
Index: kazehakase/configure.in diff -u kazehakase/configure.in:1.188 kazehakase/configure.in:1.189 --- kazehakase/configure.in:1.188 Tue Mar 13 09:05:48 2007 +++ kazehakase/configure.in Tue Mar 13 15:06:54 2007 @@ -140,189 +140,7 @@ 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 `$PKG_CONFIG --cflags-only-I $GECKO-xpcom` -Wconversion -Wsign-compare -Werror" -CXXFLAGS="$AM_CXXFLAGS `$PKG_CONFIG --cflags-only-other $GECKO-xpcom`" - -AC_MSG_RESULT([$CXXFLAGS]) -dnl ************************************************************** -dnl Check Mozilla API . -dnl This code picked from Epiphany-1.7.0. -dnl ************************************************************** - -dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch - -dnl Determine gecko version -dnl We don't use the version from the .pc file, since that's the app version -dnl and not the Gecko version - -AC_MSG_CHECKING([[for gecko version]]) - -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" -fi - -gecko_version_major=`echo $gecko_version | awk '{ print $[1]; }'` -gecko_version_minor=`echo $gecko_version | awk '{ print $[2]; }'` - -AC_MSG_RESULT([$gecko_version_major.$gecko_version_minor]) - -if test "$gecko_version_major" != "1" -o "$gecko_version_minor" -lt "7" -o "$gecko_version_minor" -gt "9"; then - AC_MSG_ERROR([Unsupported Gecko version $gecko_version_major.$gecko_version_minor]) -fi - -if test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "8"; then - AC_DEFINE([HAVE_GECKO_1_8],[1],[Define if we have gecko 1.8]) -fi -if test "$gecko_version_major" = "1" -a "$gecko_version_minor" -ge "9"; then - 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( - [AC_LANG_PROGRAM( - [[#include <nsPIDOMWindow.h>]], - [[nsPIDOMWindow *w; - w->GetPrivateRoot ();]] - )], - [AC_DEFINE([MOZ_NSPIDOMWINDOW_RETURNNSPIDOMWINDOW_],[1],[Define if nsPIDOMWindow returns nsPIDOMWindow*]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - -AC_MSG_CHECKING([whether nsIFilePicker methods expect nsAString&]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsEmbedString.h> - #include <widget/nsIFilePicker.h>]], - [[nsIFilePicker *p; - p->SetDefaultString (nsEmbedString());]] - )], - [AC_DEFINE([MOZ_NSIFILEPICKER_NSASTRING_],[1],[Define if nsIFilePicker uses nsAString&]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - -dnl Changed from char* to nsAString& in 1.8a1 - -AC_MSG_CHECKING([whether nsIMIMEInfo methods expect nsAString&]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsEmbedString.h> - #include <mimetype/nsIMIMEInfo.h>]], - [[nsIMIMEInfo *p; - p->SetDescription (nsEmbedString());]] - )], - [AC_DEFINE([MOZ_NSIMIMEINFO_NSACSTRING_],[1],[Define if nsIMIMEInfo uses nsAString&]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - -AC_MSG_CHECKING([whether nsICacheSession methods expect nsAString&]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsEmbedString.h> - #include <nkcache/nsICacheSession.h>]], - [[nsICacheSession *p; - p->OpenCacheEntry (nsEmbedCString(),0, PR_FALSE, nsnull);]] - )], - [AC_DEFINE([MOZ_NSICACHESESSION_NSACSTRING_],[1],[Define if nsICacheSession uses nsAString&]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - -AC_MSG_CHECKING([whether nsIHelperAppLauncherDialog methods expect PRBool]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsIHelperAppLauncherDialog.h>]], - [[nsIHelperAppLauncherDialog *p; - p->Show (nsnull, nsnull, -1);]] - )], - [AC_DEFINE([MOZ_NSIHELPERAPPLAUNCHERDIALOG_NSPRBOOL_],[1],[Define if nsIHelperAppLauncharDialog uses PRBool]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - -AC_MSG_CHECKING([whether NS_InitXPCOM3 exists]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsXPCOM.h>]], - [[NS_InitXPCOM3(nsnull, nsnull, nsnull, nsnull, 0);]] - )], - [AC_DEFINE([MOZ_HAVE_NSINITXPCOM3_],[1],[Define if Gecko has NS_InitXPCOM3]) result=yes], - [result=no]) - -AC_MSG_RESULT([$result]) - -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#define MOZILLA_INTERNAL_API - #include <nsICanvasRenderingContextInternal.h> - #include <nsEmbedString.h> - #undef MOZILLA_INTERNAL_API]], - [[nsICanvasRenderingContextInternal *p; - p->GetInputStream (nsEmbedCString(), nsEmbedString(), nsnull);]] - )], - [AC_DEFINE([MOZ_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_],[1],[Define if nsICanvasRenderingContextInternal has GetInputStream]) result=yes], - [result=no]) - -AM_CONDITIONAL([MOZ_NO_NSICANVASRENDERINGCONTEXTINTERNAL_HAVE_GETINPUTSTREAM_], [test "$result" = "no"]) -AC_MSG_RESULT([$result]) - -AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/content/nsICanvasRenderingContextInternal.h], - [AC_DEFINE([HAVE_NSICANVASRENDERINGCONTEXTINTERNAL_H],[1],[Define if nsICanvasRenderingContextInternal.h exists])]) - -AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIWebProgressListener2.h], - [AC_DEFINE([HAVE_NSIWEBPROGRESSLISTENER2_H],[1],[Define if nsIWebProgressListener2.h exists])], - [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsIWebProgressListener2.h], - [AC_DEFINE([HAVE_NSIWEBPROGRESSLISTENER2_H],[1],[Define if nsIWebProgressListener2.h exists])])]) - -AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsITransfer.h], - [AC_DEFINE([HAVE_NSITRANSFER_H],[1],[Define if nsITransfer.h exists])], - [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/uriloader/nsITransfer.h], - [AC_DEFINE([HAVE_NSITRANSFER_H],[1],[Define if nsITransfer.h exists])])]) - -AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/nsIPresContext.h], - [AC_DEFINE([HAVE_NSIPRESCONTEXT_H],[1],[Define if nsIPresContext.h exists])], - [AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/layout/nsIPresContext.h], - [AC_DEFINE([HAVE_NSIPRESCONTEXT_H],[1],[Define if nsIPresContext.h exists])])]) - -dnl Not a simple file check due to the header being in the SDK since 1.8a6 -dnl https://bugzilla.mozilla.org/show_bug.cgi?id=271068 - -AC_CHECK_FILES([$MOZILLA_INCLUDE_ROOT/nsIPassword.h - $MOZILLA_INCLUDE_ROOT/wallet/nsIPassword.h - $MOZILLA_INCLUDE_ROOT/passwordmgr/nsIPassword.h], - [AC_DEFINE([HAVE_NSIPASSWORD_H],[1], - [Define if mozilla nsIPassword header is available])]) - -dnl Check for nsIDocShell::GetSecurityUI -dnl This code is picked from galeon-1.3.21. -dnl nsIDocShell::GetSecurityUI was added in 1.8b2 as part of the fastback -dnl patch -dnl https://bugzilla.mozilla.org/show_bug.cgi?id=274784 - -AC_MSG_CHECKING([whether nsIDocShell::GetSecureUI exists]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include <nsIDocShell.h>]], - [[ nsIDocShell *p; - p->GetSecurityUI( nsnull ); ]] - )], - [AC_DEFINE([HAVE_NSIDOCSHELL_GETSECUREUI], [1], - [Define if nsIDocShell::GetSecureUI exists]) result=yes], - [result=no]) -AC_MSG_RESULT([$result]) +KAZEHAKASE_GECKO_CHECK dnl restore flags CPPFLAGS=$_SAVE_CPPFLAGS Index: kazehakase/autogen.sh diff -u kazehakase/autogen.sh:1.9 kazehakase/autogen.sh:1.10 --- kazehakase/autogen.sh:1.9 Thu Apr 20 10:51:52 2006 +++ kazehakase/autogen.sh Tue Mar 13 15:06:54 2007 @@ -4,7 +4,7 @@ test -z "$srcdir" && srcdir=. libtoolize --copy --force \ - && aclocal \ + && aclocal -I macros \ && autoheader automake --add-missing --foreign --copy Index: kazehakase/ChangeLog diff -u kazehakase/ChangeLog:1.1921 kazehakase/ChangeLog:1.1922 --- kazehakase/ChangeLog:1.1921 Tue Mar 13 09:12:54 2007 +++ kazehakase/ChangeLog Tue Mar 13 15:06:54 2007 @@ -1,3 +1,10 @@ +2007-03-13 Hiroyuki Ikezoe <poinc****@ikezo*****> + + * macros/gecko.m4: A new file. + * configure.in: some part of gecko related code were moved into + macros/gecko.m4. + * autogen.sh: Append -I option to aclocal. + 2007-03-13 Kouhei Sutou <kou****@cozmi*****> * src/kz-app.c: moved kz_ext_init()/kz_ext_exit() to ...