nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

always gl. fontconfig instead of xft.

Browse source
This commit is contained in:
Dana Jansens 2003-05-25 20:26:48 +00:00
parent b8f05e5388
commit e5bb095ded
2 changed files with 35 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -49,9 +49,9 @@ PKG_CHECK_MODULES([GMODULE], [gmodule-2.0])
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
PKG_CHECK_MODULES(XFT, [xft])
AC_SUBST(XFT_CFLAGS)
AC_SUBST(XFT_LIBS)
PKG_CHECK_MODULES(FC, [fontconfig])
AC_SUBST(FC_CFLAGS)
AC_SUBST(FC_LIBS)
PKG_CHECK_MODULES(XML, [libxml-2.0])
AC_SUBST(XML_CFLAGS)
@ -100,7 +100,7 @@ X11_EXT_VIDMODE
X11_EXT_SHAPE
X11_EXT_XINERAMA
GL_OPTION
GL_DEVEL
AC_CONFIG_FILES([Makefile
po/Makefile.in

81
m4/gl.m4
View file

@ -1,65 +1,46 @@
# X11_DEVEL()
# GL_DEVEL()
#
# Check for the presence of the X Window System headers and libraries.
# Sets the CPPFLAGS and LIBS variables as appropriate.
AC_DEFUN([GL_OPTION],
# Check for the presence of OpenGL development headers and libraries.
# Sets the GL_CFLAGS and GL_LIBS variables as appropriate.
AC_DEFUN([GL_DEVEL],
[
AC_REQUIRE([X11_DEVEL])
AC_ARG_ENABLE(gl, [ --enable-gl enable support for OpenGL rendering default=no],
,[enable_gl="no"])
# Store these
OLDLIBS=$LIBS
OLDCPPFLAGS=$CPPFLAGS
if test "$enable_gl" = "yes"; then
AC_CHECK_LIB([GL], [glXGetConfig],
,
[
enable_gl="no"
AC_MSG_WARN([Disabling GL rendering support])
])
fi
AC_CHECK_LIB([GL], [glXGetConfig],
,
[
AC_MSG_ERROR([A valid libGL could not be found.])
])
if test "$enable_gl" = "yes"; then
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
AC_MSG_CHECKING([if we can compile with GL])
AC_TRY_LINK(
[
#include <GL/gl.h>
],
[
GLfloat f = 0.0;
glVertex3f(f, f, f);
],
[
AC_MSG_RESULT([yes])
],
[
AC_MSG_RESULT([no])
AC_MSG_WARN([Disabling GL rendering support])
enable_gl="no"
])
AC_MSG_CHECKING([if we can compile with GL])
AC_TRY_LINK(
[
#include <GL/gl.h>
],
[
GLfloat f = 0.0;
glVertex3f(f, f, f);
],
[
AC_MSG_RESULT([yes])
],
[
AC_MSG_RESULT([no])
AC_MSG_ERROR([Could not compile against GL])
])
GL_CFLAGS=""
GL_LIBS="-lGL"
AC_SUBST(GL_CFLAGS)
AC_SUBST(GL_LIBS)
fi
GL_CFLAGS=""
GL_LIBS="-lGL"
AC_SUBST(GL_CFLAGS)
AC_SUBST(GL_LIBS)
CPPFLAGS=$OLDCPPFLAGS
LIBS=$OLDLIBS
AC_MSG_CHECKING([if GL support is enabled])
if test "$enable_gl" = "yes"; then
AC_MSG_RESULT([yes])
AC_DEFINE(USE_GL)
else
AC_MSG_RESULT([no])
fi
AM_CONDITIONAL([USE_GL], [test "$enable_gl" = "yes"])
])