svnno****@sourc*****
svnno****@sourc*****
Mon Apr 9 10:35:45 JST 2007
Revision: 3157
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=kazehakase&view=rev&rev=3157
Author: kous
Date: 2007-04-09 10:35:44 +0900 (Mon, 09 Apr 2007)
Log Message:
-----------
* module/embed/ie/kz-ie.cpp: include <objbase.h>.
* configure.ac: added <objbase.h> check.
Modified Paths:
--------------
kazehakase/trunk/ChangeLog
kazehakase/trunk/configure.ac
kazehakase/trunk/module/embed/ie/kz-ie.cpp
Modified: kazehakase/trunk/ChangeLog
===================================================================
--- kazehakase/trunk/ChangeLog 2007-04-09 01:07:21 UTC (rev 3156)
+++ kazehakase/trunk/ChangeLog 2007-04-09 01:35:44 UTC (rev 3157)
@@ -1,3 +1,9 @@
+2007-04-09 Kouhei Sutou <kou****@cozmi*****>
+
+ * module/embed/ie/kz-ie.cpp: include <objbase.h>.
+
+ * configure.ac: added <objbase.h> check.
+
2007-04-09 Hiroyuki Ikezoe <poinc****@ikezo*****>
* src/bookmarks/kz-bookmark-menu-item.c: Fix truncating position.
Modified: kazehakase/trunk/configure.ac
===================================================================
--- kazehakase/trunk/configure.ac 2007-04-09 01:07:21 UTC (rev 3156)
+++ kazehakase/trunk/configure.ac 2007-04-09 01:35:44 UTC (rev 3157)
@@ -8,7 +8,7 @@
AC_ENABLE_SHARED(yes)
AC_ENABLE_STATIC(no)
AM_PROG_LIBTOOL
-
+
LT_VERSION_INFO="1:0:1"
LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"'
AC_SUBST(LT_VERSION_INFO)
@@ -54,8 +54,8 @@
dnl **************************************************************
dnl Check for Gtk+2.
dnl **************************************************************
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified
+dnl in MODULES, pass to pkg-config
AM_PATH_GTK_2_0(2.6.0, , ,[gthread])
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
@@ -82,9 +82,16 @@
dnl **************************************************************
dnl Check for IE
dnl **************************************************************
-with_ie=yes
-AM_CONDITIONAL([WITH_IE], [test x"$with_ie" = "xyes"])
+ie_exists=no
+AC_ARG_ENABLE([ie],
+ AS_HELP_STRING([--enable-ie]
+ [Enable Internet Explorer (auto)]))
+if test x"$enable_ie" != "xno"; then
+ AC_CHECK_HEADER([objbase.h], [ie_exists=yes])
+fi
+AM_CONDITIONAL([WITH_IE], [test x"$ie_exists" = "xyes"])
+
dnl **************************************************************
dnl Check for GNU TLS
dnl **************************************************************
Modified: kazehakase/trunk/module/embed/ie/kz-ie.cpp
===================================================================
--- kazehakase/trunk/module/embed/ie/kz-ie.cpp 2007-04-09 01:07:21 UTC (rev 3156)
+++ kazehakase/trunk/module/embed/ie/kz-ie.cpp 2007-04-09 01:35:44 UTC (rev 3157)
@@ -20,6 +20,8 @@
* $Id: kz-gtk-webcore.cpp 3111 2007-03-30 08:18:40Z makeinu $
*/
+#include <objbase.h>
+
#include <glib/gi18n.h>
#include <math.h>