Changeset 139643 in webkit

Timestamp:

Jan 14, 2013 12:42:26 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Do not hardcode -ldl in OPENGL_LIBS
​https://bugs.webkit.org/show_bug.cgi?id=96602

Patch by Alexandre Rostovtsev <​tetromino@gentoo.org> 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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• configure.ac (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2013-01-14  Alexandre Rostovtsev  <tetromino@gentoo.org>
+
+        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  <cgarcia@igalia.com>
 

trunk/configure.ac

@@ -282 +282 @@
 
 
+# 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])
@@ -1029 +1035 @@
     acceleration_backend_description+=", glx"
    fi
-   OPENGL_LIBS+=" -ldl"
+   OPENGL_LIBS+=" $DLOPEN_LIBS"
    acceleration_backend_description+=")"
 fi