2008-02-12 Rodney Dawes <dobey@wayofthemonkey.com>
authoralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Feb 2008 21:04:50 +0000 (21:04 +0000)
committeralp@webkit.org <alp@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 12 Feb 2008 21:04:50 +0000 (21:04 +0000)
        Reviewed by Alp Toker.

        Add -DMAEMO_CHANGES when the hildon CONFIG option is specified
        Add hildon-1 to PKGCONFIG when hildon CONFIG option is specified

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30175 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
GNUmakefile.am
WebCore/ChangeLog
WebCore/WebCore.pro
configure.ac

index 613d84f..908b518 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-02-12  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Alp Toker.
+
+        Add a --with-hildon argument to configure.ac for adding MAEMO_CHANGES
+        to the CPPFLAGS for WebCore and WebKit
+        Add a pkgconfig check for hildon-1 when --with-hildon specified
+        Output the use of Hildon support in the summary
+        Add HILDON_CPPFLAGS to webkitgtk_cppflags
+        Add HILDON_CFLAGS to libWebKitGtk_la_CFLAGS
+        Add HILDON_LIBS to libWebKitGtk_la_LDFLAGS
+
+        * configure.ac:
+        * GNUmakefile.am:
+
 2008-02-08  Alp Toker  <alp@atoker.com>
 
         Rubber-stamped by Maciej.
index 054265a..ad5e1f8 100644 (file)
@@ -131,6 +131,8 @@ webkitgtk_built_sources :=
 webkitgtk_built_nosources :=
 webkitgtk_cleanfiles :=
 
+webkitgtk_cppflags += $(HILDON_CPPFLAGS)
+
 # No need to touch the following variables unless you have to. If you need to change the values
 # for the following variables, use the "webkitgtk_" variables above
 libWebKitGtk_ladir := $(prefix)/include/WebKit/webkit
@@ -154,7 +156,8 @@ libWebKitGtk_la_CXXFLAGS = \
        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(LIBXSLT_CFLAGS) \
-       $(COVERAGE_CFLAGS)
+       $(COVERAGE_CFLAGS) \
+       $(HILDON_CFLAGS)
 
 libWebKitGtk_la_CFLAGS = \
        -fno-strict-aliasing \
@@ -164,7 +167,8 @@ libWebKitGtk_la_CFLAGS = \
        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(LIBXSLT_CFLAGS) \
-       $(COVERAGE_CFLAGS)
+       $(COVERAGE_CFLAGS) \
+       $(HILDON_CFLAGS)
 
 libWebKitGtk_la_CPPFLAGS = \
        $(global_cppflags) \
@@ -183,6 +187,7 @@ libWebKitGtk_la_LDFLAGS = \
        $(GSTREAMER_LIBS) \
        $(LIBXSLT_LIBS) \
        $(COVERAGE_LDFLAGS) \
+       $(HILDON_LIBS) \
        -lpthread \
        -ljpeg \
        -version-info @LIBWEBKITGTK_VERSION@
index 684d705..9ed60d9 100644 (file)
@@ -1,3 +1,12 @@
+2008-02-12  Rodney Dawes  <dobey@wayofthemonkey.com>
+
+        Reviewed by Alp Toker.
+
+        Add -DMAEMO_CHANGES when the hildon CONFIG option is specified
+        Add hildon-1 to PKGCONFIG when hildon CONFIG option is specified
+
+        * WebCore.pro:
+
 2008-02-12  Dan Bernstein  <mitz@apple.com>
 
         Reviewed by Timothy Hatcher.
index 1dfc158..6ec3a4c 100644 (file)
@@ -135,6 +135,10 @@ DEPENDPATH += editing/qt history/qt loader/qt page/qt \
 }
 
 gtk-port {
+    hildon {
+        DEFINES += MAEMO_CHANGES
+        PKGCONFIG += hildon-1
+    }
     x11:plugins {
         DEFINES += XP_UNIX
     }
index 4bbb54d..1cfd2df 100644 (file)
@@ -152,6 +152,20 @@ esac
 
 AC_MSG_RESULT([$with_webkit_target])
 
+AC_MSG_CHECKING([for Hildon UI extensions])
+AC_ARG_WITH(hildon,
+            AC_HELP_STRING([--with-hildon],
+                           [Use Hildon UI extensions [default=no]]),
+            [],[with_hildon="no"])
+AC_MSG_RESULT([$with_hildon])
+
+if test "$with_hildon" = "yes"; then
+    HILDON_CPPFLAGS="-DMAEMO_CHANGES"
+    PKG_CHECK_MODULES([HILDON], [hildon-1])
+    AC_SUBST([HILDON_CPPFLAGS])
+    AC_SUBST([HILDON_CFLAGS])
+    AC_SUBST([HILDON_LIBS])
+fi
 
 # determine the http backend
 AC_MSG_CHECKING([the HTTP backend to use])
@@ -445,6 +459,7 @@ echo "
 WebKit was configured with the following options:
 
  Target                            : $with_webkit_target
+ Hildon UI extensions              : $with_hildon
  HTTP backend                      : $http_backend
  Enable debug                      : $enable_debug
  Code coverage support             : $enable_coverage