mirror of
https://github.com/brl/mutter.git
synced 2024-11-09 23:46:33 -05:00
configure.ac only explicitly add -lGL if no pkgconfig file
When configuring the glx flavour we were always explicitly adding -lGL to the linker flags even when a pkg-config file was found which should take care of that option for us.
This commit is contained in:
parent
c767feecbb
commit
e4e6a6dfe5
@ -153,15 +153,17 @@ AS_CASE([$CLUTTER_FLAVOUR],
|
||||
|
||||
COGL_DRIVER="gl"
|
||||
|
||||
FLAVOUR_LIBS="$FLAVOUR_LIBS -lGL"
|
||||
|
||||
CLUTTER_WINSYS=glx
|
||||
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"], [])
|
||||
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"])
|
||||
],
|
||||
|
||||
[opengl-egl-xlib],
|
||||
|
Loading…
Reference in New Issue
Block a user