From 95dbe50e98be4bd56dc507ead26eaaadc3565ffa Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sun, 13 Aug 2000 06:31:54 +0000 Subject: [PATCH] check for gl & glu now too - better checks SVN revision: 3099 --- legacy/evas/acconfig.h | 1 + legacy/evas/configure.in | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/legacy/evas/acconfig.h b/legacy/evas/acconfig.h index 7d8b8d50ef..668c6a2d4e 100644 --- a/legacy/evas/acconfig.h +++ b/legacy/evas/acconfig.h @@ -1 +1,2 @@ #undef HAVE_GL +#undef HAVE_GLU diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index c6e6574606..fd159bc504 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -108,15 +108,27 @@ gl_includes="" AC_CHECK_HEADER(GL/gl.h, gl_includes="-I/usr/include -I/usr/local/include" AC_CHECK_LIB(GL, glBindTexture, AC_DEFINE(HAVE_GL) ,[ -echo "... no GL found" -], -L/usr/local/lib -lGL $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS) -) AC_CHECK_HEADER($x_includes"/GL/gl.h", gl_includes="-I/usr/include -I/usr/local/include -I/usr/X11R6/include/" AC_CHECK_LIB(GL, glBindTexture, AC_DEFINE(HAVE_GL) ,[ echo "... no GL found" ], -L/usr/local/lib -lGL $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS) ) +], -L/usr/local/lib -lGL $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS) +) +#### Find out about OpenGL's GLU +AC_CHECK_HEADER(GL/glu.h, +gl_includes=$gl_includes" -I/usr/include -I/usr/local/include" +AC_CHECK_LIB(GLU, gluBuild2DMipmaps, AC_DEFINE(HAVE_GLU) ,[ +AC_CHECK_HEADER($x_includes"/GL/glu.h", +gl_includes=$gl_includes" -I/usr/include -I/usr/local/include -I/usr/X11R6/include/" +AC_CHECK_LIB(GLU, gluBuild2DMipmaps, AC_DEFINE(HAVE_GLU) ,[ +echo "... no GLU found" +], -L/usr/local/lib -lGL -lGLU $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS) +) +], -L/usr/local/lib -lGL -lGLU $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS) +) + AC_SUBST(gl_includes) AC_OUTPUT(Makefile src/Makefile test/Makefile)