From e4e6a6dfe5c011c317ec882fab59b04feddb6eeb Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Fri, 18 Jun 2010 13:59:00 +0100 Subject: [PATCH] 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. --- configure.ac | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index cc4886a35..1c31c5ea9 100644 --- a/configure.ac +++ b/configure.ac @@ -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],