brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure.ac only explicitly add -lGL if no pkgconfig file

Browse Source 
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:
Robert Bragg 2010-06-18 13:59:00 +01:00
parent c767feecbb
commit e4e6a6dfe5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -153,15 +153,17 @@ AS_CASE([$CLUTTER_FLAVOUR],
COGL_DRIVER="gl" COGL_DRIVER="gl"
FLAVOUR_LIBS="$FLAVOUR_LIBS -lGL"
CLUTTER_WINSYS=glx CLUTTER_WINSYS=glx
CLUTTER_WINSYS_BASE=x11 CLUTTER_WINSYS_BASE=x11
CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la" CLUTTER_WINSYS_BASE_LIB="x11/libclutter-x11.la"
CLUTTER_SONAME_INFIX=glx CLUTTER_SONAME_INFIX=glx
# Mesa 7.3 added a GL pkg-config file, finally # 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], [opengl-egl-xlib],