Module: Demos
Branch: master
Commit: ece7bd949dd68641d5f88d678bc6c02fa51e657e
URL:
http://cgit.freedesktop.org/mesa/demos/commit/?id=ece7bd949dd68641d5f88d678bc6c02fa51e657e
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu Dec 30 09:04:51 2010 -0800
Allow builders to specify GLEW_CFLAGS & GLEW_LIBS
configure --help says that builders can set those variables to override
pkgconfig settings, but configure.ac was overwriting those before calling
PKG_CHECK_MODULES
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
---
configure.ac | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index f186659..49cd80f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,17 +81,15 @@ AC_CHECK_LIB([glut],
[],
[glut_enabled=no])
-GLEW_CFLAGS=""
-GLEW_LIBS="-lGLEW"
dnl Include a fallback path for GLEW for the moment while not all distros
dnl have picked up the .pc file.
PKG_CHECK_MODULES(GLEW, [glew], [], [
AC_CHECK_HEADER([GL/glew.h],
- [],
- AC_MSG_ERROR([GLEW required]))
+ [GLEW_CFLAGS=""],
+ AC_MSG_ERROR([GLEW required]))
AC_CHECK_LIB([GLEW],
[glewInit],
- [],
+ [GLEW_LIBS="-lGLEW"],
AC_MSG_ERROR([GLEW required]))
])
DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS"
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
