summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorChia-I Wu <olvaffe@gmail.com>2010-05-21 21:34:19 -0600
committerChia-I Wu <olvaffe@gmail.com>2010-05-21 22:09:07 -0600
commitbbc9dfda2628a2eaa480d52cca43a7ff51a44c68 (patch)
tree8d7bb9e466a205245a414008aa450bc33da82291 /configure.ac
parentb4416de837a95318b198dd5cae00e2d8ca82467e (diff)
downloadmesa-demos-bbc9dfda2628a2eaa480d52cca43a7ff51a44c68.zip
mesa-demos-bbc9dfda2628a2eaa480d52cca43a7ff51a44c68.tar.xz
Unset LIBS.
Unset LIBS so that EGL demos do not link to glut or GLEW. Fix one Makefile.am that relies on LIBS.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac9
1 files changed, 7 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index d69492d..8a32b70 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,13 +55,13 @@ PKG_CHECK_MODULES(DEMO, [gl])
dnl Check for GLUT
GLUT_CFLAGS=""
-GLUT_LIB=-lglut
+GLUT_LIBS=-lglut
glut_enabled=yes
AC_ARG_WITH([glut],
[AS_HELP_STRING([--with-glut=DIR],
[glut install directory])],
[GLUT_CFLAGS="-I$withval/include"
- GLUT_LIB="-L$withval/lib -lglut"])
+ GLUT_LIBS="-L$withval/lib -lglut"])
AC_CHECK_HEADER([GL/glut.h],
[],
[glut_enabled=no])
@@ -70,6 +70,8 @@ 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], [], [
@@ -84,6 +86,9 @@ PKG_CHECK_MODULES(GLEW, [glew], [], [
DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS"
DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS"
+# LIBS was set by AC_CHECK_LIB above
+LIBS=""
+
PKG_CHECK_MODULES(GLU, [glu])
DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"