2012/9/13 Andreas Boll <andreas.boll....@gmail.com>: > also remove the fallback path > > v2: also check for glew in cmake build system > v3: fix windows build > > Should fix: > https://bugs.freedesktop.org/show_bug.cgi?id=29411 > https://bugs.freedesktop.org/show_bug.cgi?id=33676 > --- > CMakeLists.txt | 1 + > configure.ac | 13 ++----------- > 2 files changed, 3 insertions(+), 11 deletions(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 85390b1..af631d5 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -18,6 +18,7 @@ find_path (GLEW_INCLUDE_DIR GL/glew.h > ) > > if (NOT WIN32) > + pkg_check_modules (GLEW REQUIRED glew>=1.5.4) > pkg_check_modules (EGL egl) > pkg_check_modules (GLESV1 glesv1_cm) > pkg_check_modules (GLESV2 glesv2) > diff --git a/configure.ac b/configure.ac > index 264cb75..8b2c359 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -83,17 +83,8 @@ AC_CHECK_LIB([glut], > [], > [glut_enabled=no]) > > -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], > - [GLEW_CFLAGS=""], > - AC_MSG_ERROR([GLEW required])) > - AC_CHECK_LIB([GLEW], > - [glewInit], > - [GLEW_LIBS="-lGLEW"], > - AC_MSG_ERROR([GLEW required])) > - ]) > +dnl Check for GLEW > +PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4]) > DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS" > DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS" > > -- > 1.7.4.1 >
Can I push this one? _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
