.:

        Rubber-stamped by Anders.

        Make the HTTP backend configurable in the GTK+ port. curl is currently
        the only option.

        * GNUmakefile.am:
        * WebKit.pri:
        * configure.ac:

JavaScriptCore:

        Rubber-stamped by Anders.

        Make the HTTP backend configurable in the GTK+ port. curl is currently
        the only option.

        * wtf/Platform.h: Don't hard-code WTF_USE_CURL for GTK

WebCore:

        Rubber-stamped by Anders.

        Make the HTTP backend configurable in the GTK+ port. curl is currently
        the only option.

        * GNUmakefile.am:

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

diff --git a/ChangeLog b/ChangeLog
index 6cd8246feca64b3bb2a9f0e9947024e8e0443e36..d55907470162ce8681adf0e8ebb3152981e827c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-15  Alp Toker  <alp@atoker.com>
+
+        Rubber-stamped by Anders.
+
+        Make the HTTP backend configurable in the GTK+ port. curl is currently
+        the only option.
+
+        * GNUmakefile.am:
+        * WebKit.pri:
+        * configure.ac:
+
 2008-01-15  Alp Toker  <alp@atoker.com>
 
         GTK+/autotools build fix for GCC < 4. Use the -fvisibility compiler

diff --git a/GNUmakefile.am b/GNUmakefile.am
index 463aeba38d3a3d2f153c0ac8a850a2f0fd9e4828..27226b86e5a8a8ed8511e077376f0968d3ffb6b0 100644 (file)
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -138,6 +138,7 @@ libWebKitGtk_la_CXXFLAGS = \
        -fno-strict-aliasing \
        $(global_cflags) \
        $(DEPENDENCIES_CFLAGS) \
+       $(LIBCURL_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(LIBXSLT_CFLAGS) \
@@ -147,6 +148,7 @@ libWebKitGtk_la_CFLAGS = \
        -fno-strict-aliasing \
        $(global_cflags) \
        $(DEPENDENCIES_CFLAGS) \
+       $(LIBCURL_CFLAGS) \
        $(SQLITE3_CFLAGS) \
        $(GSTREAMER_CFLAGS) \
        $(LIBXSLT_CFLAGS) \
@@ -162,6 +164,7 @@ libWebKitGtk_la_LIBADD = libJavaScriptCore.la
 libWebKitGtk_la_LDFLAGS = \
        $(webkitgtk_ldflags) \
        $(DEPENDENCIES_LIBS) \
+       $(LIBCURL_LIBS) \
        $(ICU_LIBS) \
        $(SQLITE3_LIBS) \
        $(GSTREAMER_LIBS) \

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e7ec4851d5b17d99f0894d6eddd26ad917c7f647..da49d9c43d1643396f4396703160cd249c37e883 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-15  Alp Toker  <alp@atoker.com>
+
+        Rubber-stamped by Anders.
+
+        Make the HTTP backend configurable in the GTK+ port. curl is currently
+        the only option.
+
+        * wtf/Platform.h: Don't hard-code WTF_USE_CURL for GTK
+
 2008-01-15  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Beth Dakin.

diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index cde1adabdd0d9163ef57f45dd837d52298319729..406dfee494736679345a567fb0a7187106bc9c78 100644 (file)
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -226,10 +226,6 @@
 #define WTF_USE_PTHREADS 1
 #endif
 
-#if PLATFORM(GTK)
-#define WTF_USE_CURL 1
-#endif
-
 #if PLATFORM(QT)
 #define USE_SYSTEM_MALLOC 1
 #endif

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bccb5da713823a5e501b80eb31e31540db084cea..4781670f8ed14eb0ffc5c6184cafe5d3f10d9964 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2008-01-15  Alp Toker  <alp@atoker.com>
+
+        Rubber-stamped by Anders.
+
+        Make the HTTP backend configurable in the GTK+ port. curl is currently
+        the only option.
+
+        * GNUmakefile.am:
+
 2008-01-15  Adele Peterson  <adele@apple.com>
 
         Build fix.

diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index d5910a0c4380aa646596e1478f80cf6ac8d9c3b5..999e4ab66df0a9cb90fd6ba42bc767b561bb8ea9 100644 (file)
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -37,7 +37,6 @@ webkitgtk_cppflags += \
        -I $(srcdir)/WebCore/platform/gtk \
        -I $(srcdir)/WebCore/platform/graphics/gtk \
        -I $(srcdir)/WebCore/platform/graphics/cairo \
-       -I $(srcdir)/WebCore/platform/network/curl \
        -I $(srcdir)/WebCore/loader/gtk \
        -I $(srcdir)/WebCore/page/gtk \
        -I $(srcdir)/WebKit/gtk/WebCoreSupport \
@@ -967,8 +966,6 @@ webkitgtk_sources += \
        WebCore/platform/graphics/gtk/ImageGtk.cpp \
        WebCore/platform/graphics/gtk/IntPointGtk.cpp \
        WebCore/platform/graphics/gtk/IntRectGtk.cpp \
-       WebCore/platform/network/curl/ResourceHandleCurl.cpp \
-       WebCore/platform/network/curl/ResourceHandleManager.cpp \
        WebCore/platform/graphics/cairo/AffineTransformCairo.cpp \
        WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp \
        WebCore/platform/graphics/cairo/ImageBufferCairo.cpp \
@@ -983,6 +980,21 @@ webkitgtk_sources += \
        WebCore/platform/image-decoders/ico/ICOImageDecoder.cpp \
        WebCore/platform/image-decoders/xbm/XBMImageDecoder.cpp 
 
+# ----
+# curl http backend
+# ----
+if USE_CURL
+
+webcore_cppflags += \
+       -DWTF_USE_CURL=1 \
+       -I $(srcdir)/WebCore/platform/network/curl
+
+webcore_sources += \
+       WebCore/platform/network/curl/ResourceHandleCurl.cpp \
+       WebCore/platform/network/curl/ResourceHandleManager.cpp
+
+endif # END USE_CURL
+
 # ----
 # Database Support
 # ----

diff --git a/WebKit.pri b/WebKit.pri
index 36404ac8032bde8a522f718d4decbefae573ef28..d8fc9fd3101cb853f24811039948b9424588e830 100644 (file)
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -36,6 +36,7 @@ gtk-port {
 
     # We use the curl http backend on all platforms
     PKGCONFIG += libcurl
+    DEFINES += WTF_USE_CURL=1
 
     LIBS += -lWebKitGtk -ljpeg -lpng
 

diff --git a/configure.ac b/configure.ac
index 5743d7a4ba9fc1142c23a9d9aecd9bd536d7d275..27608677e14c3125f7d1de32cd22c8505d654b3a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,22 @@ esac
 
 AC_MSG_RESULT([$with_webkit_target])
 
+
+# determine the http backend
+AC_MSG_CHECKING([the HTTP backend to use])
+AC_ARG_WITH(http_backend,
+            AC_HELP_STRING([--with-http-backend=@<:@curl@:>@],
+                           [Select HTTP backend [default=curl]]),
+            [],[http_backend="curl"])
+
+case "$http_backend" in
+     curl) ;;
+     *) AC_MSG_ERROR([Invalid HTTP backend: must be curl.]) ;;
+esac
+
+AC_MSG_RESULT([$http_backend])
+
+
 # minimum base dependencies
 GLIB_REQUIRED_VERSION=2.0
 GOBJECT_REQUIRED_VERSION=2.0
