diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2010-12-30 09:04:51 -0800 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2011-01-12 15:33:20 -0800 |
| commit | ece7bd949dd68641d5f88d678bc6c02fa51e657e (patch) | |
| tree | b7aee319375bfd9165abd00f5ce6648c10671371 /configure.ac | |
| parent | c5057cb55ac8862a99ec446649b92977a8ae7e93 (diff) | |
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.coopersmith@oracle.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index f1866590..49cd80f5 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" |