Verified Commit 3b2b2cc3 authored by Bernd Paysan's avatar Bernd Paysan
Browse files

Fix gl.fs glx.fs discovery

parent ac811e2e

configure.ac

+14 −14
Original line number Diff line number Diff line
@@ -1364,26 +1364,26 @@ then 
      AC_CHECK_HEADER(w32api/winbase.h, SWIGLIBS="$SWIGLIBS win32.fs", ,

#include <w32api/wtypes.h>

) ,)

    if test x$has_swig = xyes || test -f $srcdir/unix/gl-fsi.c; then

    if test x$has_swig = xyes || (test -f $srcdir/unix/gl-fsi.c && test -f $srcdir/unix/glx-fsi.c); then

      AC_CHECK_HEADER(GL/gl.h, 

      AC_CHECK_HEADER(GL/glext.h, SWIGMODULES="$SWIGMODULES gl.fs"

      SWIGLIBS="$SWIGLIBS gl.fs", ,

      AC_CHECK_HEADER(GL/glext.h,

      AC_CHECK_LIB(GLX,glXCreateWindow,

      AC_CHECK_HEADER(GL/glx.h, SWIGMODULES="$SWIGMODULES gl.fs glx.fs"

      SWIGLIBS="$SWIGLIBS gl.fs glx.fs", ,

), ,), ,

#include <GL/gl.h>

), )

))

    fi

else

    if test x$has_swig = xyes || test -f $srcdir/unix/gl-fsi.c; then

      AC_CHECK_LIB(GL,glBegin,

    if test x$has_swig = xyes || (test -f $srcdir/unix/gl-fsi.c && test -f $srcdir/unix/glx-fsi.c); then

      AC_CHECK_HEADER(GL/gl.h, 

      AC_CHECK_HEADER(GL/glext.h, SWIGMODULES="$SWIGMODULES gl.fs"

      SWIGLIBS="$SWIGLIBS gl.fs", ,

#include <GL/gl.h>

) ,) ,)

    fi

    if test x$has_swig = xyes || test -f $srcdir/unix/glx-fsi.c; then

      AC_CHECK_HEADER(GL/glext.h,

      AC_CHECK_LIB(GLX,glXCreateWindow,

      AC_CHECK_HEADER(GL/glx.h, SWIGMODULES="$SWIGMODULES glx.fs"

      SWIGLIBS="$SWIGLIBS gl.fs", ,),)

      AC_CHECK_HEADER(GL/glx.h, SWIGMODULES="$SWIGMODULES gl.fs glx.fs"

      SWIGLIBS="$SWIGLIBS gl.fs glx.fs", ,

), ,), ,

#include <GL/gl.h>

))

    fi

fi

if test x$has_swig = xyes || test -f $srcdir/unix/gles-fsi.c; then

unix/libc.fs

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ c-library libc 
    c-function getcwd getcwd a u -- a ( c-addr u -- c-addr )

    c-function strlen strlen a -- n

    getentropy? [IF]

	\c #include <sys/random.h>

	c-function getentropy getentropy a n -- n ( buffer len -- n )

    [THEN]

    getrandom? [IF]