Title: [139643] trunk
- Revision
- 139643
- Author
- [email protected]
- Date
- 2013-01-14 12:42:26 -0800 (Mon, 14 Jan 2013)
Log Message
Do not hardcode -ldl in OPENGL_LIBS
https://bugs.webkit.org/show_bug.cgi?id=96602
Patch by Alexandre Rostovtsev <[email protected]> on 2013-01-14
Reviewed by Philippe Normand.
Some non-Linux systems, e.g. FreeBSD, have dlopen() as part of their
libc, and do not use a separate libdl.
* configure.ac:
Modified Paths
Diff
Modified: trunk/ChangeLog (139642 => 139643)
--- trunk/ChangeLog 2013-01-14 20:35:36 UTC (rev 139642)
+++ trunk/ChangeLog 2013-01-14 20:42:26 UTC (rev 139643)
@@ -1,3 +1,15 @@
+2013-01-14 Alexandre Rostovtsev <[email protected]>
+
+ Do not hardcode -ldl in OPENGL_LIBS
+ https://bugs.webkit.org/show_bug.cgi?id=96602
+
+ Reviewed by Philippe Normand.
+
+ Some non-Linux systems, e.g. FreeBSD, have dlopen() as part of their
+ libc, and do not use a separate libdl.
+
+ * configure.ac:
+
2013-01-11 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and configure.ac for 1.11.4 release
Modified: trunk/configure.ac (139642 => 139643)
--- trunk/configure.ac 2013-01-14 20:35:36 UTC (rev 139642)
+++ trunk/configure.ac 2013-01-14 20:42:26 UTC (rev 139643)
@@ -281,6 +281,12 @@
AC_SUBST([OLE32_LIBS])
+# check whether dlopen() is in the core libc like on FreeBSD, or in a separate
+# libdl like on GNU/Linux (in which case we want to link to libdl)
+AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"])])
+AC_SUBST([DLOPEN_LIBS])
+
+
# determine the GTK+ version to use
AC_MSG_CHECKING([the GTK+ version to use])
AC_ARG_WITH([gtk],
@@ -1028,7 +1034,7 @@
if test "$enable_glx" = "yes"; then
acceleration_backend_description+=", glx"
fi
- OPENGL_LIBS+=" -ldl"
+ OPENGL_LIBS+=" $DLOPEN_LIBS"
acceleration_backend_description+=")"
fi
AC_SUBST([OPENGL_LIBS])
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
