svnno****@sourc*****
svnno****@sourc*****
Thu Apr 26 12:14:29 JST 2007
Revision: 3212
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3212
Author: ikezoe
Date: 2007-04-26 12:14:28 +0900 (Thu, 26 Apr 2007)
Log Message:
-----------
* configure.ac: Check GTK+ WebCore has webkit.h.
* module/embed/gtk-webcore/Makefile.am: Use HAVE_WEBKIT_GTK_WEBKIT.H
flag.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/module/embed/gtk-webcore/Makefile.am
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-04-25 04:03:44 UTC (rev 3211)
+++ kazehakase/trunk/ChangeLog 2007-04-26 03:14:28 UTC (rev 3212)
@@ -1,3 +1,9 @@
+2007-04-26 Hiroyuki Ikezoe <poinc****@ikezo*****>
+
+ * configure.ac: Check GTK+ WebCore has webkit.h.
+ * module/embed/gtk-webcore/Makefile.am: Use HAVE_WEBKIT_GTK_WEBKIT.H
+ flag.
+
2007-04-25 Hiroyuki Ikezoe <poinc****@ikezo*****>
* module/embed/gtk-webcore/kz-webkit-gtk.[cpp|h]: New files for new
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2007-04-25 04:03:44 UTC (rev 3211)
+++ kazehakase/trunk/configure.ac 2007-04-26 03:14:28 UTC (rev 3212)
@@ -124,17 +124,14 @@
fi
if test $gtk_webcore_available = "yes"; then
- SAVE_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $NRCIT_CFLAGS"
- AC_CHECK_MEMBER(WebiClass.mouse_down, , , [#include <webi.h>])
- if test x"$ac_cv_member_WebiClass_mouse_down" = "xyes"; then
- AC_DEFINE([HAVE_GTK_WEBCORE_MOUSE_DOWN], 1,
- [Define to 1 if `WebiClass' has a `mouse_down' member])
- fi
- CFLAGS="$SAVE_CFLAGS"
+ NRCIT_INCLUDE_DIR="`$PKG_CONFIG --variable=includedir osb-nrcit`"
+ AC_CHECK_FILE([$NRCIT_INCLUDE_DIR/osb/webkit-gtk/webkit.h],
+ [gtk_webcore_has_webkit_h=yes])
+
fi
AM_CONDITIONAL([WITH_GTK_WEBCORE], [test $gtk_webcore_available = "yes"])
+AM_CONDITIONAL(HAVE_WEBKIT_GTK_WEBKIT_H, test x"$gtk_webcore_has_webkit_h" = "xyes")
dnl **************************************************************
dnl Check for IE
Modified: kazehakase/trunk/module/embed/gtk-webcore/Makefile.am
===================================================================
--- kazehakase/trunk/module/embed/gtk-webcore/Makefile.am 2007-04-25 04:03:44 UTC (rev 3211)
+++ kazehakase/trunk/module/embed/gtk-webcore/Makefile.am 2007-04-26 03:14:28 UTC (rev 3212)
@@ -26,9 +26,17 @@
-export-dynamic $(no_undefined) \
$(LIBTOOL_EXPORT_OPTIONS)
+if HAVE_WEBKIT_GTK_WEBKIT_H
+GTK_WEBCORE_OBJECT_SOURCES = \
+ kz-webkit-gtk.cpp kz-webkit-gtk.h
+else
+GTK_WEBCORE_OBJECT_SOURCES = \
+ kz-gtk-webcore.cpp kz-gtk-webcore.h
+endif
+
gtk_webcore_la_SOURCES = \
kz-gtk-webcore-module.cpp \
- kz-gtk-webcore.cpp kz-gtk-webcore.h
+ $(GTK_WEBCORE_OBJECT_SOURCES)
gtk_webcore_la_LIBADD = \
$(GTK_LIBS) \