From 8366fd54380ce88922afef8daca0d0c9924117d1 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Sun, 10 Apr 2016 19:23:50 +0200
Subject: [PATCH] drop remaining traces of support for directly linking libGL

---
 cogl/cogl-renderer-private.h |  2 --
 cogl/cogl-renderer.c         |  6 ------
 configure.ac                 | 22 +++++-----------------
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/cogl/cogl-renderer-private.h b/cogl/cogl-renderer-private.h
index f22696874..080bb325d 100644
--- a/cogl/cogl-renderer-private.h
+++ b/cogl/cogl-renderer-private.h
@@ -71,9 +71,7 @@ struct _CoglRenderer
   CoglDriver driver;
   unsigned long private_features
     [COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)];
-#ifndef HAVE_DIRECTLY_LINKED_GL_LIBRARY
   GModule *libgl_module;
-#endif
 
 #if defined (COGL_HAS_EGL_PLATFORM_KMS_SUPPORT)
   int kms_fd;
diff --git a/cogl/cogl-renderer.c b/cogl/cogl-renderer.c
index 1d3eba53f..fabaf81f2 100644
--- a/cogl/cogl-renderer.c
+++ b/cogl/cogl-renderer.c
@@ -213,10 +213,8 @@ _cogl_renderer_free (CoglRenderer *renderer)
   if (winsys)
     winsys->renderer_disconnect (renderer);
 
-#ifndef HAVE_DIRECTLY_LINKED_GL_LIBRARY
   if (renderer->libgl_module)
     g_module_close (renderer->libgl_module);
-#endif
 
   g_slist_foreach (renderer->event_filters,
                    (GFunc) native_filter_closure_free,
@@ -535,8 +533,6 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
     COGL_FLAGS_SET (renderer->private_features,
                     desc->private_features[i], TRUE);
 
-#ifndef HAVE_DIRECTLY_LINKED_GL_LIBRARY
-
   if (COGL_FLAGS_GET (renderer->private_features,
                       COGL_PRIVATE_FEATURE_ANY_GL))
     {
@@ -553,8 +549,6 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
         }
     }
 
-#endif /* HAVE_DIRECTLY_LINKED_GL_LIBRARY */
-
   return TRUE;
 }
 
diff --git a/configure.ac b/configure.ac
index ab285602e..9d4492d78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,12 +522,6 @@ dnl         Drivers first...
 dnl         ========================================================
 EGL_CHECKED=no
 
-dnl This gets set to yes if Cogl directly links to the GL library API
-dnl so it doesn't need to be dlopened. This currently happens on OSX
-dnl where it's not clear if window system API can be separated
-dnl from the GL API.
-GL_LIBRARY_DIRECTLY_LINKED=no
-
 enabled_drivers=""
 
 HAVE_GLES1=0
@@ -711,11 +705,6 @@ AC_SUBST([COGL_GLES2_LIBNAME])
 AC_SUBST([HAVE_GLES2])
 AC_SUBST([COGL_DEFAULT_DRIVER])
 
-if test "x$GL_LIBRARY_DIRECTLY_LINKED" = "xyes"; then
-   AC_DEFINE([HAVE_DIRECTLY_LINKED_GL_LIBRARY], [1],
-             [Defined if the GL library should not be dlopened])
-fi
-
 AC_ARG_ENABLE(
   [cogl-gles2],
   [AC_HELP_STRING([--enable-cogl-gles2=@<:@no/yes@:>@],
@@ -1130,12 +1119,11 @@ echo ""
 # Features
 echo " • Features:"
 echo "        Drivers: ${enabled_drivers}"
-AS_IF([test "x$GL_LIBRARY_DIRECTLY_LINKED" != xyes],
-      [for driver in $enabled_drivers; do
-         driver=`echo $driver | tr "[gles]" "[GLES]"`
-         libname=`eval echo \\$COGL_${driver}_LIBNAME`
-         echo "        Library name for $driver: $libname"
-       done])
+for driver in $enabled_drivers; do
+        driver=`echo $driver | tr "[gles]" "[GLES]"`
+        libname=`eval echo \\$COGL_${driver}_LIBNAME`
+        echo "        Library name for $driver: $libname"
+done
 echo "        GL Window System APIs:${GL_WINSYS_APIS}"
 if test "x$SUPPORT_EGL" = "xyes"; then
 echo "        EGL Platforms:${EGL_PLATFORMS}"