Re: [Nel] GNU/Linux fixes

[Lionel Berenguier]

Thanks for this patch.

As you say, AM_GL_VERIFY is not used and I don't find use of
NEL_ARB_MULTITEXTURE_NO_TYPEDEFS in your patch.

We think that our way to solve the GL version problem is better, even if
maybe more weird, since it solves it both under windows and linux.

The rest of the patch will be applied. Tell us if not applying AM_GL_VERIFY
patch is a problem.

Cheers.

Lionel

----- Original Message -----
From: "Loic Dachary" <address@hidden>
To: <address@hidden>
Sent: Sunday, February 17, 2002 3:38 PM
Subject: [Nel] GNU/Linux fixes


>
> Hi,
>
> I'd be grateful if you could apply the patch below. It was
> generated with today's CVS. Nel + snowballs compile + run with
> this patch. Here is a short description:
>
> - AM_GL_VERIFY autoconf macro (not used but necessary to turn
>   the current hackish workaround into a proper fix)
[....]
>
> Thanks in advance,
>
> Index: nel/acinclude.m4
> ===================================================================
> RCS file: /home/cvsroot/code/nel/acinclude.m4,v
> retrieving revision 1.7
> diff -u -r1.7 acinclude.m4
> --- nel/acinclude.m4 29 Jan 2002 13:21:42 -0000 1.7
> +++ nel/acinclude.m4 17 Feb 2002 13:02:19 -0000
> @@ -45,6 +45,14 @@
>  dnl    Description: check the instalation of the OpenGL library and set
the
>  dnl                 OPENGL_CFLAGS and OPENGL_LIBS variables to use it.
>  dnl
> +dnl AM_GL_VERIFY
> +dnl
> +dnl    Description: checks OpenGL headers and libraries consistency.
> +dnl                 Define NEL_ARB_MULTITEXTURE_NO_TYPEDEFS
> +dnl       if GL_ARB_multitexture is defined in gl.h but is missing
> +dnl       functions typedefs. This happens, for instance, with
> +dnl                   Mesa-3.4.2 & Mesa-4.0.1.
> +dnl
>  dnl
>  dnl AM_PATH_FREETYPE
>  dnl
> @@ -605,6 +613,32 @@
>  AC_SUBST(OPENGL_CFLAGS)
>  AC_SUBST(OPENGL_LIBS)
>
> +])
> +
> +AC_DEFUN(AM_GL_VERIFY,
>

> +_CPPFLAGS="$CPPFLAGS"
> +
> +CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS"
> +
> +AC_MSG_CHECKING([for GL_ARB_multitexture in gl.h])
> +AC_EGREP_CPP(glActiveTextureARB,
> +[#define GL_GLEXT_PROTOTYPES
> +#include <GL/gl.h>],
> +[
> +  AC_EGREP_CPP(PFNGLACTIVETEXTUREARBPROC,
> +  [#include <GL/gl.h>],
> +  [AC_MSG_RESULT([found and typedefs defined])],
> +  [
> +    AC_MSG_RESULT([found and missing typdefs, define
NEL_ARB_MULTITEXTURE_NO_TYPEDEFS])
> +    AC_DEFINE(NEL_ARB_MULTITEXTURE_NO_TYPEDEFS)
> +  ])
> +],
> +[
> +  AC_MSG_RESULT([not found, this is ok])
> +])
> +
> +CPPFLAGS="$_CPPFLAGS"
>  ])
>
>
> Index: nel/configure.in
> ===================================================================
> RCS file: /home/cvsroot/code/nel/configure.in,v
> retrieving revision 1.59
> diff -u -r1.59 configure.in
> --- nel/configure.in 28 Jan 2002 15:22:19 -0000 1.59
> +++ nel/configure.in 17 Feb 2002 13:02:19 -0000
> @@ -247,7 +247,7 @@
>  dnl OpenGL
>
>  AM_PATH_OPENGL($enable_3d)
> -
> +AM_GL_VERIFY