.: Fix the WebKit2 WebGL build.

* configure.ac: Add -ldl to the OPENGL_LIBS.

Source/WebKit2: Fix the WebGL build on WebKit2 GTK+.

* GNUmakefile.am: Add OPENGL_LIBS to WebKit2 targets.

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

diff --git a/ChangeLog b/ChangeLog
index d615c19..c1668ea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-28  Martin Robinson  <mrobinson@igalia.com>
+
+        Fix the WebKit2 WebGL build.
+
+        * configure.ac: Add -ldl to the OPENGL_LIBS.
+
 2011-09-28  Ryuan Choi  <ryuan.choi@samsung.com>
 
         [EFL] Bump minimum requirement for eina.

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 6330b8f..56062e7 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-28  Martin Robinson  <mrobinson@igalia.com>
+
+        Fix the WebGL build on WebKit2 GTK+.
+
+        * GNUmakefile.am: Add OPENGL_LIBS to WebKit2 targets.
+
 2011-09-28  Brent Fulgham  <bfulgham@webkit.org>
 
         WinCairo build fix.

diff --git a/Source/WebKit2/GNUmakefile.am b/Source/WebKit2/GNUmakefile.am
index bf4122d..e3b8fe4 100644 (file)
--- a/Source/WebKit2/GNUmakefile.am
+++ b/Source/WebKit2/GNUmakefile.am
@@ -936,6 +936,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIB
        $(LIBSOUP_LIBS) \
        $(LIBXML_LIBS) \
        $(LIBXSLT_LIBS) \
+       $(OPENGL_LIBS) \
        $(PANGO_LIBS) \
        $(PNG_LIBS) \
        $(SQLITE3_LIBS) \
@@ -1365,6 +1366,7 @@ Programs_WebKitPluginProcess_LDADD = \
        $(LIBXML_LIBS) \
        $(LIBXSLT_LIBS) \
        $(OLE32_LIBS) \
+       $(OPENGL_LIBS) \
        $(PANGO_LIBS) \
        $(PNG_LIBS) \
        $(SHLWAPI_LIBS) \

diff --git a/configure.ac b/configure.ac
index 978453f..ebe89c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -386,7 +386,7 @@ AC_MSG_RESULT([$enable_webgl])
 if test "$enable_webgl" = "yes"; then
     AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
     AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
-    OPENGL_LIBS=-lGL
+    OPENGL_LIBS="-lGL -ldl"
 fi
 AC_SUBST([OPENGL_LIBS])