@@ -156,11 +172,11 @@ PANGO_REQUIRED_VERSION=1.0
 CAIRO_REQUIRED_VERSION=1.2
 FONTCONFIG_REQUIRED_VERSION=2.4
 FREETYPE2_REQUIRED_VERSION=9.0
-LIBCURL_REQUIRED_VERSION=7.15
 LIBXML_REQUIRED_VERSION=2.6
 
 # optional modules
 GTK_REQUIRED_VERSION=2.0
+LIBCURL_REQUIRED_VERSION=7.15
 LIBXSLT_REQUIRED_VERSION=1.1.7
 SQLITE_REQUIRED_VERSION=3.0
 GSTREAMER_REQUIRED_VERSION=0.10
@@ -172,7 +188,6 @@ PKG_CHECK_MODULES([DEPENDENCIES],
                   gthread-2.0 >= $GTHREAD_REQUIRED_VERSION
                   gtk+-2.0 >= $GTK_REQUIRED_VERSION
                   pango >= $PANGO_REQUIRED_VERSION
-                  libcurl >= $LIBCURL_REQUIRED_VERSION
                   cairo >= $CAIRO_REQUIRED_VERSION
                   cairo-ft,
                   fontconfig >= $FONTCONFIG_REQUIRED_VERSION
@@ -299,6 +314,14 @@ if test "$enable_debug" = "yes"; then
    CFLAGS="$CFLAGS -g"
 fi
 
+# check if curl is available
+if test "$http_backend" = "curl"; then
+   PKG_CHECK_MODULES([LIBCURL],
+                     [libcurl >= $LIBCURL_REQUIRED_VERSION])
+   AC_SUBST([LIBCURL_CFLAGS])
+   AC_SUBST([LIBCURL_LIBS])
+fi
+
 # check if sqlite 3 is available
 if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then
    PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION])
@@ -357,6 +380,9 @@ AM_CONDITIONAL([TARGET_WIN32], [test "$with_webkit_target" = "win32"])
 AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_webkit_target" = "quartz"])
 AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_webkit_target" = "directfb"])
 
+# HTTP backend conditionals
+AM_CONDITIONAL([USE_CURL], [test "$http_backend" = "curl"])
+
 # WebKit feature conditionals
 AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"])
 AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"])
@@ -386,6 +412,7 @@ echo "
 WebKit was configured with the following options:
 
  Target                            : $with_webkit_target
+ HTTP backend                      : $http_backend
  Enable debug                      : $enable_debug
  Code coverage support             : $enable_coverage
  Optimized memory allocator        : $enable_fast_malloc