[clutter/wip/stereo: 4/6] build: Don't explicitly check for libGL
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/wip/stereo: 4/6] build: Don't explicitly check for libGL
- Date: Fri, 19 Aug 2011 16:15:11 +0000 (UTC)
commit b5681b1e39dc07efc527bd9486e9ef2cc84f0add
Author: Robert Bragg <robert linux intel com>
Date: Thu Aug 4 16:48:35 2011 +0100
build: Don't explicitly check for libGL
Since libGL is abstracted by Cogl Clutter no longer needs to be
explicitly checking for the gl pkg-config flags and directly lining with
libGL.
configure.ac | 21 ---------------------
1 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f909d8f..f40eb78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,21 +208,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
CLUTTER_WINSYS_BASE=x11
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
CLUTTER_SONAME_INFIX=glx
-
- # Mesa 7.3 added a GL pkg-config file, finally
- PKG_CHECK_EXISTS([gl],
- [BACKEND_PC_FILES="$BACKEND_PC_FILES gl"],
- # if a pkg-config file isn't found just add -lGL
- # and hope for the best.
- [FLAVOUR_LIBS="$FLAVOUR_LIBS -lGL"])
-
- # We might fall back to DRM for sync-to-vblank on GLX
- PKG_CHECK_EXISTS([libdrm],
- [
- AC_DEFINE([HAVE_DRM], [1], [Have libdrm support])
- BACKEND_PC_FILES="$BACKEND_PC_FILES libdrm"
- ],
- [])
],
[opengl-egl-xlib],
@@ -241,9 +226,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
# I think this winsys can be API and ABI compatible with the
# glx flavour so we can also be cheeky and use the same soname
CLUTTER_SONAME_INFIX=glx
-
- PKG_CHECK_EXISTS([gl], [BACKEND_PC_FILES="$BACKEND_PC_FILES gl"], [])
- PKG_CHECK_EXISTS([egl], [BACKEND_PC_FILES="$BACKEND_PC_FILES egl"], [])
],
[wayland],
@@ -255,9 +237,6 @@ AS_CASE([$CLUTTER_FLAVOUR],
CLUTTER_WINSYS=wayland
CLUTTER_SONAME_INFIX=wayland
-
- PKG_CHECK_EXISTS([gl], [BACKEND_PC_FILES="$BACKEND_PC_FILES gl"], [])
- PKG_CHECK_EXISTS([egl], [BACKEND_PC_FILES="$BACKEND_PC_FILES egl"], [])
PKG_CHECK_EXISTS([wayland-client xkbcommon],
[BACKEND_PC_FILES="$BACKEND_PC_FILES wayland-client xkbcommon"], [])
],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]