[cairo-commit] configure.ac

[Chris Wilson]

 configure.ac |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit e2220a1f3a7b483e615f5bb993a014d20b0f788a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 15 11:45:54 2010 +0100

    configure: Try an alternate name for system glew.

diff --git a/configure.ac b/configure.ac
index eeb34f0..96fb4a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -341,12 +341,14 @@ CAIRO_ENABLE_SURFACE_BACKEND(gl, OpenGL, no, [
     *-linux*|*-*bsd*|*-solaris*)
       ;;
     *)
-      AC_CHECK_LIB(GLEW, glewInit,
-		   [AC_CHECK_HEADER(GL/glew.h, [have_glew="yes"], [])])
+      AC_CHECK_HEADER(GL/glew.h,
+		      [AC_CHECK_LIB(GLEW, glewInit, [have_glew="GLEW"],
+				    [AC_CHECK_LIB(glew32, glewInit, [have_glew="glew32"],
+						  [])])])
       ;;
   esac
-  if test "x$have_glew" = "xyes"; then
-    gl_NONPKGCONFIG_LIBS="-lGLEW $gl_NONPKGCONFIG_LIBS"
+  if test "x$have_glew" != "xno"; then
+    gl_NONPKGCONFIG_LIBS="-l$have_glew $gl_NONPKGCONFIG_LIBS"
     use_glew="yes (system library)"
   else
     CAIRO_ENABLE_FUNCTIONS(glew, GLEW, always)